From 5241806a95ce368cb1cfddc640601591028b195a Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@fieldses.org>
Date: Tue, 17 Oct 2006 00:10:16 -0700
Subject: [PATCH] --- yaml --- r: 39737 b: refs/heads/master c:
 0942176f4353ffebcd6e3f95abce9fd8e24f2cb1 h: refs/heads/master i:   39735:
 4955a0d6a36d6f7e640ae86859ad2c9ed65fedb2 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfsd/nfs4callback.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 71c551148991..4603445f8a3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9801d8a39cfe6c34f39f9552a246a6bd002e735e
+refs/heads/master: 0942176f4353ffebcd6e3f95abce9fd8e24f2cb1
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
index f6ca9fb3fc63..324a278f2808 100644
--- a/trunk/fs/nfsd/nfs4callback.c
+++ b/trunk/fs/nfsd/nfs4callback.c
@@ -421,7 +421,7 @@ nfsd4_probe_callback(struct nfs4_client *clp)
 
 	/* Create RPC client */
 	cb->cb_client = rpc_create(&args);
-	if (!cb->cb_client) {
+	if (IS_ERR(cb->cb_client)) {
 		dprintk("NFSD: couldn't create callback client\n");
 		goto out_err;
 	}
@@ -448,10 +448,10 @@ nfsd4_probe_callback(struct nfs4_client *clp)
 out_rpciod:
 	atomic_dec(&clp->cl_count);
 	rpciod_down();
-	cb->cb_client = NULL;
 out_clnt:
 	rpc_shutdown_client(cb->cb_client);
 out_err:
+	cb->cb_client = NULL;
 	dprintk("NFSD: warning: no callback path to client %.*s\n",
 		(int)clp->cl_name.len, clp->cl_name.data);
 }