nfs: add minor version to nfs_server_key for fscache
commit968d4ec0c9eb2cb61cc2a9c358c166d133d47f7c
authorScott Mayhew <smayhew@redhat.com>
Mon, 24 Feb 2020 21:29:32 +0000 (24 16:29 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Apr 2020 13:28:14 +0000 (2 15:28 +0200)
tree4c4b2f0d44f97ce9376e70a66e3b59711b7b3bef
parent967e97461ea3103523b8395dd30187a65f53a2b1
nfs: add minor version to nfs_server_key for fscache

[ Upstream commit 55dee1bc0d72877b99805e42e0205087e98b9edd ]

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: Scott Mayhew <smayhew@redhat.com>
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/nfs/client.c
fs/nfs/fscache.c
fs/nfs/nfs4client.c