diff options
| author | Sage Weil | 2009-11-18 20:27:06 +0100 |
|---|---|---|
| committer | Sage Weil | 2009-11-18 20:29:45 +0100 |
| commit | 71ececdacae24be333c534869cb1b06357f0e215 (patch) | |
| tree | b07d622fb4205ce980ec5b0b6e41455b08d78b42 | |
| parent | ceph: remove bad calls to ceph_con_shutdown (diff) | |
| download | kernel-qcow2-linux-71ececdacae24be333c534869cb1b06357f0e215.tar.gz kernel-qcow2-linux-71ececdacae24be333c534869cb1b06357f0e215.tar.xz kernel-qcow2-linux-71ececdacae24be333c534869cb1b06357f0e215.zip | |
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>
| -rw-r--r-- | fs/ceph/messenger.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c index e389656b2a6b..d8a6a56a1571 100644 --- a/fs/ceph/messenger.c +++ b/fs/ceph/messenger.c @@ -340,17 +340,6 @@ void ceph_con_close(struct ceph_connection *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. */ void ceph_con_open(struct ceph_connection *con, struct ceph_entity_addr *addr) @@ -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); } } |