From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754241AbbCQJlW (ORCPT ); Tue, 17 Mar 2015 05:41:22 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:59597 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753573AbbCQImh (ORCPT ); Tue, 17 Mar 2015 04:42:37 -0400 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ilya Dryomov , Jiri Slaby Subject: [PATCH 3.12 050/175] libceph: assert both regular and lingering lists in __remove_osd() Date: Tue, 17 Mar 2015 09:40:28 +0100 Message-Id: <66d37e928df71d6aef8b2dfe8c6dca785653cf1f.1426581621.git.jslaby@suse.cz> X-Mailer: git-send-email 2.3.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilya Dryomov 3.12-stable review patch. If anyone has any objections, please let me know. =============== 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 Reviewed-by: Alex Elder Signed-off-by: Jiri Slaby --- 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 e6b2db68b4fa..4e24b7338582 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -976,6 +976,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_requests)); + BUG_ON(!list_empty(&osd->o_linger_requests)); + rb_erase(&osd->o_node, &osdc->osds); list_del_init(&osd->o_osd_lru); ceph_con_close(&osd->o_con); -- 2.3.0