]> git.ipfire.org Git - people/ms/linux.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)
committerJiri Slaby <jslaby@suse.cz>
Thu, 5 Mar 2015 14:36:58 +0000 (15:36 +0100)
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: Jiri Slaby <jslaby@suse.cz>
net/ceph/osd_client.c

index 4e24b73385826be2f425ddb848adc0c5a9a20641..ba3330e9665d7a4334ae2b2a805f664e9cdb001f 100644 (file)
@@ -975,8 +975,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);