diff options
| author | Sage Weil <sage@inktank.com> | 2012-07-30 18:17:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:38:42 -0800 |
| commit | 328677c24bbae17f3f91ffce3b2351a27933741c (patch) | |
| tree | 1260cfe3b6af6134d91a342c419206fb9cff3249 | |
| parent | 900fbd910f53a417a6b0859bd2cde7ae48ac4bb2 (diff) | |
| download | linux-3.10-328677c24bbae17f3f91ffce3b2351a27933741c.tar.gz linux-3.10-328677c24bbae17f3f91ffce3b2351a27933741c.tar.bz2 linux-3.10-328677c24bbae17f3f91ffce3b2351a27933741c.zip | |
libceph: avoid dropping con mutex before fault
(cherry picked from commit 8636ea672f0c5ab7478c42c5b6705ebd1db7eb6a)
The ceph_fault() function takes the con mutex, so we should avoid
dropping it before calling it. This fixes a potential race with
another thread calling ceph_con_close(), or _open(), or similar (we
don't reverify con->state after retaking the lock).
Add annotation so that lockdep realizes we will drop the mutex before
returning.
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/ceph/messenger.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index bb21e5b0fb5..c2f0ca36f4a 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2336,7 +2336,6 @@ done_unlocked: return; fault: - mutex_unlock(&con->mutex); ceph_fault(con); /* error/fault path */ goto done_unlocked; } @@ -2347,9 +2346,8 @@ fault: * exponential backoff */ static void ceph_fault(struct ceph_connection *con) + __releases(con->mutex) { - 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", |