diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2014-07-30 15:26:05 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-08-01 22:26:09 +0200 |
| commit | d9499a95716db0d4bc9b67e88fd162133e7d6b08 (patch) | |
| tree | 139fca41ecbec1737b9bbae6e57480b59f98ef6b /fs/nfsd/nfssvc.c | |
| parent | nfsd: rename unhash_generic_stateid to unhash_ol_stateid (diff) | |
| download | linux-d9499a95716db0d4bc9b67e88fd162133e7d6b08.tar.xz linux-d9499a95716db0d4bc9b67e88fd162133e7d6b08.zip | |
NFSD: Decrease nfsd_users in nfsd_startup_generic fail
A memory allocation failure could cause nfsd_startup_generic to fail, in
which case nfsd_users wouldn't be incorrectly left elevated.
After nfsd restarts nfsd_startup_generic will then succeed without doing
anything--the first consequence is likely nfs4_start_net finding a bad
laundry_wq and crashing.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Fixes: 4539f14981ce "nfsd: replace boolean nfsd_up flag by users counter"
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfssvc.c')
| -rw-r--r-- | fs/nfsd/nfssvc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 5d026dca00ca..752d56bbe0ba 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -221,7 +221,8 @@ static int nfsd_startup_generic(int nrservs) */ ret = nfsd_racache_init(2*nrservs); if (ret) - return ret; + goto dec_users; + ret = nfs4_state_start(); if (ret) goto out_racache; @@ -229,6 +230,8 @@ static int nfsd_startup_generic(int nrservs) out_racache: nfsd_racache_shutdown(); +dec_users: + nfsd_users--; return ret; } |