From 1bb681f8051f6c3e59d962d07977be9a31b40eb4 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Fri, 20 Jul 2012 15:40:04 -0700
Subject: [PATCH] --- yaml --- r: 320364 b: refs/heads/master c:
 2e8cb10063820af7ed7638e3fd9013eee21266e7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 68f438512017..d56d06ed5ab1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a59b55a602b6c741052d79c1e3643f8440cddd27
+refs/heads/master: 2e8cb10063820af7ed7638e3fd9013eee21266e7
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index 20e60a80bc29..32ab7cd089a3 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -2284,15 +2284,15 @@ static void con_work(struct work_struct *work)
 		dout("con_work %p STANDBY\n", con);
 		goto done;
 	}
-	if (test_bit(CLOSED, &con->state)) { /* e.g. if we are replaced */
-		dout("con_work CLOSED\n");
-		con_close_socket(con);
+	if (test_bit(CLOSED, &con->state)) {
+		dout("con_work %p CLOSED\n", con);
+		BUG_ON(con->sock);
 		goto done;
 	}
 	if (test_and_clear_bit(OPENING, &con->state)) {
 		/* reopen w/ new peer */
 		dout("con_work OPENING\n");
-		con_close_socket(con);
+		BUG_ON(con->sock);
 	}
 
 	ret = try_read(con);