Commit ad879cef authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust

NFS: Remove support for the 'nfsprog' option

Remove the mount option that allows users to specify an alternate NFS
program number.  The client hasn't support setting an alternate NFS
program number for a very long time.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 0eb25741
...@@ -43,7 +43,6 @@ struct nfs_parsed_mount_data { ...@@ -43,7 +43,6 @@ struct nfs_parsed_mount_data {
struct { struct {
struct sockaddr_in address; struct sockaddr_in address;
char *hostname; char *hostname;
unsigned int program;
unsigned int version; unsigned int version;
unsigned short port; unsigned short port;
int protocol; int protocol;
......
...@@ -84,7 +84,7 @@ enum { ...@@ -84,7 +84,7 @@ enum {
Opt_namelen, Opt_namelen,
Opt_mountport, Opt_mountport,
Opt_mountprog, Opt_mountvers, Opt_mountprog, Opt_mountvers,
Opt_nfsprog, Opt_nfsvers, Opt_nfsvers,
/* Mount options that take string arguments */ /* Mount options that take string arguments */
Opt_sec, Opt_proto, Opt_mountproto, Opt_sec, Opt_proto, Opt_mountproto,
...@@ -139,7 +139,6 @@ static match_table_t nfs_mount_option_tokens = { ...@@ -139,7 +139,6 @@ static match_table_t nfs_mount_option_tokens = {
{ Opt_mountport, "mountport=%u" }, { Opt_mountport, "mountport=%u" },
{ Opt_mountprog, "mountprog=%u" }, { Opt_mountprog, "mountprog=%u" },
{ Opt_mountvers, "mountvers=%u" }, { Opt_mountvers, "mountvers=%u" },
{ Opt_nfsprog, "nfsprog=%u" },
{ Opt_nfsvers, "nfsvers=%u" }, { Opt_nfsvers, "nfsvers=%u" },
{ Opt_nfsvers, "vers=%u" }, { Opt_nfsvers, "vers=%u" },
...@@ -801,13 +800,6 @@ static int nfs_parse_mount_options(char *raw, ...@@ -801,13 +800,6 @@ static int nfs_parse_mount_options(char *raw,
return 0; return 0;
mnt->mount_server.version = option; mnt->mount_server.version = option;
break; break;
case Opt_nfsprog:
if (match_int(args, &option))
return 0;
if (option < 0)
return 0;
mnt->nfs_server.program = option;
break;
case Opt_nfsvers: case Opt_nfsvers:
if (match_int(args, &option)) if (match_int(args, &option))
return 0; return 0;
...@@ -1067,9 +1059,6 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args, ...@@ -1067,9 +1059,6 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
* *
* + breaking back: trying proto=udp after proto=tcp, v2 after v3, * + breaking back: trying proto=udp after proto=tcp, v2 after v3,
* mountproto=tcp after mountproto=udp, and so on * mountproto=tcp after mountproto=udp, and so on
*
* XXX: as far as I can tell, changing the NFS program number is not
* supported in the NFS client.
*/ */
static int nfs_validate_mount_data(void *options, static int nfs_validate_mount_data(void *options,
struct nfs_parsed_mount_data *args, struct nfs_parsed_mount_data *args,
...@@ -1095,7 +1084,6 @@ static int nfs_validate_mount_data(void *options, ...@@ -1095,7 +1084,6 @@ static int nfs_validate_mount_data(void *options,
args->mount_server.protocol = XPRT_TRANSPORT_UDP; args->mount_server.protocol = XPRT_TRANSPORT_UDP;
args->mount_server.program = NFS_MNT_PROGRAM; args->mount_server.program = NFS_MNT_PROGRAM;
args->nfs_server.protocol = XPRT_TRANSPORT_TCP; args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
args->nfs_server.program = NFS_PROGRAM;
switch (data->version) { switch (data->version) {
case 1: case 1:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment