From b1140c17777c5bac3bd0cbaef67abbd952ee2924 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 13 Dec 2006 00:35:45 -0800 Subject: [PATCH] --- yaml --- r: 44514 b: refs/heads/master c: f988443a84528bd30c2f474efa5e2c511959f19b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfsd/export.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8e322c7560f5..6e5e73420f6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd08d6ea443abafe9455997d2889719364b8794b +refs/heads/master: f988443a84528bd30c2f474efa5e2c511959f19b diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c index 1137d09c5976..248dd92e6a56 100644 --- a/trunk/fs/nfsd/export.c +++ b/trunk/fs/nfsd/export.c @@ -955,6 +955,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)) && @@ -985,6 +987,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; @@ -1005,10 +1010,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))