Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 188732
b: refs/heads/master
c: 161fd65
h: refs/heads/master
v: v3
  • Loading branch information
Sage Weil committed Feb 25, 2010
1 parent b7c1bb0 commit 6f9d74e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 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: 88d892a37fc231ab2aa3b1c40ca9d67224616594
refs/heads/master: 161fd65ac934608345aed35226fc889ea3b0b500
17 changes: 9 additions & 8 deletions trunk/fs/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -1853,14 +1853,6 @@ static void ceph_fault(struct ceph_connection *con)
con->in_msg = NULL;
}

/*
* in case we faulted due to authentication, invalidate our
* current tickets so that we can get new ones.
*/
if (con->auth_retry && con->ops->invalidate_authorizer) {
dout("calling invalidate_authorizer()\n");
con->ops->invalidate_authorizer(con);
}

/* If there are no messages in the queue, place the connection
* in a STANDBY state (i.e., don't try to reconnect just yet). */
Expand Down Expand Up @@ -1890,6 +1882,15 @@ 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.
*/
if (con->auth_retry && con->ops->invalidate_authorizer) {
dout("calling invalidate_authorizer()\n");
con->ops->invalidate_authorizer(con);
}

if (con->ops->fault)
con->ops->fault(con);
}
Expand Down

0 comments on commit 6f9d74e

Please sign in to comment.