summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2009-06-16 11:03:20 +1000
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-06-18 09:42:41 -0700
commit671e1fcf63fd115eabcb693b06cbc2e4a3d1a3a3 (patch)
tree601c7896733bf026db66ebbb183c3675e89e37d7 /fs/nfsd
parent82e12fe9244ff653f703722a8937b595e10e71f4 (diff)
downloadop-kernel-dev-671e1fcf63fd115eabcb693b06cbc2e4a3d1a3a3.zip
op-kernel-dev-671e1fcf63fd115eabcb693b06cbc2e4a3d1a3a3.tar.gz
nfsd: optimise the starting of zero threads when none are running.
Currently, if we ask to set then number of nfsd threads to zero when there are none running, we set up all the sockets and register the service, and then tear it all down again. This is pointless. So detect that case and exit promptly. (also remove an assignment to 'error' which was never used. Signed-off-by: NeilBrown <neilb@suse.de> Acked-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfssvc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 209eaa0..d4c9884 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -390,12 +390,14 @@ nfsd_svc(unsigned short port, int nrservs)
mutex_lock(&nfsd_mutex);
dprintk("nfsd: creating service\n");
- error = -EINVAL;
if (nrservs <= 0)
nrservs = 0;
if (nrservs > NFSD_MAXSERVS)
nrservs = NFSD_MAXSERVS;
-
+ error = 0;
+ if (nrservs == 0 && nfsd_serv == NULL)
+ goto out;
+
/* Readahead param cache - will no-op if it already exists */
error = nfsd_racache_init(2*nrservs);
if (error<0)
OpenPOWER on IntegriCloud