The patch titled
knfsd: nfsd: store export path in export
has been removed from the -mm tree. Its filename is
knfsd-nfsd-store-export-path-in-export.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: knfsd: nfsd: store export path in export
From: J.Bruce Fields <bfields@xxxxxxxxxxxx>
Store the export path in the svc_export structure instead of storing only the
dentry. This will prevent the need for additional d_path calls to provide
NFSv4 fs_locations support.
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfsd/export.c | 10 ++++++++++
include/linux/nfsd/export.h | 1 +
2 files changed, 11 insertions(+)
diff -puN fs/nfsd/export.c~knfsd-nfsd-store-export-path-in-export fs/nfsd/export.c
--- a/fs/nfsd/export.c~knfsd-nfsd-store-export-path-in-export
+++ a/fs/nfsd/export.c
@@ -325,6 +325,7 @@ static void svc_export_put(struct kref *
dput(exp->ex_dentry);
mntput(exp->ex_mnt);
auth_domain_put(exp->ex_client);
+ kfree(exp->ex_path);
kfree(exp);
}
@@ -398,6 +399,7 @@ static int svc_export_parse(struct cache
int an_int;
nd.dentry = NULL;
+ exp.ex_path = NULL;
if (mesg[mlen-1] != '\n')
return -EINVAL;
@@ -428,6 +430,10 @@ static int svc_export_parse(struct cache
exp.ex_client = dom;
exp.ex_mnt = nd.mnt;
exp.ex_dentry = nd.dentry;
+ exp.ex_path = kstrdup(buf, GFP_KERNEL);
+ err = -ENOMEM;
+ if (!exp.ex_path)
+ goto out;
/* expiry */
err = -EINVAL;
@@ -473,6 +479,7 @@ static int svc_export_parse(struct cache
else
exp_put(expp);
out:
+ kfree(exp.ex_path);
if (nd.dentry)
path_release(&nd);
out_no_path:
@@ -524,6 +531,7 @@ static void svc_export_init(struct cache
new->ex_client = item->ex_client;
new->ex_dentry = dget(item->ex_dentry);
new->ex_mnt = mntget(item->ex_mnt);
+ new->ex_path = NULL;
}
static void export_update(struct cache_head *cnew, struct cache_head *citem)
@@ -535,6 +543,8 @@ static void export_update(struct cache_h
new->ex_anon_uid = item->ex_anon_uid;
new->ex_anon_gid = item->ex_anon_gid;
new->ex_fsid = item->ex_fsid;
+ new->ex_path = item->ex_path;
+ item->ex_path = NULL;
}
static struct cache_head *svc_export_alloc(void)
diff -puN include/linux/nfsd/export.h~knfsd-nfsd-store-export-path-in-export include/linux/nfsd/export.h
--- a/include/linux/nfsd/export.h~knfsd-nfsd-store-export-path-in-export
+++ a/include/linux/nfsd/export.h
@@ -51,6 +51,7 @@ struct svc_export {
int ex_flags;
struct vfsmount * ex_mnt;
struct dentry * ex_dentry;
+ char * ex_path;
uid_t ex_anon_uid;
gid_t ex_anon_gid;
int ex_fsid;
_
Patches currently in -mm which might be from bfields@xxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
