Commit 707d4ab7 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds

[PATCH] knfsd: nfsd4: remove nfs4_reclaim_init

nfs4_reclaim_init is no longer performing any useful function.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ac4d8ff2
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
/* Globals */ /* Globals */
static time_t lease_time = 90; /* default lease time */ static time_t lease_time = 90; /* default lease time */
static time_t user_lease_time = 90; static time_t user_lease_time = 90;
static u32 nfs4_reclaim_init = 0;
time_t boot_time; time_t boot_time;
static time_t grace_end = 0; static time_t grace_end = 0;
static u32 current_clientid = 1; static u32 current_clientid = 1;
...@@ -3128,7 +3127,6 @@ nfs4_release_reclaim(void) ...@@ -3128,7 +3127,6 @@ nfs4_release_reclaim(void)
struct nfs4_client_reclaim *crp = NULL; struct nfs4_client_reclaim *crp = NULL;
int i; int i;
BUG_ON(!nfs4_reclaim_init);
for (i = 0; i < CLIENT_HASH_SIZE; i++) { for (i = 0; i < CLIENT_HASH_SIZE; i++) {
while (!list_empty(&reclaim_str_hashtbl[i])) { while (!list_empty(&reclaim_str_hashtbl[i])) {
crp = list_entry(reclaim_str_hashtbl[i].next, crp = list_entry(reclaim_str_hashtbl[i].next,
...@@ -3214,7 +3212,6 @@ nfs4_state_init(void) ...@@ -3214,7 +3212,6 @@ nfs4_state_init(void)
for (i = 0; i < CLIENT_HASH_SIZE; i++) for (i = 0; i < CLIENT_HASH_SIZE; i++)
INIT_LIST_HEAD(&reclaim_str_hashtbl[i]); INIT_LIST_HEAD(&reclaim_str_hashtbl[i]);
reclaim_str_hashtbl_size = 0; reclaim_str_hashtbl_size = 0;
nfs4_reclaim_init = 1;
} }
/* initialization to perform when the nfsd service is started: */ /* initialization to perform when the nfsd service is started: */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment