---

yaml --- r: 320253 b: refs/heads/master c: e5e372d h: refs/heads/master i: 320251: 3e8b628 v: v3
git-mirror · Jun 1, 2012 · d451d2f · d451d2f
1 parent 5d001af
commit d451d2f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28c0254ede13ab575d2df5c6585ed3d4817c3e6b
+refs/heads/master: e5e372da9a469dfe3ece40277090a7056c566838
diff --git a/trunk/include/linux/ceph/messenger.h b/trunk/include/linux/ceph/messenger.h
@@ -119,7 +119,6 @@ struct ceph_msg_pos {
 #define CLOSED		10 /* we've closed the connection */
 #define SOCK_CLOSED	11 /* socket state changed to closed */
 #define OPENING         13 /* open connection w/ (possibly new) peer */
-#define DEAD            14 /* dead, about to kfree */
 #define BACKOFF         15
 
 /*

diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -2087,12 +2087,6 @@ static int try_read(struct ceph_connection *con)
  */
 static void queue_con(struct ceph_connection *con)
 {
-	if (test_bit(DEAD, &con->state)) {
-		dout("queue_con %p ignoring: DEAD\n",
-		     con);
-		return;
-	}
-
 	if (!con->ops->get(con)) {
 		dout("queue_con %p ref count 0\n", con);
 		return;