Commit 55dee1bc authored by Scott Mayhew's avatar Scott Mayhew Committed by Anna Schumaker
Browse files

nfs: add minor version to nfs_server_key for fscache 

An NFS client that mounts multiple exports from the same NFS
server with higher NFSv4 versions disabled (i.e. 4.2) and without
forcing a specific NFS version results in fscache index cookie
collisions and the following messages:
[  570.004348] FS-Cache: Duplicate cookie detected

Each nfs_client structure should have its own fscache index cookie,
so add the minorversion to nfs_server_key.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=200145


Signed-off-by: default avatarScott Mayhew <smayhew@redhat.com>
Signed-off-by: default avatarDave Wysochanski <dwysocha@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 75a9b917

fs/nfs/client.c

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init) 
	if ((clp = kzalloc(sizeof(*clp), GFP_KERNEL)) == NULL)

		goto error_0;



	clp->cl_minorversion = cl_init->minorversion;

	clp->cl_nfs_mod = cl_init->nfs_mod;

	if (!try_module_get(clp->cl_nfs_mod->owner))

		goto error_dealloc;

fs/nfs/fscache.c

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ static DEFINE_SPINLOCK(nfs_fscache_keys_lock); 
struct nfs_server_key {

	struct {

		uint16_t	nfsversion;		/* NFS protocol version */

		uint32_t	minorversion;		/* NFSv4 minor version */

		uint16_t	family;			/* address family */

		__be16		port;			/* IP port */

	} hdr;
@@ -55,6 +56,7 @@ void nfs_fscache_get_client_cookie(struct nfs_client *clp) 


	memset(&key, 0, sizeof(key));

	key.hdr.nfsversion = clp->rpc_ops->version;

	key.hdr.minorversion = clp->cl_minorversion;

	key.hdr.family = clp->cl_addr.ss_family;



	switch (clp->cl_addr.ss_family) {

fs/nfs/nfs4client.c

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init) 
	INIT_LIST_HEAD(&clp->cl_ds_clients);

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

	clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;

	clp->cl_minorversion = cl_init->minorversion;

	clp->cl_mvops = nfs_v4_minor_ops[cl_init->minorversion];

	clp->cl_mig_gen = 1;

#if IS_ENABLED(CONFIG_NFS_V4_1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE