From: Andy Adamson <andros@netapp.com>
Date: Fri, 9 Sep 2016 13:22:27 +0000 (-0400)
Subject: NFS add xprt switch addrs test to match client
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=04ea1b3e6d8ed4978bb608c1748530af3de8c274;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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 0c1b3a002dc2..535c2563b701 100644
--- 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;