diff options
author | NeilBrown <neilb@cse.unsw.edu.au> | 2005-06-24 01:03:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:06:32 -0400 |
commit | 707d4ab7b3aa6d1f7a7d2cd123fb83ba9a528205 (patch) | |
tree | b5b12bf45baacc0659fd419a5df93166710748f3 | |
parent | ac4d8ff2a57179de3ef7834c6ab3fac430b0a05d (diff) |
[PATCH] knfsd: nfsd4: remove nfs4_reclaim_init
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>
-rw-r--r-- | fs/nfsd/nfs4state.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 1f68ce36e724..fb9b4eb4302d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -54,7 +54,6 @@ | |||
54 | /* Globals */ | 54 | /* Globals */ |
55 | static time_t lease_time = 90; /* default lease time */ | 55 | static time_t lease_time = 90; /* default lease time */ |
56 | static time_t user_lease_time = 90; | 56 | static time_t user_lease_time = 90; |
57 | static u32 nfs4_reclaim_init = 0; | ||
58 | time_t boot_time; | 57 | time_t boot_time; |
59 | static time_t grace_end = 0; | 58 | static time_t grace_end = 0; |
60 | static u32 current_clientid = 1; | 59 | static u32 current_clientid = 1; |
@@ -3128,7 +3127,6 @@ nfs4_release_reclaim(void) | |||
3128 | struct nfs4_client_reclaim *crp = NULL; | 3127 | struct nfs4_client_reclaim *crp = NULL; |
3129 | int i; | 3128 | int i; |
3130 | 3129 | ||
3131 | BUG_ON(!nfs4_reclaim_init); | ||
3132 | for (i = 0; i < CLIENT_HASH_SIZE; i++) { | 3130 | for (i = 0; i < CLIENT_HASH_SIZE; i++) { |
3133 | while (!list_empty(&reclaim_str_hashtbl[i])) { | 3131 | while (!list_empty(&reclaim_str_hashtbl[i])) { |
3134 | crp = list_entry(reclaim_str_hashtbl[i].next, | 3132 | crp = list_entry(reclaim_str_hashtbl[i].next, |
@@ -3214,7 +3212,6 @@ nfs4_state_init(void) | |||
3214 | for (i = 0; i < CLIENT_HASH_SIZE; i++) | 3212 | for (i = 0; i < CLIENT_HASH_SIZE; i++) |
3215 | INIT_LIST_HEAD(&reclaim_str_hashtbl[i]); | 3213 | INIT_LIST_HEAD(&reclaim_str_hashtbl[i]); |
3216 | reclaim_str_hashtbl_size = 0; | 3214 | reclaim_str_hashtbl_size = 0; |
3217 | nfs4_reclaim_init = 1; | ||
3218 | } | 3215 | } |
3219 | 3216 | ||
3220 | /* initialization to perform when the nfsd service is started: */ | 3217 | /* initialization to perform when the nfsd service is started: */ |