libceph: eliminate connection state "DEAD"
authorAlex Elder <elder@inktank.com>
Tue, 22 May 2012 16:41:43 +0000 (11:41 -0500)
committerAlex Elder <elder@dreamhost.com>
Fri, 1 Jun 2012 13:37:55 +0000 (08:37 -0500)
The ceph connection state "DEAD" is never set and is therefore not
needed.  Eliminate it.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
include/linux/ceph/messenger.h
net/ceph/messenger.c

index 2521a95fa6d98597d1fafe4d4cff23ce9dc0f069..aa506cadea672e1fc4816af8a91b068e47c944f5 100644 (file)
@@ -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
 
 /*
index 1a80907282cc261137bf11f4d4bb8f4e8ede7419..42ca8aab6dcf0cc7a3bbedf7432436b6e7c08ef3 100644 (file)
@@ -2087,12 +2087,6 @@ bad_tag:
  */
 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;