From patchwork Wed Nov 18 08:47:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 11914601 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 588441668 for ; Wed, 18 Nov 2020 09:01:02 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17CA8221E9 for ; Wed, 18 Nov 2020 09:01:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="MH4CdclH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17CA8221E9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.29548.59094 (Exim 4.92) (envelope-from ) id 1kfJJo-0001lu-W2; Wed, 18 Nov 2020 09:00:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 29548.59094; Wed, 18 Nov 2020 09:00:00 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfJJo-0001lU-Oo; Wed, 18 Nov 2020 09:00:00 +0000 Received: by outflank-mailman (input) for mailman id 29548; Wed, 18 Nov 2020 08:59:58 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfJAA-0006e0-5R for xen-devel@lists.xenproject.org; Wed, 18 Nov 2020 08:50:02 +0000 Received: from casper.infradead.org (unknown [2001:8b0:10b:1236::1]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 895ad695-9953-4c47-aa7b-7ecb0a7a74cb; Wed, 18 Nov 2020 08:48:47 +0000 (UTC) Received: from [2001:4bb8:18c:31ba:32b1:ec66:5459:36a] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kfJ8l-0007pS-Je; Wed, 18 Nov 2020 08:48:35 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfJAA-0006e0-5R for xen-devel@lists.xenproject.org; Wed, 18 Nov 2020 08:50:02 +0000 X-Inumbo-ID: 895ad695-9953-4c47-aa7b-7ecb0a7a74cb Received: from casper.infradead.org (unknown [2001:8b0:10b:1236::1]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 895ad695-9953-4c47-aa7b-7ecb0a7a74cb; Wed, 18 Nov 2020 08:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Ax7Ev08zfe+k5fDLujW3aI+bgMMepj+7Q/YK24br9d4=; b=MH4CdclHDFODTjP9xnj5n+SLj0 KgiBor4Efh0d9jME3EBQSx6adQqstkQTNDaZ2TizC50HfcaRgRLQhFlai8VIjVusfI7Z1sIv/ES2V yVYPpyv6TcX6IvPqvrcT6UuNlnH1RiFDoZeB5gewwtGWzxh8hzup0RNJSPK2mZL0Xv6zp19aHzSC6 FD9BN9wevD0vXr+flfq6Rs+nbACPaGbwFMFYa5Rr9YH61lZzjJ7URnmHIkhz4Av1kbIuigOC3Ufc0 Qb4rWt3d0clR8N8p05bFTRMhFV3wjTMS4l+SUARMu/uwttgDn3VZ8BLlS2HkkXll+sF4pZ22nbxux jd6zetXA==; Received: from [2001:4bb8:18c:31ba:32b1:ec66:5459:36a] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kfJ8l-0007pS-Je; Wed, 18 Nov 2020 08:48:35 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Tejun Heo , Josef Bacik , Konrad Rzeszutek Wilk , Coly Li , Mike Snitzer , dm-devel@redhat.com, Richard Weinberger , Jan Kara , linux-block@vger.kernel.org, xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 19/20] bcache: remove a superflous lookup_bdev all Date: Wed, 18 Nov 2020 09:47:59 +0100 Message-Id: <20201118084800.2339180-20-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201118084800.2339180-1-hch@lst.de> References: <20201118084800.2339180-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Don't bother to call lookup_bdev for just a slightly different error message without any functional change. Signed-off-by: Christoph Hellwig --- drivers/md/bcache/super.c | 44 +-------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index e5db2cdd114112..5c531ed7785280 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -2380,40 +2380,6 @@ kobj_attribute_write(register, register_bcache); kobj_attribute_write(register_quiet, register_bcache); kobj_attribute_write(pendings_cleanup, bch_pending_bdevs_cleanup); -static bool bch_is_open_backing(struct block_device *bdev) -{ - struct cache_set *c, *tc; - struct cached_dev *dc, *t; - - list_for_each_entry_safe(c, tc, &bch_cache_sets, list) - list_for_each_entry_safe(dc, t, &c->cached_devs, list) - if (dc->bdev == bdev) - return true; - list_for_each_entry_safe(dc, t, &uncached_devices, list) - if (dc->bdev == bdev) - return true; - return false; -} - -static bool bch_is_open_cache(struct block_device *bdev) -{ - struct cache_set *c, *tc; - - list_for_each_entry_safe(c, tc, &bch_cache_sets, list) { - struct cache *ca = c->cache; - - if (ca->bdev == bdev) - return true; - } - - return false; -} - -static bool bch_is_open(struct block_device *bdev) -{ - return bch_is_open_cache(bdev) || bch_is_open_backing(bdev); -} - struct async_reg_args { struct delayed_work reg_work; char *path; @@ -2535,15 +2501,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, sb); if (IS_ERR(bdev)) { if (bdev == ERR_PTR(-EBUSY)) { - bdev = lookup_bdev(strim(path)); - mutex_lock(&bch_register_lock); - if (!IS_ERR(bdev) && bch_is_open(bdev)) - err = "device already registered"; - else - err = "device busy"; - mutex_unlock(&bch_register_lock); - if (!IS_ERR(bdev)) - bdput(bdev); + err = "device busy"; if (attr == &ksysfs_register_quiet) goto done; }