[PATCH v2 4/4] NFSv4: Ignore netid in trunking detection code

[Trond Myklebust <trond.myklebust@primarydata.com>]

The only thing a server cares about when deciding whether or not it is
talking to the same client in a setclientid or exchange_id, is the value
of the client owner id field. In particular, it does not distinguish
between setclientid/exchange_id calls on different types of transport.
When doing trunking detection, the client must therefore also ensure
it does not discriminate between connections on different transports.

Reported-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 fs/nfs/nfs4client.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index b1024bcc65c8..953daa44a282 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;
 
-- 
2.1.0