From 8c37f8ed7555f38cfbb82e823cdaf314c176567c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 30 Jul 2012 16:21:40 -0700
Subject: [PATCH] --- yaml --- r: 320334 b: refs/heads/master c:
 5469155f2bc83bb2c88b0a0370c3d54d87eed06e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9e00d4eec0c8..9a2c9cacf10d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a53aab645c82f0146e35684b34692c69b5118121
+refs/heads/master: 5469155f2bc83bb2c88b0a0370c3d54d87eed06e
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index f1bd3bbb0c46..a4779988c847 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -537,6 +537,7 @@ void ceph_con_open(struct ceph_connection *con,
 		   __u8 entity_type, __u64 entity_num,
 		   struct ceph_entity_addr *addr)
 {
+	mutex_lock(&con->mutex);
 	dout("con_open %p %s\n", con, ceph_pr_addr(&addr->in_addr));
 	set_bit(OPENING, &con->state);
 	WARN_ON(!test_and_clear_bit(CLOSED, &con->state));
@@ -546,6 +547,7 @@ void ceph_con_open(struct ceph_connection *con,
 
 	memcpy(&con->peer_addr, addr, sizeof(*addr));
 	con->delay = 0;      /* reset backoff memory */
+	mutex_unlock(&con->mutex);
 	queue_con(con);
 }
 EXPORT_SYMBOL(ceph_con_open);