ceph: remove unnecessary ceph_con_shutdown

We require that ceph_con_close be called before we drop the connection,
so this is unneeded.  Just BUG if con->sock != NULL.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c
index e389656b2a6b8bd8081d5f29288bfc41425130f6..d8a6a56a157129be18c9abf39dbc67f970f9bac4 100644 (file)
--- a/fs/ceph/messenger.c
+++ b/fs/ceph/messenger.c
@@ -339,17 +339,6 @@ void ceph_con_close(struct ceph_connection *con)
        queue_con(con);
 }
 
-/*
- * clean up connection state
- */
-void ceph_con_shutdown(struct ceph_connection *con)
-{
-       dout("con_shutdown %p\n", con);
-       reset_connection(con);
-       set_bit(DEAD, &con->state);
-       con_close_socket(con); /* silently ignore errors */
-}
-
 /*
  * Reopen a closed connection, with a new peer address.
  */
@@ -380,7 +369,7 @@ void ceph_con_put(struct ceph_connection *con)
             atomic_read(&con->nref), atomic_read(&con->nref) - 1);
        BUG_ON(atomic_read(&con->nref) == 0);
        if (atomic_dec_and_test(&con->nref)) {
-               ceph_con_shutdown(con);
+               BUG_ON(con->sock);
                kfree(con);
        }
 }