Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f08460dc authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

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: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 00a36a10

fs/nfs/super.c

+0 −11
Original line number Diff line number Diff line
@@ -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 @@ static int nfs23_validate_mount_data(void *options, 
	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;