Commit 7a01edf0 authored Jan 03, 2015 by Chuck Lever Committed by Trond Myklebust Jan 05, 2015

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 <dai.ngo@oracle.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

parent 55b9df93

fs/nfs/nfs4client.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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;