NFS add xprt switch addrs test to match client

Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 0c1b3a002dc257fe6bc4d81086df07ee10b66559..535c2563b7010f0b17e5a03fc2efb024ea518d3c 100644 (file)
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -313,7 +313,10 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat
                        continue;
                /* Match the full socket address */
                if (!rpc_cmp_addr_port(sap, clap))
-                       continue;
+                       /* Match all xprt_switch full socket addresses */
+                       if (!rpc_clnt_xprt_switch_has_addr(clp->cl_rpcclient,
+                                                          sap))
+                               continue;
 
                atomic_inc(&clp->cl_count);
                return clp;