aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfsd/export.c11
-rw-r--r--include/linux/nfsd/export.h1
2 files changed, 0 insertions, 12 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 99229b0c153e..62f3b9074e84 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -317,7 +317,6 @@ static void svc_export_put(struct kref *ref)
317 struct svc_export *exp = container_of(ref, struct svc_export, h.ref); 317 struct svc_export *exp = container_of(ref, struct svc_export, h.ref);
318 path_put(&exp->ex_path); 318 path_put(&exp->ex_path);
319 auth_domain_put(exp->ex_client); 319 auth_domain_put(exp->ex_client);
320 kfree(exp->ex_pathname);
321 nfsd4_fslocs_free(&exp->ex_fslocs); 320 nfsd4_fslocs_free(&exp->ex_fslocs);
322 kfree(exp); 321 kfree(exp);
323} 322}
@@ -527,11 +526,6 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
527 526
528 exp.ex_client = dom; 527 exp.ex_client = dom;
529 528
530 err = -ENOMEM;
531 exp.ex_pathname = kstrdup(buf, GFP_KERNEL);
532 if (!exp.ex_pathname)
533 goto out2;
534
535 /* expiry */ 529 /* expiry */
536 err = -EINVAL; 530 err = -EINVAL;
537 exp.h.expiry_time = get_expiry(&mesg); 531 exp.h.expiry_time = get_expiry(&mesg);
@@ -612,8 +606,6 @@ out4:
612 nfsd4_fslocs_free(&exp.ex_fslocs); 606 nfsd4_fslocs_free(&exp.ex_fslocs);
613 kfree(exp.ex_uuid); 607 kfree(exp.ex_uuid);
614out3: 608out3:
615 kfree(exp.ex_pathname);
616out2:
617 path_put(&exp.ex_path); 609 path_put(&exp.ex_path);
618out1: 610out1:
619 auth_domain_put(dom); 611 auth_domain_put(dom);
@@ -677,7 +669,6 @@ static void svc_export_init(struct cache_head *cnew, struct cache_head *citem)
677 new->ex_client = item->ex_client; 669 new->ex_client = item->ex_client;
678 new->ex_path.dentry = dget(item->ex_path.dentry); 670 new->ex_path.dentry = dget(item->ex_path.dentry);
679 new->ex_path.mnt = mntget(item->ex_path.mnt); 671 new->ex_path.mnt = mntget(item->ex_path.mnt);
680 new->ex_pathname = NULL;
681 new->ex_fslocs.locations = NULL; 672 new->ex_fslocs.locations = NULL;
682 new->ex_fslocs.locations_count = 0; 673 new->ex_fslocs.locations_count = 0;
683 new->ex_fslocs.migrated = 0; 674 new->ex_fslocs.migrated = 0;
@@ -695,8 +686,6 @@ static void export_update(struct cache_head *cnew, struct cache_head *citem)
695 new->ex_fsid = item->ex_fsid; 686 new->ex_fsid = item->ex_fsid;
696 new->ex_uuid = item->ex_uuid; 687 new->ex_uuid = item->ex_uuid;
697 item->ex_uuid = NULL; 688 item->ex_uuid = NULL;
698 new->ex_pathname = item->ex_pathname;
699 item->ex_pathname = NULL;
700 new->ex_fslocs.locations = item->ex_fslocs.locations; 689 new->ex_fslocs.locations = item->ex_fslocs.locations;
701 item->ex_fslocs.locations = NULL; 690 item->ex_fslocs.locations = NULL;
702 new->ex_fslocs.locations_count = item->ex_fslocs.locations_count; 691 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 7ba3fd43f312..f85308e688fd 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -96,7 +96,6 @@ struct svc_export {
96 struct auth_domain * ex_client; 96 struct auth_domain * ex_client;
97 int ex_flags; 97 int ex_flags;
98 struct path ex_path; 98 struct path ex_path;
99 char *ex_pathname;
100 uid_t ex_anon_uid; 99 uid_t ex_anon_uid;
101 gid_t ex_anon_gid; 100 gid_t ex_anon_gid;
102 int ex_fsid; 101 int ex_fsid;