]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
libceph: change from BUG to WARN for __remove_osd() asserts
authorIlya Dryomov <idryomov@redhat.com>
Wed, 5 Nov 2014 16:33:44 +0000 (19:33 +0300)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 2 Mar 2015 15:04:34 +0000 (15:04 +0000)
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>
net/ceph/osd_client.c

index 14e0387e359566a587ded53cc7a2086a20302bbe..18a59c60a2b7d19e41f1019e761781c202a2a11e 100644 (file)
@@ -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);