From: NeilBrown Date: Sat, 16 Apr 2005 22:26:38 +0000 (-0700) Subject: [PATCH] nfsd4: callback create rpc client returns X-Git-Tag: v2.6.12-rc3~52 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ee4f22f21d74bc3ca63b95ca5b63d3a8620527;p=linux-2.6 [PATCH] nfsd4: callback create rpc client returns rpc_create_clnt and friends return errors, not NULL, on failure. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index c70de9c2af..1a55dfcb74 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; }