diff --git a/[refs] b/[refs] index b2ade7eb6c61..5d14a25f65fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b862e07b1a4d5c963d19027f10ea78085f27f9b +refs/heads/master: 8636ea672f0c5ab7478c42c5b6705ebd1db7eb6a diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index feb5a2ac724c..c3b628c76194 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/net/ceph/messenger.c @@ -2336,7 +2336,6 @@ static void con_work(struct work_struct *work) return; fault: - mutex_unlock(&con->mutex); ceph_fault(con); /* error/fault path */ goto done_unlocked; } @@ -2347,9 +2346,8 @@ static void con_work(struct work_struct *work) * 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",