diff options
| author | James Morris <jmorris@namei.org> | 2009-06-30 09:10:35 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-30 09:10:35 +1000 |
| commit | ac7242142b03421c96b0a2f8d99f146d075614c2 (patch) | |
| tree | b0b2ead65858c7a343d38affed86fe815e37e7e9 /fs/nfsd/nfssvc.c | |
| parent | 89c86576ecde504da1eeb4f4882b2189ac2f9c4a (diff) | |
| parent | 2bfdd79eaa0043346e773ba5f6cfd811ea31b73d (diff) | |
| download | op-kernel-dev-ac7242142b03421c96b0a2f8d99f146d075614c2.zip op-kernel-dev-ac7242142b03421c96b0a2f8d99f146d075614c2.tar.gz | |
Merge branch 'master' into next
Diffstat (limited to 'fs/nfsd/nfssvc.c')
| -rw-r--r-- | fs/nfsd/nfssvc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index cbba4a9..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) @@ -413,6 +415,12 @@ nfsd_svc(unsigned short port, int nrservs) goto failure; error = svc_set_num_threads(nfsd_serv, NULL, nrservs); + if (error == 0) + /* We are holding a reference to nfsd_serv which + * we don't want to count in the return value, + * so subtract 1 + */ + error = nfsd_serv->sv_nrthreads - 1; failure: svc_destroy(nfsd_serv); /* Release server */ out: |
