DM-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-bcache@vger.kernel.org, Mike Snitzer <snitzer@redhat.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	Richard Weinberger <richard@nod.at>,
	Josef Bacik <josef@toxicpanda.com>, Coly Li <colyli@suse.de>,
	linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	dm-devel@redhat.com, linux-mtd@lists.infradead.org,
	Jan Kara <jack@suse.com>, Tejun Heo <tj@kernel.org>,
	xen-devel@lists.xenproject.org, linux-mm@kvack.org
Subject: [dm-devel] [PATCH 10/20] block: refactor __blkdev_put
Date: Wed, 18 Nov 2020 09:47:50 +0100
Message-ID: <20201118084800.2339180-11-hch@lst.de> (raw)
In-Reply-To: <20201118084800.2339180-1-hch@lst.de>

Reorder the code to have one big section for the last close, and to use
bdev_is_partition.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/block_dev.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 29db12c3bb501c..4c4d6c30382c06 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1745,22 +1745,22 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
 		WARN_ON_ONCE(bdev->bd_holders);
 		sync_blockdev(bdev);
 		kill_bdev(bdev);
-
 		bdev_write_inode(bdev);
-	}
-	if (bdev->bd_contains == bdev) {
-		if (disk->fops->release)
+
+		if (!bdev_is_partition(bdev) && disk->fops->release)
 			disk->fops->release(disk, mode);
-	}
-	if (!bdev->bd_openers) {
+
 		disk_put_part(bdev->bd_part);
 		bdev->bd_part = NULL;
 		bdev->bd_disk = NULL;
-		if (bdev != bdev->bd_contains)
+		if (bdev_is_partition(bdev))
 			victim = bdev->bd_contains;
 		bdev->bd_contains = NULL;
 
 		put_disk_and_module(disk);
+	} else {
+		if (!bdev_is_partition(bdev) && disk->fops->release)
+			disk->fops->release(disk, mode);
 	}
 	mutex_unlock(&bdev->bd_mutex);
 	bdput(bdev);
-- 
2.29.2

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel


  parent reply index

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-18  8:47 [dm-devel] merge struct block_device and struct hd_struct Christoph Hellwig
2020-11-18  8:47 ` [dm-devel] [PATCH 01/20] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats Christoph Hellwig
2020-11-18 14:09   ` Jan Kara
2020-11-19  8:37   ` Johannes Thumshirn
2020-11-24 12:26   ` Tejun Heo
2020-11-18  8:47 ` [dm-devel] [PATCH 02/20] block: remove a duplicate __disk_get_part prototype Christoph Hellwig
2020-11-18 14:10   ` Jan Kara
2020-11-19  8:37   ` Johannes Thumshirn
2020-11-18  8:47 ` [dm-devel] [PATCH 03/20] block: add a bdev_kobj helper Christoph Hellwig
2020-11-18 14:18   ` Jan Kara
2020-11-19  8:37   ` Johannes Thumshirn
2020-11-18  8:47 ` [dm-devel] [PATCH 04/20] block: use disk_part_iter_exit in disk_part_iter_next Christoph Hellwig
2020-11-18 14:19   ` Jan Kara
2020-11-19  8:37   ` Johannes Thumshirn
2020-11-18  8:47 ` [dm-devel] [PATCH 05/20] block: use put_device in put_disk Christoph Hellwig
2020-11-18 14:20   ` Jan Kara
2020-11-19  8:38   ` Johannes Thumshirn
2020-11-18  8:47 ` [dm-devel] [PATCH 06/20] block: change the hash used for looking up block devices Christoph Hellwig
2020-11-18 14:22   ` Jan Kara
2020-11-18  8:47 ` [dm-devel] [PATCH 07/20] init: refactor name_to_dev_t Christoph Hellwig
2020-11-18 14:37   ` Jan Kara
2020-11-19  7:52     ` Christoph Hellwig
2020-11-19  8:25       ` Jan Kara
2020-11-20  8:49         ` Christoph Hellwig
2020-11-19  8:38   ` Johannes Thumshirn
2020-11-18  8:47 ` [dm-devel] [PATCH 08/20] init: refactor devt_from_partuuid Christoph Hellwig
2020-11-18 14:41   ` Jan Kara
2020-11-18  8:47 ` [dm-devel] [PATCH 09/20] init: cleanup match_dev_by_uuid and match_dev_by_label Christoph Hellwig
2020-11-18 14:42   ` Jan Kara
2020-11-19  8:38   ` Johannes Thumshirn
2020-11-18  8:47 ` Christoph Hellwig [this message]
2020-11-18 14:46   ` [dm-devel] [PATCH 10/20] block: refactor __blkdev_put Jan Kara
2020-11-18  8:47 ` [dm-devel] [PATCH 11/20] block: reference struct block_device from struct hd_struct Christoph Hellwig
2020-11-19  9:41   ` Jan Kara
2020-11-20  8:56     ` Christoph Hellwig
2020-11-24 16:59   ` Tejun Heo
2020-11-25 11:40     ` Jan Kara
2020-11-25 12:09       ` Tejun Heo
2020-11-18  8:47 ` [dm-devel] [PATCH 12/20] block: simplify the block device claiming interface Christoph Hellwig
2020-11-19 10:07   ` Jan Kara
2020-11-18  8:47 ` [dm-devel] [PATCH 13/20] block: remove ->bd_contains Christoph Hellwig
2020-11-19 10:32   ` Jan Kara
2020-11-20  9:01     ` Christoph Hellwig
2020-11-18  8:47 ` [dm-devel] [PATCH 14/20] block: remove the nr_sects field in struct hd_struct Christoph Hellwig
2020-11-19 12:05   ` Jan Kara
2020-11-20  9:08     ` Christoph Hellwig
2020-11-20 11:21       ` Jan Kara
2020-11-20 15:32         ` Christoph Hellwig
2020-11-20 15:59           ` Matthew Wilcox
2020-11-20 16:01             ` Christoph Hellwig
2020-11-20 20:05             ` Jan Kara
2020-11-21 16:24               ` Christoph Hellwig
2020-11-18  8:47 ` [dm-devel] [PATCH 15/20] block: merge struct block_device and " Christoph Hellwig
2020-11-19 14:39   ` Jan Kara
2020-11-20  9:15     ` Christoph Hellwig
2020-11-20 10:53       ` Jan Kara
2020-11-18  8:47 ` [dm-devel] [PATCH 16/20] block: stop using bdget_disk for partition 0 Christoph Hellwig
2020-11-19 14:43   ` Jan Kara
2020-11-18  8:47 ` [dm-devel] [PATCH 17/20] filemap: consistently use ->f_mapping over ->i_mapping Christoph Hellwig
2020-11-19 14:53   ` Jan Kara
2020-11-19 15:13   ` Matthew Wilcox
2020-11-20  9:17     ` Christoph Hellwig
2020-11-18  8:47 ` [dm-devel] [PATCH 18/20] fs: remove get_super_thawed and get_super_exclusive_thawed Christoph Hellwig
2020-11-19 14:59   ` Jan Kara
2020-11-18  8:47 ` [dm-devel] [PATCH 19/20] bcache: remove a superflous lookup_bdev all Christoph Hellwig
2020-11-18  8:54   ` Coly Li
2020-11-18  9:10     ` Greg KH
2020-11-18  9:55       ` Coly Li
2020-11-18 16:24     ` Christoph Hellwig
2020-11-18  8:48 ` [dm-devel] [PATCH 20/20] block: remove i_bdev Christoph Hellwig
2020-11-18  8:56 ` [dm-devel] merge struct block_device and struct hd_struct Jan Beulich
2020-11-18  8:58   ` Christoph Hellwig
2020-11-18  9:04     ` Jan Beulich
2020-11-18  9:08       ` Christoph Hellwig
2020-11-18  9:09       ` Greg KH
2020-11-18  9:23         ` Jan Beulich
2020-11-18  9:32           ` Greg KH
2020-11-18 12:50           ` Matthew Wilcox
2020-11-18  9:13 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201118084800.2339180-11-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=colyli@suse.de \
    --cc=dm-devel@redhat.com \
    --cc=jack@suse.com \
    --cc=josef@toxicpanda.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-bcache@vger.kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=richard@nod.at \
    --cc=snitzer@redhat.com \
    --cc=tj@kernel.org \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DM-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/dm-devel/0 dm-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dm-devel dm-devel/ https://lore.kernel.org/dm-devel \
		dm-devel@redhat.com
	public-inbox-index dm-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/com.redhat.dm-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git