[PATCH 3.16.y-ckt 138/183] libceph: assert both regular and lingering lists in __remove_osd()

Luis Henriques luis.henriques at canonical.com
Fri Mar 6 09:57:09 UTC 2015

3.16.7-ckt8 -stable review patch.  If anyone has any objections, please let me know.


From: Ilya Dryomov <ilya.dryomov at inktank.com>

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 at inktank.com>
Reviewed-by: Alex Elder <elder at linaro.org>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
 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 05be0c181695..14e0387e3595 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_linger_requests));
 	rb_erase(&osd->o_node, &osdc->osds);

More information about the kernel-team mailing list