diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/internal.h | 1 | ||||
-rw-r--r-- | fs/nfs/super.c | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index a78a09b40d1b..058d503a0ee1 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h | |||
@@ -52,7 +52,6 @@ struct nfs_parsed_mount_data { | |||
52 | struct sockaddr_in address; | 52 | struct sockaddr_in address; |
53 | char *hostname; | 53 | char *hostname; |
54 | char *export_path; | 54 | char *export_path; |
55 | unsigned int program; | ||
56 | int protocol; | 55 | int protocol; |
57 | } nfs_server; | 56 | } nfs_server; |
58 | }; | 57 | }; |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 1a18ca390ddf..330c3922739f 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -83,7 +83,7 @@ enum { | |||
83 | Opt_actimeo, | 83 | Opt_actimeo, |
84 | Opt_namelen, | 84 | Opt_namelen, |
85 | Opt_mountport, | 85 | Opt_mountport, |
86 | Opt_mountprog, Opt_mountvers, | 86 | Opt_mountvers, |
87 | Opt_nfsvers, | 87 | Opt_nfsvers, |
88 | 88 | ||
89 | /* Mount options that take string arguments */ | 89 | /* Mount options that take string arguments */ |
@@ -137,7 +137,6 @@ static match_table_t nfs_mount_option_tokens = { | |||
137 | { Opt_userspace, "retry=%u" }, | 137 | { Opt_userspace, "retry=%u" }, |
138 | { Opt_namelen, "namlen=%u" }, | 138 | { Opt_namelen, "namlen=%u" }, |
139 | { Opt_mountport, "mountport=%u" }, | 139 | { Opt_mountport, "mountport=%u" }, |
140 | { Opt_mountprog, "mountprog=%u" }, | ||
141 | { Opt_mountvers, "mountvers=%u" }, | 140 | { Opt_mountvers, "mountvers=%u" }, |
142 | { Opt_nfsvers, "nfsvers=%u" }, | 141 | { Opt_nfsvers, "nfsvers=%u" }, |
143 | { Opt_nfsvers, "vers=%u" }, | 142 | { Opt_nfsvers, "vers=%u" }, |
@@ -786,13 +785,6 @@ static int nfs_parse_mount_options(char *raw, | |||
786 | return 0; | 785 | return 0; |
787 | mnt->mount_server.port = option; | 786 | mnt->mount_server.port = option; |
788 | break; | 787 | break; |
789 | case Opt_mountprog: | ||
790 | if (match_int(args, &option)) | ||
791 | return 0; | ||
792 | if (option < 0) | ||
793 | return 0; | ||
794 | mnt->mount_server.program = option; | ||
795 | break; | ||
796 | case Opt_mountvers: | 788 | case Opt_mountvers: |
797 | if (match_int(args, &option)) | 789 | if (match_int(args, &option)) |
798 | return 0; | 790 | return 0; |
@@ -1082,7 +1074,6 @@ static int nfs_validate_mount_data(void *options, | |||
1082 | args->acdirmin = 30; | 1074 | args->acdirmin = 30; |
1083 | args->acdirmax = 60; | 1075 | args->acdirmax = 60; |
1084 | args->mount_server.protocol = XPRT_TRANSPORT_UDP; | 1076 | args->mount_server.protocol = XPRT_TRANSPORT_UDP; |
1085 | args->mount_server.program = NFS_MNT_PROGRAM; | ||
1086 | args->nfs_server.protocol = XPRT_TRANSPORT_TCP; | 1077 | args->nfs_server.protocol = XPRT_TRANSPORT_TCP; |
1087 | 1078 | ||
1088 | switch (data->version) { | 1079 | switch (data->version) { |