diff options
-rw-r--r-- | fs/ceph/messenger.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c index fdda707aa137..9ea7b763c8dc 100644 --- a/fs/ceph/messenger.c +++ b/fs/ceph/messenger.c | |||
@@ -1853,14 +1853,6 @@ static void ceph_fault(struct ceph_connection *con) | |||
1853 | con->in_msg = NULL; | 1853 | con->in_msg = NULL; |
1854 | } | 1854 | } |
1855 | 1855 | ||
1856 | /* | ||
1857 | * in case we faulted due to authentication, invalidate our | ||
1858 | * current tickets so that we can get new ones. | ||
1859 | */ | ||
1860 | if (con->auth_retry && con->ops->invalidate_authorizer) { | ||
1861 | dout("calling invalidate_authorizer()\n"); | ||
1862 | con->ops->invalidate_authorizer(con); | ||
1863 | } | ||
1864 | 1856 | ||
1865 | /* If there are no messages in the queue, place the connection | 1857 | /* If there are no messages in the queue, place the connection |
1866 | * in a STANDBY state (i.e., don't try to reconnect just yet). */ | 1858 | * in a STANDBY state (i.e., don't try to reconnect just yet). */ |
@@ -1890,6 +1882,15 @@ static void ceph_fault(struct ceph_connection *con) | |||
1890 | out_unlock: | 1882 | out_unlock: |
1891 | mutex_unlock(&con->mutex); | 1883 | mutex_unlock(&con->mutex); |
1892 | out: | 1884 | out: |
1885 | /* | ||
1886 | * in case we faulted due to authentication, invalidate our | ||
1887 | * current tickets so that we can get new ones. | ||
1888 | */ | ||
1889 | if (con->auth_retry && con->ops->invalidate_authorizer) { | ||
1890 | dout("calling invalidate_authorizer()\n"); | ||
1891 | con->ops->invalidate_authorizer(con); | ||
1892 | } | ||
1893 | |||
1893 | if (con->ops->fault) | 1894 | if (con->ops->fault) |
1894 | con->ops->fault(con); | 1895 | con->ops->fault(con); |
1895 | } | 1896 | } |