summaryrefslogtreecommitdiff
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-11-13 08:16:40 +0100
committerIngo Molnar <mingo@kernel.org>2016-11-13 08:16:40 +0100
commit74239ac259519a98f4c32439326afe7e7eb64459 (patch)
treea3e9a1ae0dc6634e7aa669c8881e425634094257 /fs/nfs/client.c
parenta75dcb5848359f488c32c0aef8711d9bd37a77b8 (diff)
parent86e4ee760ef2f7571e233a3abf065ffd0bb4089d (diff)
downloadlinux-74239ac259519a98f4c32439326afe7e7eb64459.tar.gz
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 7555ba889d1f..ebecfb8fba06 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -314,7 +314,8 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat
/* Match the full socket address */
if (!rpc_cmp_addr_port(sap, clap))
/* Match all xprt_switch full socket addresses */
- if (!rpc_clnt_xprt_switch_has_addr(clp->cl_rpcclient,
+ if (IS_ERR(clp->cl_rpcclient) ||
+ !rpc_clnt_xprt_switch_has_addr(clp->cl_rpcclient,
sap))
continue;