diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-02-16 11:49:42 +0300 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-02-19 14:27:51 +0300 |
| commit | b28ec2f37e6a2bbd0bdf74b39cb89c74e4ad17f3 (patch) | |
| tree | 0f7b68eb531e5034889da577dc05fc9ffe958b8b /net | |
| parent | 7eb71e0351fbb1b242ae70abb7bb17107fe2f792 (diff) | |
| download | op-kernel-dev-b28ec2f37e6a2bbd0bdf74b39cb89c74e4ad17f3.zip op-kernel-dev-b28ec2f37e6a2bbd0bdf74b39cb89c74e4ad17f3.tar.gz | |
libceph: kfree() in put_osd() shouldn't depend on authorizer
a255651d4cad ("ceph: ensure auth ops are defined before use") made
kfree() in put_osd() conditional on the authorizer. A mechanical
mistake most likely - fix it.
Cc: Alex Elder <elder@linaro.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/osd_client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index f693a2f..41a4abc 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1035,10 +1035,11 @@ static void put_osd(struct ceph_osd *osd) { dout("put_osd %p %d -> %d\n", osd, atomic_read(&osd->o_ref), atomic_read(&osd->o_ref) - 1); - if (atomic_dec_and_test(&osd->o_ref) && osd->o_auth.authorizer) { + if (atomic_dec_and_test(&osd->o_ref)) { struct ceph_auth_client *ac = osd->o_osdc->client->monc.auth; - ceph_auth_destroy_authorizer(ac, osd->o_auth.authorizer); + if (osd->o_auth.authorizer) + ceph_auth_destroy_authorizer(ac, osd->o_auth.authorizer); kfree(osd); } } |
