Messages in this thread Patches in this message | | | From | NeilBrown <> | Date | Fri, 29 Sep 2006 13:09:04 +1000 | Subject | [PATCH 005 of 8] knfsd: nfsd: store export path in export |
| |
From: J.Bruce Fields <bfields@fieldses.org>
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@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de>
### Diffstat output ./fs/nfsd/export.c | 10 ++++++++++ ./include/linux/nfsd/export.h | 1 + 2 files changed, 11 insertions(+)
diff .prev/fs/nfsd/export.c ./fs/nfsd/export.c --- .prev/fs/nfsd/export.c 2006-09-29 12:57:30.000000000 +1000 +++ ./fs/nfsd/export.c 2006-09-29 12:57:47.000000000 +1000 @@ -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 .prev/include/linux/nfsd/export.h ./include/linux/nfsd/export.h --- .prev/include/linux/nfsd/export.h 2006-09-29 12:57:30.000000000 +1000 +++ ./include/linux/nfsd/export.h 2006-09-29 12:57:47.000000000 +1000 @@ -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; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |