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

Commit 98f98cf5 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Set the RPC_CLNT_CREATE_INFINITE_SLOTS flag for NFSv4.1 transports 



This ensures that the RPC layer doesn't override the NFS session
negotiation.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b7993ceb

fs/nfs/client.c

+2 −0
Original line number Diff line number Diff line
@@ -593,6 +593,8 @@ int nfs_create_rpc_client(struct nfs_client *clp, 
		args.flags |= RPC_CLNT_CREATE_DISCRTRY;

	if (test_bit(NFS_CS_NORESVPORT, &clp->cl_flags))

		args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;

	if (test_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags))

		args.flags |= RPC_CLNT_CREATE_INFINITE_SLOTS;



	if (!IS_ERR(clp->cl_rpcclient))

		return 0;

fs/nfs/nfs4client.c

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp, 
	/* Check NFS protocol revision and initialize RPC op vector */

	clp->rpc_ops = &nfs_v4_clientops;



	if (clp->cl_minorversion != 0)

		__set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags);

	__set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);

	error = nfs_create_rpc_client(clp, timeparms, authflavour);

	if (error < 0)

include/linux/nfs_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct nfs_client { 
#define NFS_CS_NORESVPORT	0		/* - use ephemeral src port */

#define NFS_CS_DISCRTRY		1		/* - disconnect on RPC retry */

#define NFS_CS_MIGRATION	2		/* - transparent state migr */

#define NFS_CS_INFINITE_SLOTS	3		/* - don't limit TCP slots */

	struct sockaddr_storage	cl_addr;	/* server identifier */

	size_t			cl_addrlen;

	char *			cl_hostname;	/* hostname of server */