diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-07-19 22:50:04 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-07-23 14:51:22 +0200 |
| commit | 4ad9a344be2291b1e594a4a5aee25c5a5df34a97 (patch) | |
| tree | f2e8780a1461194231fbb124cffc964517424c1e /fs/nfsd/nfs4state.c | |
| parent | nfsd: remove unused assignment from nfsd_link (diff) | |
| download | linux-4ad9a344be2291b1e594a4a5aee25c5a5df34a97.tar.xz linux-4ad9a344be2291b1e594a4a5aee25c5a5df34a97.zip | |
nfsd4: fix v4 state shutdown error paths
If someone tries to shut down the laundry_wq while it isn't up it'll
cause an oops.
This can happen because write_ports can create a nfsd_svc before we
really start the nfs server, and we may fail before the server is ever
started.
Also make sure state is shutdown on error paths in nfsd_svc().
Use a common global nfsd_up flag instead of nfs4_init, and create common
helper functions for nfsd start/shutdown, as there will be other work
that we want done only when we the number of nfsd threads transitions
between zero and nonzero.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 12 |
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; static u32 current_ownerid = 1; static u32 current_fileid = 1; static u32 current_delegid = 1; -static u32 nfs4_init; static stateid_t zerostateid; /* bits all 0 */ static stateid_t onestateid; /* bits all 1 */ static u64 current_sessionid = 1; @@ -4071,16 +4070,8 @@ out_free_laundry: int nfs4_state_start(void) { - int ret; - - if (nfs4_init) - return 0; nfsd4_load_reboot_recovery_data(); - ret = __nfs4_state_start(); - if (ret) - return ret; - nfs4_init = 1; - return 0; + return __nfs4_state_start(); } static void @@ -4115,7 +4106,6 @@ __nfs4_state_shutdown(void) } nfsd4_shutdown_recdir(); - nfs4_init = 0; } void |