2013-06-24 01:22:30

by majianpeng

Subject: [PATCH] libceph: Call con->ops->put(con) if cancel_delayed_work(&con->work) worked.

Because in func queue_con_delay, it will call con->ops->get(con).
So if we cancel the work successfully,we must call con->ops->put(con).
Otherwise some resource can't free like 'struct ceph_mds_session'.

Signed-off-by: Jianpeng Ma <[email protected]>
---
net/ceph/messenger.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index eb0a46a..8207b37 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -661,7 +661,8 @@ void ceph_con_close(struct ceph_connection *con)

reset_connection(con);
con->peer_global_seq = 0;
- cancel_delayed_work(&con->work);
+ if (cancel_delayed_work(&con->work))
+ con->ops->put(con);
con_close_socket(con);
mutex_unlock(&con->mutex);
}
--
1.8.1.2
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?

2013-06-24 03:30:06

by Sage Weil

Subject: Re: [PATCH] libceph: Call con->ops->put(con) if cancel_delayed_work(&con->work) worked.

On Mon, 24 Jun 2013, majianpeng wrote:
> Because in func queue_con_delay, it will call con->ops->get(con).
> So if we cancel the work successfully,we must call con->ops->put(con).
> Otherwise some resource can't free like 'struct ceph_mds_session'.
>
> Signed-off-by: Jianpeng Ma <[email protected]>

Looks good, applied to the testing branch.

Thanks!
sage

> ---
> net/ceph/messenger.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
> index eb0a46a..8207b37 100644
> --- a/net/ceph/messenger.c
> +++ b/net/ceph/messenger.c
> @@ -661,7 +661,8 @@ void ceph_con_close(struct ceph_connection *con)
>
> reset_connection(con);
> con->peer_global_seq = 0;
> - cancel_delayed_work(&con->work);
> + if (cancel_delayed_work(&con->work))
> + con->ops->put(con);
> con_close_socket(con);
> mutex_unlock(&con->mutex);
> }
> --
> 1.8.1.2
>