diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-28 18:59:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-28 18:59:24 -0700 |
| commit | 6fa9bffbccb91e07519e1deb05e001d191f0df43 (patch) | |
| tree | 2d631fb0cfd0af005ab04cf1dcbbec20ba414435 /fs | |
| parent | cf681c2ebcb502ced998ca0659b2907b9ad9daf9 (diff) | |
| parent | d3767f0faeda5abdf205f947ae912d48dc70fa06 (diff) | |
| download | linux-6fa9bffbccb91e07519e1deb05e001d191f0df43.tar.gz linux-6fa9bffbccb91e07519e1deb05e001d191f0df43.tar.bz2 linux-6fa9bffbccb91e07519e1deb05e001d191f0df43.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes from Sage Weil:
"There is a lifecycle fix in the auth code, a fix for a narrow race
condition on map, and a helpful message in the log when there is a
feature mismatch (which happens frequently now that the default
server-side options have changed)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
rbd: report unsupported features to syslog
rbd: fix rbd map vs notify races
libceph: make authorizer destruction independent of ceph_auth_client
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/mds_client.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 541ead4d8965..85b8517f17a0 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -386,9 +386,7 @@ void ceph_put_mds_session(struct ceph_mds_session *s) atomic_read(&s->s_ref), atomic_read(&s->s_ref)-1); if (atomic_dec_and_test(&s->s_ref)) { if (s->s_auth.authorizer) - ceph_auth_destroy_authorizer( - s->s_mdsc->fsc->client->monc.auth, - s->s_auth.authorizer); + ceph_auth_destroy_authorizer(s->s_auth.authorizer); kfree(s); } } @@ -3900,7 +3898,7 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con, struct ceph_auth_handshake *auth = &s->s_auth; if (force_new && auth->authorizer) { - ceph_auth_destroy_authorizer(ac, auth->authorizer); + ceph_auth_destroy_authorizer(auth->authorizer); auth->authorizer = NULL; } if (!auth->authorizer) { |