diff options
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index a511eff05698..1d6812db5099 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -2301,7 +2301,7 @@ nfsd4_free_slabs(void) | |||
2301 | nfsd4_free_slab(&deleg_slab); | 2301 | nfsd4_free_slab(&deleg_slab); |
2302 | } | 2302 | } |
2303 | 2303 | ||
2304 | static int | 2304 | int |
2305 | nfsd4_init_slabs(void) | 2305 | nfsd4_init_slabs(void) |
2306 | { | 2306 | { |
2307 | openowner_slab = kmem_cache_create("nfsd4_openowners", | 2307 | openowner_slab = kmem_cache_create("nfsd4_openowners", |
@@ -4546,14 +4546,11 @@ void nfsd_recall_delegations(u64 num) | |||
4546 | 4546 | ||
4547 | /* initialization to perform at module load time: */ | 4547 | /* initialization to perform at module load time: */ |
4548 | 4548 | ||
4549 | int | 4549 | void |
4550 | nfs4_state_init(void) | 4550 | nfs4_state_init(void) |
4551 | { | 4551 | { |
4552 | int i, status; | 4552 | int i; |
4553 | 4553 | ||
4554 | status = nfsd4_init_slabs(); | ||
4555 | if (status) | ||
4556 | return status; | ||
4557 | for (i = 0; i < CLIENT_HASH_SIZE; i++) { | 4554 | for (i = 0; i < CLIENT_HASH_SIZE; i++) { |
4558 | INIT_LIST_HEAD(&conf_id_hashtbl[i]); | 4555 | INIT_LIST_HEAD(&conf_id_hashtbl[i]); |
4559 | INIT_LIST_HEAD(&conf_str_hashtbl[i]); | 4556 | INIT_LIST_HEAD(&conf_str_hashtbl[i]); |
@@ -4577,7 +4574,6 @@ nfs4_state_init(void) | |||
4577 | INIT_LIST_HEAD(&client_lru); | 4574 | INIT_LIST_HEAD(&client_lru); |
4578 | INIT_LIST_HEAD(&del_recall_lru); | 4575 | INIT_LIST_HEAD(&del_recall_lru); |
4579 | reclaim_str_hashtbl_size = 0; | 4576 | reclaim_str_hashtbl_size = 0; |
4580 | return 0; | ||
4581 | } | 4577 | } |
4582 | 4578 | ||
4583 | static void | 4579 | static void |