Messages in this thread Patch in this message | | | Subject | [patch 193/198] nfsd4: callback create rpc client returns | From | akpm@osdl ... | Date | Tue, 12 Apr 2005 03:33:32 -0700 |
| |
From: NeilBrown <neilb@cse.unsw.edu.au>
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> ---
25-akpm/fs/nfsd/nfs4callback.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff -puN fs/nfsd/nfs4callback.c~nfsd4-callback-create-rpc-client-returns fs/nfsd/nfs4callback.c --- 25/fs/nfsd/nfs4callback.c~nfsd4-callback-create-rpc-client-returns 2005-04-12 03:21:49.376630512 -0700 +++ 25-akpm/fs/nfsd/nfs4callback.c 2005-04-12 03:21:49.379630056 -0700 @@ -405,7 +405,8 @@ nfsd4_probe_callback(struct nfs4_client 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 * 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; } _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |