From 2ea86909745a6a060e400e145224dd86280396bb Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Wed, 23 May 2012 11:38:38 -0400
Subject: [PATCH] --- yaml --- r: 309860 b: refs/heads/master c:
 f3d03b9202e4303f0e687f93ffeab87724f6dcfb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 66d773d18f30..c89228b5585a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8695b90ac3c37278010c76ab3680f35ab358caf9
+refs/heads/master: f3d03b9202e4303f0e687f93ffeab87724f6dcfb
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 8a1dfb20a3de..e42b5670ddee 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -2263,8 +2263,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
 			expire_client(conf);
 		}
 		move_to_confirmed(unconf);
-		conf = unconf;
-		nfsd4_probe_callback(conf);
+		nfsd4_probe_callback(unconf);
 		status = nfs_ok;
 	} else if ((!conf || !same_verf(&conf->cl_confirm, &confirm))
 	    && (!unconf || !same_verf(&unconf->cl_confirm, &confirm))) {