libceph: kfree() in put_osd() shouldn't depend on authorizer
Ilya Dryomov
maintainerPATCH 1/1 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 <[email protected]>
Signed-off-by Ilya Dryomov <[email protected]>
--- net/ceph/osd_client.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ceph/osd_client.c +3 -2
@@ -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); } }
Signature · 1 line
1.9.3
Ilya Dryomov
maintainerQuoted 18 lines · Ilya Dryomov
a255651d4cad("ceph: ensure auth ops are defined before use") madekfree()input_osd()conditional on the authorizer. A mechanical mistake most likely - fix it.Cc Alex Elder <[email protected]>Signed-off-by Ilya Dryomov <[email protected]>--- net/ceph/osd_client.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)net/ceph/osd_client.c +0
-0@@ -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 );
net/ceph/osd_client.c static void put_osd(struct ceph_osd *osd) · line 1045
Quoted 10 lines
net/ceph/osd_client.c +3
-2-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); } }
Sorry, this is a dup - ignore it.
Thanks,
Ilya