From: Ilya Dryomov <idryomov@redhat.com>
Date: Wed, 5 Nov 2014 16:33:44 +0000 (+0300)
Subject: libceph: change from BUG to WARN for __remove_osd() asserts
X-Git-Tag: v3.16.35~2690
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe654f5eddc440e4d2639e1b739d155c6a4f615f;p=thirdparty%2Fkernel%2Fstable.git

libceph: change from BUG to WARN for __remove_osd() asserts

commit cc9f1f518cec079289d11d732efa490306b1ddad upstream.

No reason to use BUG_ON for osd request list assertions.

Signed-off-by: Ilya Dryomov <idryomov@redhat.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 14e0387e35956..18a59c60a2b7d 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1007,8 +1007,8 @@ static void put_osd(struct ceph_osd *osd)
 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));
+	WARN_ON(!list_empty(&osd->o_requests));
+	WARN_ON(!list_empty(&osd->o_linger_requests));
 
 	rb_erase(&osd->o_node, &osdc->osds);
 	list_del_init(&osd->o_osd_lru);