summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@cse.unsw.edu.au>2005-04-17 02:26:38 +0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 02:26:38 +0400
commitf1ee4f22f21d74bc3ca63b95ca5b63d3a8620527 (patch)
tree29b860a31e5cb1d52f1d3a63290a2d0da7c905dd
parent9e416052f1462801ca857c7536288bac0621615e (diff)
downloadlinux-f1ee4f22f21d74bc3ca63b95ca5b63d3a8620527.tar.xz
[PATCH] nfsd4: callback create rpc client returns
rpc_create_clnt and friends return errors, not NULL, on failure. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/nfsd/nfs4callback.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index c70de9c2af74..1a55dfcb74bc 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -405,7 +405,8 @@ nfsd4_probe_callback(struct nfs4_client *clp)
timeparms.to_exponential = 1;
/* Create RPC transport */
- if (!(xprt = xprt_create_proto(IPPROTO_TCP, &addr, &timeparms))) {
+ xprt = xprt_create_proto(IPPROTO_TCP, &addr, &timeparms);
+ if (IS_ERR(xprt)) {
dprintk("NFSD: couldn't create callback transport!\n");
goto out_err;
}
@@ -426,7 +427,8 @@ nfsd4_probe_callback(struct nfs4_client *clp)
* XXX AUTH_UNIX only - need AUTH_GSS....
*/
sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(addr.sin_addr.s_addr));
- if (!(clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX))) {
+ clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX);
+ if (IS_ERR(clnt)) {
dprintk("NFSD: couldn't create callback client\n");
goto out_xprt;
}