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>
This commit is contained in:
parent
00a36a1090
commit
f08460dc23
|
@ -2065,11 +2065,6 @@ static int nfs23_validate_mount_data(void *options,
|
||||||
return NFS_TEXT_DATA;
|
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;
|
return 0;
|
||||||
|
|
||||||
out_no_data:
|
out_no_data:
|
||||||
|
@ -2085,12 +2080,6 @@ out_no_sec:
|
||||||
dfprintk(MOUNT, "NFS: nfs_mount_data version supports only AUTH_SYS\n");
|
dfprintk(MOUNT, "NFS: nfs_mount_data version supports only AUTH_SYS\n");
|
||||||
return -EINVAL;
|
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:
|
out_nomem:
|
||||||
dfprintk(MOUNT, "NFS: not enough memory to handle mount options\n");
|
dfprintk(MOUNT, "NFS: not enough memory to handle mount options\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
Loading…
Reference in a new issue