]> err.no Git - linux-2.6/commitdiff
[PATCH] knfsd: nfsd4: remove nfs4_reclaim_init
authorNeilBrown <neilb@cse.unsw.edu.au>
Fri, 24 Jun 2005 05:03:32 +0000 (22:03 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 07:06:32 +0000 (00:06 -0700)
nfs4_reclaim_init is no longer performing any useful function.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/nfsd/nfs4state.c

index 1f68ce36e724f59851df09c5a9c26f36a526cf3a..fb9b4eb4302dd1dc71518c6ca4be65894f976afd 100644 (file)
@@ -54,7 +54,6 @@
 /* Globals */
 static time_t lease_time = 90;     /* default lease time */
 static time_t user_lease_time = 90;
-static u32 nfs4_reclaim_init = 0;
 time_t boot_time;
 static time_t grace_end = 0;
 static u32 current_clientid = 1;
@@ -3128,7 +3127,6 @@ nfs4_release_reclaim(void)
        struct nfs4_client_reclaim *crp = NULL;
        int i;
 
-       BUG_ON(!nfs4_reclaim_init);
        for (i = 0; i < CLIENT_HASH_SIZE; i++) {
                while (!list_empty(&reclaim_str_hashtbl[i])) {
                        crp = list_entry(reclaim_str_hashtbl[i].next,
@@ -3214,7 +3212,6 @@ nfs4_state_init(void)
        for (i = 0; i < CLIENT_HASH_SIZE; i++)
                INIT_LIST_HEAD(&reclaim_str_hashtbl[i]);
        reclaim_str_hashtbl_size = 0;
-       nfs4_reclaim_init = 1;
 }
 
 /* initialization to perform when the nfsd service is started: */