diff options
-rw-r--r-- | include/linux/ceph/messenger.h | 1 | ||||
-rw-r--r-- | net/ceph/messenger.c | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 2521a95fa6d9..aa506cadea67 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h | |||
@@ -119,7 +119,6 @@ struct ceph_msg_pos { | |||
119 | #define CLOSED 10 /* we've closed the connection */ | 119 | #define CLOSED 10 /* we've closed the connection */ |
120 | #define SOCK_CLOSED 11 /* socket state changed to closed */ | 120 | #define SOCK_CLOSED 11 /* socket state changed to closed */ |
121 | #define OPENING 13 /* open connection w/ (possibly new) peer */ | 121 | #define OPENING 13 /* open connection w/ (possibly new) peer */ |
122 | #define DEAD 14 /* dead, about to kfree */ | ||
123 | #define BACKOFF 15 | 122 | #define BACKOFF 15 |
124 | 123 | ||
125 | /* | 124 | /* |
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 1a80907282cc..42ca8aab6dcf 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c | |||
@@ -2087,12 +2087,6 @@ bad_tag: | |||
2087 | */ | 2087 | */ |
2088 | static void queue_con(struct ceph_connection *con) | 2088 | static void queue_con(struct ceph_connection *con) |
2089 | { | 2089 | { |
2090 | if (test_bit(DEAD, &con->state)) { | ||
2091 | dout("queue_con %p ignoring: DEAD\n", | ||
2092 | con); | ||
2093 | return; | ||
2094 | } | ||
2095 | |||
2096 | if (!con->ops->get(con)) { | 2090 | if (!con->ops->get(con)) { |
2097 | dout("queue_con %p ref count 0\n", con); | 2091 | dout("queue_con %p ref count 0\n", con); |
2098 | return; | 2092 | return; |