tree 29b860a31e5cb1d52f1d3a63290a2d0da7c905dd
parent 9e416052f1462801ca857c7536288bac0621615e
author NeilBrown <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:38 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:38 -0700

[PATCH] nfsd4: callback create rpc client returns

rpc_create_clnt and friends return errors, not NULL, on failure.

Signed-off-by: J. Bruce Fields <[EMAIL PROTECTED]>
Signed-off-by: Neil Brown <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 nfsd/nfs4callback.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Index: fs/nfsd/nfs4callback.c
===================================================================
--- f657d0dcc3f3d495fbe359cee2ea35868c10b128/fs/nfsd/nfs4callback.c  
(mode:100644 sha1:c70de9c2af74658ab40cd5b180a5a1f201b112bc)
+++ 29b860a31e5cb1d52f1d3a63290a2d0da7c905dd/fs/nfsd/nfs4callback.c  
(mode:100644 sha1:1a55dfcb74bcb62b5bfb10fae788a3b56afc4f75)
@@ -405,7 +405,8 @@
        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 @@
         * 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 bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to