[PATCH 06/14] libceph: assert both regular and lingering lists in __remove_osd()
It is important that both regular and lingering requests lists are empty when the OSD is removed. Signed-off-by: Ilya Dryomov --- net/ceph/osd_client.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 052eb8bfcc74..a9b7ea7bfdc6 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1032,6 +1032,8 @@ static void __remove_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd) { dout("__remove_osd %p\n", osd); BUG_ON(!list_empty(&osd->o_requests)); + BUG_ON(!list_empty(&osd->o_linger_requests)); + rb_erase(&osd->o_node, &osdc->osds); list_del_init(&osd->o_osd_lru); ceph_con_close(&osd->o_con); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 06/14] libceph: assert both regular and lingering lists in __remove_osd()
On 06/25/2014 12:16 PM, Ilya Dryomov wrote: > It is important that both regular and lingering requests lists are > empty when the OSD is removed. Looks good. Reviewed-by: Alex Elder > > Signed-off-by: Ilya Dryomov > --- > net/ceph/osd_client.c |2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c > index 052eb8bfcc74..a9b7ea7bfdc6 100644 > --- a/net/ceph/osd_client.c > +++ b/net/ceph/osd_client.c > @@ -1032,6 +1032,8 @@ static void __remove_osd(struct ceph_osd_client *osdc, > struct ceph_osd *osd) > { > dout("__remove_osd %p\n", osd); > BUG_ON(!list_empty(&osd->o_requests)); > + BUG_ON(!list_empty(&osd->o_linger_requests)); > + > rb_erase(&osd->o_node, &osdc->osds); > list_del_init(&osd->o_osd_lru); > ceph_con_close(&osd->o_con); > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html