diff options
| author | Anna Schumaker <Anna.Schumaker@netapp.com> | 2014-09-03 12:19:09 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-12 13:50:20 -0400 |
| commit | f08460dc23db1e5cd6b7ab34a62ffea60f55725f (patch) | |
| tree | f3ca4680298b1b2572fcaee8421abadd9104af3a | |
| parent | 00a36a1090350995127c2a4bfac6be7fc85b5b81 (diff) | |
| download | linux-f08460dc23db1e5cd6b7ab34a62ffea60f55725f.tar.gz linux-f08460dc23db1e5cd6b7ab34a62ffea60f55725f.tar.bz2 linux-f08460dc23db1e5cd6b7ab34a62ffea60f55725f.zip | |
NFS: Remove v3 not compiled check from validate_mount_data()
This check is already performed by the module loading code - if the
module can't be found then -EPROTONOSUPPORT will be returned. Let's
handle v3 this way, too.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/super.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index e4499d5b51e8..31a11b0e885d 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2065,11 +2065,6 @@ static int nfs23_validate_mount_data(void *options, return NFS_TEXT_DATA; } -#if !IS_ENABLED(CONFIG_NFS_V3) - if (args->version == 3) - goto out_v3_not_compiled; -#endif /* !CONFIG_NFS_V3 */ - return 0; out_no_data: @@ -2085,12 +2080,6 @@ out_no_sec: dfprintk(MOUNT, "NFS: nfs_mount_data version supports only AUTH_SYS\n"); return -EINVAL; -#if !IS_ENABLED(CONFIG_NFS_V3) -out_v3_not_compiled: - dfprintk(MOUNT, "NFS: NFSv3 is not compiled into kernel\n"); - return -EPROTONOSUPPORT; -#endif /* !CONFIG_NFS_V3 */ - out_nomem: dfprintk(MOUNT, "NFS: not enough memory to handle mount options\n"); return -ENOMEM; |