NFSv4.1: Fix client id trunking on Linux
authorTrond Myklebust <trond.myklebust@primarydata.com>
Fri, 2 Jan 2015 21:25:08 +0000 (16:25 -0500)
committerJiri Slaby <jslaby@suse.cz>
Wed, 28 Jan 2015 08:27:36 +0000 (09:27 +0100)
commitd43170104637ad8499f686064d08c49176fe1243
tree87c1a0a618eec1376afa3f8ee0cbbded537574e3
parent98621891a08259f781e8d939527d9b6cff2aa2c1
NFSv4.1: Fix client id trunking on Linux

commit 1fc0703af3143914a389bfa081c7acb09502ed5d upstream.

Currently, our trunking code will check for session trunking, but will
fail to detect client id trunking. This is a problem, because it means
that the client will fail to recognise that the two connections represent
shared state, even if they do not permit a shared session.
By removing the check for the server minor id, and only checking the
major id, we will end up doing the right thing in both cases: we close
down the new nfs_client and fall back to using the existing one.

Fixes: 05f4c350ee02e ("NFS: Discover NFSv4 server trunking when mounting")
Cc: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
fs/nfs/nfs4client.c