From patchwork Wed Nov 5 17:33:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 5236861 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B10EB9F295 for ; Wed, 5 Nov 2014 17:33:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F162220145 for ; Wed, 5 Nov 2014 17:33:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2008320138 for ; Wed, 5 Nov 2014 17:33:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755129AbaKERdw (ORCPT ); Wed, 5 Nov 2014 12:33:52 -0500 Received: from mail-lb0-f182.google.com ([209.85.217.182]:64387 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755091AbaKERdw (ORCPT ); Wed, 5 Nov 2014 12:33:52 -0500 Received: by mail-lb0-f182.google.com with SMTP id f15so1193413lbj.27 for ; Wed, 05 Nov 2014 09:33:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=JeKzrtVU2weTWhTKpD9q3gL76Ruxn50cALXNb9yy5hU=; b=N9Gd3Eu9GRLTH867pb9DZzWyd3xj4qbAS25eybGTz/2gpoT/tnRJzw+DY+x5pql8or h67rIPsu2DH3N9sT9TPV9w9tTlM/Dun96Nmp51S1guq6pSOUVZ5Rja+pnRw6ddH5aBUu pIPPjX8JZdBefePnT4/2dGYm14NcJX/PAqIltK8+k3YAE322uFy9qPSHrnSKLpbvFwjX yECJw132bufrQWIvU0HN4l1iuX29BtN7s/Pc0jWZCW1XNODDVz86btirwNNDFfdgENzB 3Jgjfhqim+vcYW7ynBtfh0IrlKJWk50aOJTRxvImSY+4cDNhBfogcmvxbXodQMtua+4u BKuA== X-Gm-Message-State: ALoCoQlMG1Ocj2/MvQRmR/Yyqq8mLuy7zxXnmZM5gxGAH7vk45gYj9glgBWmj5XznBO3wmn/yMPU X-Received: by 10.153.6.9 with SMTP id cq9mr47605842lad.79.1415208830225; Wed, 05 Nov 2014 09:33:50 -0800 (PST) Received: from localhost ([109.110.66.36]) by mx.google.com with ESMTPSA id pr7sm1552598lbc.18.2014.11.05.09.33.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 05 Nov 2014 09:33:49 -0800 (PST) From: Ilya Dryomov X-Google-Original-From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 3/3] libceph: change from BUG to WARN for __remove_osd() asserts Date: Wed, 5 Nov 2014 20:33:24 +0300 Message-Id: <1415208804-10163-4-git-send-email-idryomov@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1415208804-10163-1-git-send-email-idryomov@redhat.com> References: <1415208804-10163-1-git-send-email-idryomov@redhat.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No reason to use BUG_ON for osd request list assertions. Signed-off-by: Ilya Dryomov --- 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 2a42c795b1ac..1f6c4055adaf 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);