---

yaml --- r: 320364 b: refs/heads/master c: 2e8cb10 h: refs/heads/master v: v3
git-mirror · Jul 31, 2012 · 1bb681f · 1bb681f
1 parent 829750f
commit 1bb681f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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);