From: Chuck Lever Date: Sat, 3 Jan 2015 19:45:33 +0000 (-0500) Subject: NFS: Ignore transport protocol when detecting server trunking X-Git-Tag: v4.14-rc1~6127^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a01edf0058df98d6cc734c5a4ecc51f929a86ec;p=platform%2Fkernel%2Flinux-rpi.git NFS: Ignore transport protocol when detecting server trunking Detect server trunking across transport protocols. Otherwise, an RDMA mount and a TCP mount of the same server will end up with separate nfs_clients using the same clientid4. Reported-by: Dai Ngo Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index b1024bc..953daa4 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -492,9 +492,6 @@ int nfs40_walk_client_list(struct nfs_client *new, if (pos->rpc_ops != new->rpc_ops) continue; - if (pos->cl_proto != new->cl_proto) - continue; - if (pos->cl_minorversion != new->cl_minorversion) continue; @@ -627,9 +624,6 @@ int nfs41_walk_client_list(struct nfs_client *new, if (pos->rpc_ops != new->rpc_ops) continue; - if (pos->cl_proto != new->cl_proto) - continue; - if (pos->cl_minorversion != new->cl_minorversion) continue;