libceph: drop gratuitous socket close calls in con_work

If the state is CLOSED or OPENING, we shouldn't have a socket.

Signed-off-by: Sage Weil <sage@inktank.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 20e60a80bc29..32ab7cd089a3 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2284,15 +2284,15 @@ restart:
                 dout("con_work %p STANDBY\n", con);
                 goto done;
         }
-        if (test_bit(CLOSED, &con->state)) { /* e.g. if we are replaced */
-                dout("con_work CLOSED\n");
-                con_close_socket(con);
+        if (test_bit(CLOSED, &con->state)) {
+                dout("con_work %p CLOSED\n", con);
+                BUG_ON(con->sock);
                 goto done;
         }
         if (test_and_clear_bit(OPENING, &con->state)) {
                 /* reopen w/ new peer */
                 dout("con_work OPENING\n");
-                con_close_socket(con);
+                BUG_ON(con->sock);
         }
 
         ret = try_read(con);