NFSD: Remove the ex_pathname field from struct svc_export

There are no more users...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 99229b0c153e1c3c38b2c36218fbeb0d34f77629..62f3b9074e8490897af08811ec184cacc9ad554b 100644 (file)
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -317,7 +317,6 @@ static void svc_export_put(struct kref *ref)
        struct svc_export *exp = container_of(ref, struct svc_export, h.ref);
        path_put(&exp->ex_path);
        auth_domain_put(exp->ex_client);
-       kfree(exp->ex_pathname);
        nfsd4_fslocs_free(&exp->ex_fslocs);
        kfree(exp);
 }
@@ -527,11 +526,6 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
 
        exp.ex_client = dom;
 
-       err = -ENOMEM;
-       exp.ex_pathname = kstrdup(buf, GFP_KERNEL);
-       if (!exp.ex_pathname)
-               goto out2;
-
        /* expiry */
        err = -EINVAL;
        exp.h.expiry_time = get_expiry(&mesg);
@@ -612,8 +606,6 @@ out4:
        nfsd4_fslocs_free(&exp.ex_fslocs);
        kfree(exp.ex_uuid);
 out3:
-       kfree(exp.ex_pathname);
-out2:
        path_put(&exp.ex_path);
 out1:
        auth_domain_put(dom);
@@ -677,7 +669,6 @@ static void svc_export_init(struct cache_head *cnew, struct cache_head *citem)
        new->ex_client = item->ex_client;
        new->ex_path.dentry = dget(item->ex_path.dentry);
        new->ex_path.mnt = mntget(item->ex_path.mnt);
-       new->ex_pathname = NULL;
        new->ex_fslocs.locations = NULL;
        new->ex_fslocs.locations_count = 0;
        new->ex_fslocs.migrated = 0;
@@ -695,8 +686,6 @@ static void export_update(struct cache_head *cnew, struct cache_head *citem)
        new->ex_fsid = item->ex_fsid;
        new->ex_uuid = item->ex_uuid;
        item->ex_uuid = NULL;
-       new->ex_pathname = item->ex_pathname;
-       item->ex_pathname = NULL;
        new->ex_fslocs.locations = item->ex_fslocs.locations;
        item->ex_fslocs.locations = NULL;
        new->ex_fslocs.locations_count = item->ex_fslocs.locations_count;

diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 7ba3fd43f3127efb850d6338f5d6c351af804f77..f85308e688fd712f039ac45a5f442240113ad0bf 100644 (file)
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -96,7 +96,6 @@ struct svc_export {
        struct auth_domain *    ex_client;
        int                     ex_flags;
        struct path             ex_path;
-       char                    *ex_pathname;
        uid_t                   ex_anon_uid;
        gid_t                   ex_anon_gid;
        int                     ex_fsid;