diff options
| author | NeilBrown <neilb@suse.de> | 2007-01-25 15:35:17 +1100 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2007-02-05 08:31:43 -0800 |
| commit | 92ad857a3c2e40b191c61d5afccdb20d74844766 (patch) | |
| tree | 64c2eae16bb87383bbd9099597ca1f809b349d15 | |
| parent | dbd2bd734a5559fd167577e37498bad0b2f33d8a (diff) | |
| download | kernel-common-92ad857a3c2e40b191c61d5afccdb20d74844766.tar.gz kernel-common-92ad857a3c2e40b191c61d5afccdb20d74844766.tar.bz2 kernel-common-92ad857a3c2e40b191c61d5afccdb20d74844766.zip | |
[PATCH] knfsd: fix up some bit-rot in exp_export
The nfsservctl systemcall isn't used but recent nfs-utils releases for
exporting filesystems, and consequently the code that is uses -
exp_export - has suffered some bitrot.
Particular:
- some newly added fields in 'struct svc_export' are being initialised
properly.
- the return value is now always -ENOMEM ...
This patch fixes both these problems.
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | fs/nfsd/export.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index f37df46d2eaa..ae60325608c1 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -950,6 +950,8 @@ exp_export(struct nfsctl_export *nxp) exp = exp_get_by_name(clp, nd.mnt, nd.dentry, NULL); + memset(&new, 0, sizeof(new)); + /* must make sure there won't be an ex_fsid clash */ if ((nxp->ex_flags & NFSEXP_FSID) && (fsid_key = exp_get_fsid_key(clp, nxp->ex_dev)) && @@ -980,6 +982,9 @@ exp_export(struct nfsctl_export *nxp) new.h.expiry_time = NEVER; new.h.flags = 0; + new.ex_path = kstrdup(nxp->ex_path, GFP_KERNEL); + if (!new.ex_path) + goto finish; new.ex_client = clp; new.ex_mnt = nd.mnt; new.ex_dentry = nd.dentry; @@ -1000,10 +1005,11 @@ exp_export(struct nfsctl_export *nxp) /* failed to create at least one index */ exp_do_unexport(exp); cache_flush(); - err = -ENOMEM; - } - + } else + err = 0; finish: + if (new.ex_path) + kfree(new.ex_path); if (exp) exp_put(exp); if (fsid_key && !IS_ERR(fsid_key)) |