From 6f9d74e2a044c993d5a727e3a61521f5701bf1d5 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 25 Feb 2010 12:38:57 -0800
Subject: [PATCH] --- yaml --- r: 188732 b: refs/heads/master c:
 161fd65ac934608345aed35226fc889ea3b0b500 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/fs/ceph/messenger.c | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index bc6bd8163811..640e208bb6ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88d892a37fc231ab2aa3b1c40ca9d67224616594
+refs/heads/master: 161fd65ac934608345aed35226fc889ea3b0b500
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
index fdda707aa137..9ea7b763c8dc 100644
--- a/trunk/fs/ceph/messenger.c
+++ b/trunk/fs/ceph/messenger.c
@@ -1853,14 +1853,6 @@ static void ceph_fault(struct ceph_connection *con)
 		con->in_msg = NULL;
 	}
 
-	/*
-	 * in case we faulted due to authentication, invalidate our
-	 * current tickets so that we can get new ones.
-         */
-	if (con->auth_retry && con->ops->invalidate_authorizer) {
-		dout("calling invalidate_authorizer()\n");
-		con->ops->invalidate_authorizer(con);
-	}
 
 	/* If there are no messages in the queue, place the connection
 	 * in a STANDBY state (i.e., don't try to reconnect just yet). */
@@ -1890,6 +1882,15 @@ static void ceph_fault(struct ceph_connection *con)
 out_unlock:
 	mutex_unlock(&con->mutex);
 out:
+	/*
+	 * in case we faulted due to authentication, invalidate our
+	 * current tickets so that we can get new ones.
+         */
+	if (con->auth_retry && con->ops->invalidate_authorizer) {
+		dout("calling invalidate_authorizer()\n");
+		con->ops->invalidate_authorizer(con);
+	}
+
 	if (con->ops->fault)
 		con->ops->fault(con);
 }