Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 320375
b: refs/heads/master
c: 8636ea6
h: refs/heads/master
i:
  320373: 2c4f106
  320371: 2618e59
  320367: 82cd70a
v: v3
  • Loading branch information
Sage Weil committed Jul 31, 2012
1 parent 702df4d commit 326d44e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b862e07b1a4d5c963d19027f10ea78085f27f9b
refs/heads/master: 8636ea672f0c5ab7478c42c5b6705ebd1db7eb6a
4 changes: 1 addition & 3 deletions trunk/net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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",
Expand Down

0 comments on commit 326d44e

Please sign in to comment.