aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2014-06-18 13:02:12 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-06 14:40:54 -0800
commit5d3c6d27f48ce3b501c988bd0ab2232a0d4612c6 (patch)
tree5fed11f67dee27ce988f822a156aa3a3d37ab94a
parent813a631f08c7112f12a3da9f63da632c925a8b37 (diff)
downloadlinux-linaro-stable-5d3c6d27f48ce3b501c988bd0ab2232a0d4612c6.tar.gz
libceph: assert both regular and lingering lists in __remove_osd()
commit 7c6e6fc53e7335570ed82f77656cedce1502744e upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 3663a305daf7..d2e44eeb83ec 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -969,6 +969,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);