[3.13.y-ckt stable] Patch "libceph: change from BUG to WARN for __remove_osd() asserts" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

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

to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11-ckt18.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From ccae5b97e53a391ebcf1a313d2b85b8cbf73de0c Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov at redhat.com>
Date: Wed, 5 Nov 2014 19:33:44 +0300
Subject: 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 at redhat.com>
Reviewed-by: Alex Elder <elder at linaro.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 net/ceph/osd_client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 4e24b73..ba3330e 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -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);
--
1.9.1