NFS: Remove support for the 'mountprog' option
authorChuck Lever <chuck.lever@oracle.com>
Fri, 26 Oct 2007 17:32:29 +0000 (13:32 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 30 Jan 2008 07:05:46 +0000 (02:05 -0500)
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>
fs/nfs/internal.h
fs/nfs/super.c

index a78a09b40d1b17a8ed3b344759ce1b820d43cf28..058d503a0ee1316268bcf174b38daffe17b73517 100644 (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;
 };
index 1a18ca390ddfe15a7077c014c7b45ca6bad30541..330c3922739f94f5108e4afab12875ba45cc244c 100644 (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) {