summaryrefslogtreecommitdiff
path: root/fs/nfs/super.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2013-06-27 15:54:40 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-06-28 15:51:51 -0400
commitfb9b02fda06798cfca975c8b7fae3e6188a30572 (patch)
tree20bc9c269443d11fa3fbda842874ecb5642acdfe /fs/nfs/super.c
parent294ae81d4f89c76b7c5bbad7b14a43c02f6d738d (diff)
nfs: have nfs_mount fake up a auth_flavs list when the server didn't provide it
Instead of handling this as a special case in the auth-selection code, we can simply fake up an auth_flavs list when the server doesn't provide it. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r--fs/nfs/super.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index a0949f5c00ba..ceb60c78bfc0 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1620,19 +1620,6 @@ static int nfs_select_flavor(struct nfs_parsed_mount_data *args,
rpc_authflavor_t flavor;
/*
- * The NFSv2 MNT operation does not return a flavor list.
- */
- if (args->mount_server.version != NFS_MNT3_VERSION)
- goto out_default;
-
- /*
- * Certain releases of Linux's mountd return an empty
- * flavor list in some cases.
- */
- if (count == 0)
- goto out_default;
-
- /*
* If the sec= mount option is used, the specified flavor or AUTH_NULL
* must be in the list returned by the server.
*