diff options
| author | Sage Weil <sage@inktank.com> | 2012-07-20 15:22:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:38:40 -0800 |
| commit | da6a81eb5a2671f12551953d1843a0f53416d185 (patch) | |
| tree | 7e9c02adeba67b0bb55e103dd68517734f6dec3a /net | |
| parent | ed447f04ee3240371aa8a199588107fd521240d3 (diff) | |
| download | linux-3.10-da6a81eb5a2671f12551953d1843a0f53416d185.tar.gz linux-3.10-da6a81eb5a2671f12551953d1843a0f53416d185.tar.bz2 linux-3.10-da6a81eb5a2671f12551953d1843a0f53416d185.zip | |
libceph: fix fault locking; close socket on lossy fault
(cherry picked from commit 3b5ede07b55b52c3be27749d183d87257d032065)
If we fault on a lossy connection, we should still close the socket
immediately, and do so under the con mutex.
We should also take the con mutex before printing out the state bits in
the debug output.
Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/messenger.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 9da18929c58..d769a73e080 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2330,22 +2330,23 @@ fault: */ static void ceph_fault(struct ceph_connection *con) { + mutex_lock(&con->mutex); + pr_err("%s%lld %s %s\n", ENTITY_NAME(con->peer_name), ceph_pr_addr(&con->peer_addr.in_addr), con->error_msg); dout("fault %p state %lu to peer %s\n", con, con->state, ceph_pr_addr(&con->peer_addr.in_addr)); - if (test_bit(LOSSYTX, &con->flags)) { - dout("fault on LOSSYTX channel\n"); - goto out; - } - - mutex_lock(&con->mutex); if (test_bit(CLOSED, &con->state)) goto out_unlock; con_close_socket(con); + if (test_bit(LOSSYTX, &con->flags)) { + dout("fault on LOSSYTX channel\n"); + goto out_unlock; + } + if (con->in_msg) { BUG_ON(con->in_msg->con != con); con->in_msg->con = NULL; @@ -2392,7 +2393,6 @@ static void ceph_fault(struct ceph_connection *con) out_unlock: mutex_unlock(&con->mutex); -out: /* * in case we faulted due to authentication, invalidate our * current tickets so that we can get new ones. |