From: Ilya Dryomov <ilya.dryomov@inktank.com>
Date: Wed, 18 Jun 2014 09:02:12 +0000 (+0400)
Subject: libceph: assert both regular and lingering lists in __remove_osd()
X-Git-Tag: v3.16.35~2691
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1505d94486b518e64ecf8b27d55dc3f11c8d7eb6;p=thirdparty%2Fkernel%2Fstable.git

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: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 05be0c1816958..14e0387e35956 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1008,6 +1008,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);