* [PATCH] libceph: kfree() in put_osd() shouldn't depend on authorizer
@ 2015-02-18 13:27 Ilya Dryomov
2015-02-18 13:34 ` Ilya Dryomov
0 siblings, 1 reply; 5+ messages in thread
From: Ilya Dryomov @ 2015-02-18 13:27 UTC (permalink / raw)
To: ceph-devel; +Cc: Alex Elder
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>
---
net/ceph/osd_client.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index f693a2f8ac86..41a4abc7e98e 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);
}
}
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] libceph: kfree() in put_osd() shouldn't depend on authorizer
2015-02-18 13:27 [PATCH] libceph: kfree() in put_osd() shouldn't depend on authorizer Ilya Dryomov
@ 2015-02-18 13:34 ` Ilya Dryomov
0 siblings, 0 replies; 5+ messages in thread
From: Ilya Dryomov @ 2015-02-18 13:34 UTC (permalink / raw)
To: ceph-devel; +Cc: Alex Elder
On Wed, Feb 18, 2015 at 4:27 PM, Ilya Dryomov <idryomov@gmail.com> wrote:
> 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>
> ---
> net/ceph/osd_client.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
> index f693a2f8ac86..41a4abc7e98e 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);
> }
> }
Sorry, this is a dup - ignore it.
Thanks,
Ilya
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libceph: kfree() in put_osd() shouldn't depend on authorizer
2015-02-18 13:27 Ilya Dryomov
2015-02-18 15:18 ` Sage Weil
@ 2015-02-18 15:47 ` Alex Elder
1 sibling, 0 replies; 5+ messages in thread
From: Alex Elder @ 2015-02-18 15:47 UTC (permalink / raw)
To: Ilya Dryomov, ceph-devel; +Cc: Alex Elder
On 02/18/2015 07:27 AM, Ilya Dryomov wrote:
> 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.
You are generous in suggesting it's a mechanical mistake.
But it is a mistake nevertheless. The fix looks good.
Reviewed-by: Alex Elder <elder@linaro.org>
> Cc: Alex Elder <elder@linaro.org>
> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
> ---
> net/ceph/osd_client.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
> index f693a2f8ac86..41a4abc7e98e 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);
> }
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libceph: kfree() in put_osd() shouldn't depend on authorizer
2015-02-18 13:27 Ilya Dryomov
@ 2015-02-18 15:18 ` Sage Weil
2015-02-18 15:47 ` Alex Elder
1 sibling, 0 replies; 5+ messages in thread
From: Sage Weil @ 2015-02-18 15:18 UTC (permalink / raw)
To: Ilya Dryomov; +Cc: ceph-devel, Alex Elder
On Wed, 18 Feb 2015, Ilya Dryomov wrote:
> 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>
> ---
> net/ceph/osd_client.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
> index f693a2f8ac86..41a4abc7e98e 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);
> }
> }
> --
> 1.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] libceph: kfree() in put_osd() shouldn't depend on authorizer
@ 2015-02-18 13:27 Ilya Dryomov
2015-02-18 15:18 ` Sage Weil
2015-02-18 15:47 ` Alex Elder
0 siblings, 2 replies; 5+ messages in thread
From: Ilya Dryomov @ 2015-02-18 13:27 UTC (permalink / raw)
To: ceph-devel; +Cc: Alex Elder
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>
---
net/ceph/osd_client.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index f693a2f8ac86..41a4abc7e98e 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);
}
}
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-02-18 15:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-18 13:27 [PATCH] libceph: kfree() in put_osd() shouldn't depend on authorizer Ilya Dryomov
2015-02-18 13:34 ` Ilya Dryomov
-- strict thread matches above, loose matches on Subject: below --
2015-02-18 13:27 Ilya Dryomov
2015-02-18 15:18 ` Sage Weil
2015-02-18 15:47 ` Alex Elder
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.