korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-23 06:21:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFS: Remove support for the 'mountprog' option

Browse Source 
Remove the mount option that allows users to specify an alternate mountd
program number.  The client hasn't support setting an alternate mountd
program number for a very long time.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2007-10-26 13:32:29 -04:00 committed by Trond Myklebust
parent ad879cef85
commit e887cbcf91
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfs/internal.h
View File

@ -52,7 +52,6 @@ struct nfs_parsed_mount_data {
struct sockaddr_in address;
char *hostname;
char *export_path;
unsigned int program;
int protocol;
} nfs_server;
};

11
fs/nfs/super.c
View File

@ -83,7 +83,7 @@ enum {
Opt_actimeo,
Opt_namelen,
Opt_mountport,
Opt_mountprog, Opt_mountvers,
Opt_mountvers,
Opt_nfsvers,
/* Mount options that take string arguments */
@ -137,7 +137,6 @@ static match_table_t nfs_mount_option_tokens = {
{ Opt_userspace, "retry=%u" },
{ Opt_namelen, "namlen=%u" },
{ Opt_mountport, "mountport=%u" },
{ Opt_mountprog, "mountprog=%u" },
{ Opt_mountvers, "mountvers=%u" },
{ Opt_nfsvers, "nfsvers=%u" },
{ Opt_nfsvers, "vers=%u" },
@ -786,13 +785,6 @@ static int nfs_parse_mount_options(char *raw,
return 0;
mnt->mount_server.port = option;
break;
case Opt_mountprog:
if (match_int(args, &option))
return 0;
if (option < 0)
return 0;
mnt->mount_server.program = option;
break;
case Opt_mountvers:
if (match_int(args, &option))
return 0;
@ -1082,7 +1074,6 @@ static int nfs_validate_mount_data(void *options,
args->acdirmin = 30;
args->acdirmax = 60;
args->mount_server.protocol = XPRT_TRANSPORT_UDP;
args->mount_server.program = NFS_MNT_PROGRAM;
args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
switch (data->version) {