summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2014-06-18 13:02:12 +0400
committerIlya Dryomov <ilya.dryomov@inktank.com>2014-07-08 15:08:43 +0400
commit7c6e6fc53e7335570ed82f77656cedce1502744e (patch)
tree35e905d102d3977c7725749af0ee07352cdc6a67 /net/ceph
parent6562d661d205ff9bd855345d6424b9fb07adaf62 (diff)
downloadblackbird-obmc-linux-7c6e6fc53e7335570ed82f77656cedce1502744e.tar.gz
blackbird-obmc-linux-7c6e6fc53e7335570ed82f77656cedce1502744e.zip
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 <ilya.dryomov@inktank.com> Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/osd_client.c2
1 files changed, 2 insertions, 0 deletions
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);
OpenPOWER on IntegriCloud