From 326d44ea918ec3d919ffdccd95b922be82a06363 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 30 Jul 2012 18:17:13 -0700
Subject: [PATCH] --- yaml --- r: 320375 b: refs/heads/master c:
 8636ea672f0c5ab7478c42c5b6705ebd1db7eb6a h: refs/heads/master i:   320373:
 2c4f1069ade9dcb3a3fa1cb3ab7118e09df28acc   320371:
 2618e59edfecc478362810a9ea484cbc47f1b958   320367:
 82cd70a69047d38521d69c26bf34894b01241be6 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ceph/messenger.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b2ade7eb6c61..5d14a25f65fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b862e07b1a4d5c963d19027f10ea78085f27f9b
+refs/heads/master: 8636ea672f0c5ab7478c42c5b6705ebd1db7eb6a
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index feb5a2ac724c..c3b628c76194 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -2336,7 +2336,6 @@ static void con_work(struct work_struct *work)
 	return;
 
 fault:
-	mutex_unlock(&con->mutex);
 	ceph_fault(con);     /* error/fault path */
 	goto done_unlocked;
 }
@@ -2347,9 +2346,8 @@ static void con_work(struct work_struct *work)
  * exponential backoff
  */
 static void ceph_fault(struct ceph_connection *con)
+	__releases(con->mutex)
 {
-	mutex_lock(&con->mutex);
-
 	pr_err("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),
 	       ceph_pr_addr(&con->peer_addr.in_addr), con->error_msg);
 	dout("fault %p state %lu to peer %s\n",