From d451d2f30478c543a46e3315e762b485725b5ba2 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Tue, 22 May 2012 11:41:43 -0500
Subject: [PATCH] --- yaml --- r: 320253 b: refs/heads/master c:
 e5e372da9a469dfe3ece40277090a7056c566838 h: refs/heads/master i:   320251:
 3e8b628140a4f3eb83bfc7efcd077c95f7ee7c71 v: v3

---
 [refs]                               | 2 +-
 trunk/include/linux/ceph/messenger.h | 1 -
 trunk/net/ceph/messenger.c           | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d6da02d892e7..ae0f73aa9199 100644
--- 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
index 2521a95fa6d9..aa506cadea67 100644
--- 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
index 1a80907282cc..42ca8aab6dcf 100644
--- 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;