From 1b1917b55eb3d59c2a2ad922e736f624b499532e Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sat, 16 Apr 2005 15:26:38 -0700 Subject: [PATCH] --- yaml --- r: 194 b: refs/heads/master c: f1ee4f22f21d74bc3ca63b95ca5b63d3a8620527 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4callback.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f41b25348a68..4cc340351a1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e416052f1462801ca857c7536288bac0621615e +refs/heads/master: f1ee4f22f21d74bc3ca63b95ca5b63d3a8620527 diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c index c70de9c2af74..1a55dfcb74bc 100644 --- a/trunk/fs/nfsd/nfs4callback.c +++ b/trunk/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; }