1 files changed, 8 insertions, 15 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 4d111fd2b492..5ccf87ed8d68 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -506,6 +506,7 @@ static void reset_connection(struct ceph_connection *con)
 {
         /* reset connection, out_queue, msg_ and connect_seq */
         /* discard existing out_queue and msg_seq */
+        dout("reset_connection %p\n", con);
         ceph_msg_remove_list(&con->out_queue);
         ceph_msg_remove_list(&con->out_sent);
 
@@ -561,7 +562,7 @@ void ceph_con_open(struct ceph_connection *con,
         mutex_lock(&con->mutex);
         dout("con_open %p %s\n", con, ceph_pr_addr(&addr->in_addr));
 
-        BUG_ON(con->state != CON_STATE_CLOSED);
+        WARN_ON(con->state != CON_STATE_CLOSED);
         con->state = CON_STATE_PREOPEN;
 
         con->peer_name.type = (__u8) entity_type;
@@ -1506,13 +1507,6 @@ static int process_banner(struct ceph_connection *con)
         return 0;
 }
 
-static void fail_protocol(struct ceph_connection *con)
-{
-        reset_connection(con);
-        BUG_ON(con->state != CON_STATE_NEGOTIATING);
-        con->state = CON_STATE_CLOSED;
-}
-
 static int process_connect(struct ceph_connection *con)
 {
         u64 sup_feat = con->msgr->supported_features;
@@ -1530,7 +1524,7 @@ static int process_connect(struct ceph_connection *con)
                        ceph_pr_addr(&con->peer_addr.in_addr),
                        sup_feat, server_feat, server_feat & ~sup_feat);
                 con->error_msg = "missing required protocol features";
-                fail_protocol(con);
+                reset_connection(con);
                 return -1;
 
         case CEPH_MSGR_TAG_BADPROTOVER:
@@ -1541,7 +1535,7 @@ static int process_connect(struct ceph_connection *con)
                        le32_to_cpu(con->out_connect.protocol_version),
                        le32_to_cpu(con->in_reply.protocol_version));
                 con->error_msg = "protocol version mismatch";
-                fail_protocol(con);
+                reset_connection(con);
                 return -1;
 
         case CEPH_MSGR_TAG_BADAUTHORIZER:
@@ -1631,11 +1625,11 @@ static int process_connect(struct ceph_connection *con)
                                ceph_pr_addr(&con->peer_addr.in_addr),
                                req_feat, server_feat, req_feat & ~server_feat);
                         con->error_msg = "missing required protocol features";
-                        fail_protocol(con);
+                        reset_connection(con);
                         return -1;
                 }
 
-                BUG_ON(con->state != CON_STATE_NEGOTIATING);
+                WARN_ON(con->state != CON_STATE_NEGOTIATING);
                 con->state = CON_STATE_OPEN;
 
                 con->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
@@ -2132,7 +2126,6 @@ more:
                 if (ret < 0)
                         goto out;
 
-                BUG_ON(con->state != CON_STATE_CONNECTING);
                 con->state = CON_STATE_NEGOTIATING;
 
                 /*
@@ -2160,7 +2153,7 @@ more:
                 goto more;
         }
 
-        BUG_ON(con->state != CON_STATE_OPEN);
+        WARN_ON(con->state != CON_STATE_OPEN);
 
         if (con->in_base_pos < 0) {
                 /*
@@ -2382,7 +2375,7 @@ static void ceph_fault(struct ceph_connection *con)
         dout("fault %p state %lu to peer %s\n",
              con, con->state, ceph_pr_addr(&con->peer_addr.in_addr));
 
-        BUG_ON(con->state != CON_STATE_CONNECTING &&
+        WARN_ON(con->state != CON_STATE_CONNECTING &&
                con->state != CON_STATE_NEGOTIATING &&
                con->state != CON_STATE_OPEN);