diff options
author | NeilBrown <neilb@cse.unsw.edu.au> | 2005-04-16 18:26:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:26:38 -0400 |
commit | f1ee4f22f21d74bc3ca63b95ca5b63d3a8620527 (patch) | |
tree | 29b860a31e5cb1d52f1d3a63290a2d0da7c905dd /fs/nfsd | |
parent | 9e416052f1462801ca857c7536288bac0621615e (diff) |
[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>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4callback.c | 6 |
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) | |||
405 | timeparms.to_exponential = 1; | 405 | timeparms.to_exponential = 1; |
406 | 406 | ||
407 | /* Create RPC transport */ | 407 | /* Create RPC transport */ |
408 | if (!(xprt = xprt_create_proto(IPPROTO_TCP, &addr, &timeparms))) { | 408 | xprt = xprt_create_proto(IPPROTO_TCP, &addr, &timeparms); |
409 | if (IS_ERR(xprt)) { | ||
409 | dprintk("NFSD: couldn't create callback transport!\n"); | 410 | dprintk("NFSD: couldn't create callback transport!\n"); |
410 | goto out_err; | 411 | goto out_err; |
411 | } | 412 | } |
@@ -426,7 +427,8 @@ nfsd4_probe_callback(struct nfs4_client *clp) | |||
426 | * XXX AUTH_UNIX only - need AUTH_GSS.... | 427 | * XXX AUTH_UNIX only - need AUTH_GSS.... |
427 | */ | 428 | */ |
428 | sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(addr.sin_addr.s_addr)); | 429 | sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(addr.sin_addr.s_addr)); |
429 | if (!(clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX))) { | 430 | clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX); |
431 | if (IS_ERR(clnt)) { | ||
430 | dprintk("NFSD: couldn't create callback client\n"); | 432 | dprintk("NFSD: couldn't create callback client\n"); |
431 | goto out_xprt; | 433 | goto out_xprt; |
432 | } | 434 | } |