Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of...

[firefly-linux-kernel-4.4.55.git] / fs / nfs / super.c

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index e4499d5b51e8f33a05fec43843c8648de834dfd7..31a11b0e885debd8706ceaf9e5957702f809a7f0 100644 (file)
--- 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;