aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4state.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r--fs/nfsd/nfs4state.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 182448f7112a..9cc3b786d56c 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -51,7 +51,6 @@ static time_t boot_time;
51static u32 current_ownerid = 1; 51static u32 current_ownerid = 1;
52static u32 current_fileid = 1; 52static u32 current_fileid = 1;
53static u32 current_delegid = 1; 53static u32 current_delegid = 1;
54static u32 nfs4_init;
55static stateid_t zerostateid; /* bits all 0 */ 54static stateid_t zerostateid; /* bits all 0 */
56static stateid_t onestateid; /* bits all 1 */ 55static stateid_t onestateid; /* bits all 1 */
57static u64 current_sessionid = 1; 56static u64 current_sessionid = 1;
@@ -4071,16 +4070,8 @@ out_free_laundry:
4071int 4070int
4072nfs4_state_start(void) 4071nfs4_state_start(void)
4073{ 4072{
4074 int ret;
4075
4076 if (nfs4_init)
4077 return 0;
4078 nfsd4_load_reboot_recovery_data(); 4073 nfsd4_load_reboot_recovery_data();
4079 ret = __nfs4_state_start(); 4074 return __nfs4_state_start();
4080 if (ret)
4081 return ret;
4082 nfs4_init = 1;
4083 return 0;
4084} 4075}
4085 4076
4086static void 4077static void
@@ -4115,7 +4106,6 @@ __nfs4_state_shutdown(void)
4115 } 4106 }
4116 4107
4117 nfsd4_shutdown_recdir(); 4108 nfsd4_shutdown_recdir();
4118 nfs4_init = 0;
4119} 4109}
4120 4110
4121void 4111void