Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b28ec2f3 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: kfree() in put_osd() shouldn't depend on authorizer 



a255651d ("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: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarSage Weil <sage@redhat.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
parent 7eb71e03

net/ceph/osd_client.c

+3 −2
Original line number Diff line number Diff line
@@ -1035,9 +1035,10 @@ 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;



		if (osd->o_auth.authorizer)

			ceph_auth_destroy_authorizer(ac, osd->o_auth.authorizer);

		kfree(osd);

	}