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

Commit 42c2c424 authored by Steve Dickson's avatar Steve Dickson Committed by Trond Myklebust
Browse files

NFSv4.2: Added NFS v4.2 support to the NFS client 



This enable NFSv4.2 support. To enable this code the
CONFIG_NFS_V4_2 Kconfig define needs to be set and
the -o v4.2 mount option need to be used.

Signed-off-by: default avatarSteve Dickson <steved@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent eb9ae686

fs/nfs/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -104,6 +104,15 @@ config NFS_V4_1 


	  If unsure, say N.



config NFS_V4_2

	bool "NFS client support for NFSv4.2"

	depends on NFS_V4_1

	help

	  This option enables support for minor version 2 of the NFSv4 protocol

	  in the kernel's NFS client.



	  If unsure, say N.



config PNFS_FILE_LAYOUT

	tristate

	depends on NFS_V4_1

fs/nfs/callback.c

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n 
			ret = nfs4_callback_up_net(serv, net);

			break;

		case 1:

		case 2:

			ret = nfs41_callback_up_net(serv, net);

			break;

		default:

fs/nfs/callback_xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -166,9 +166,9 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound 
	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	hdr->minorversion = ntohl(*p++);

	/* Check minor version is zero or one. */

	if (hdr->minorversion <= 1) {

		hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 */

	/* Check minor version is zero or one or two. */

	if (hdr->minorversion <= 2) {

		hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 and v4.2 */

	} else {

		pr_warn_ratelimited("NFS: %s: NFSv4 server callback with "

			"illegal minor version %u!\n",

fs/nfs/nfs4client.c

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init) 
	if (err)

		goto error;



	if (cl_init->minorversion > NFS4_MAX_MINOR_VERSION) {

		err = -EINVAL;

		goto error;

	}



	spin_lock_init(&clp->cl_lock);

	INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);

	rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");

fs/nfs/nfs4proc.c

+15 −0
Original line number Diff line number Diff line
@@ -7004,11 +7004,26 @@ static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = { 
};

#endif



#if defined(CONFIG_NFS_V4_2)

static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = {

	.minor_version = 2,

	.call_sync = nfs4_call_sync_sequence,

	.match_stateid = nfs41_match_stateid,

	.find_root_sec = nfs41_find_root_sec,

	.reboot_recovery_ops = &nfs41_reboot_recovery_ops,

	.nograce_recovery_ops = &nfs41_nograce_recovery_ops,

	.state_renewal_ops = &nfs41_state_renewal_ops,

};

#endif



const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {

	[0] = &nfs_v4_0_minor_ops,

#if defined(CONFIG_NFS_V4_1)

	[1] = &nfs_v4_1_minor_ops,

#endif

#if defined(CONFIG_NFS_V4_2)

	[2] = &nfs_v4_2_minor_ops,

#endif

};



const struct inode_operations nfs4_dir_inode_operations = {