From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>, Song Liu <song@kernel.org>
Cc: "Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Minchan Kim" <minchan@kernel.org>,
"Nitin Gupta" <ngupta@vflare.org>,
"Stefan Haberland" <sth@linux.ibm.com>,
"Jan Hoeppner" <hoeppner@linux.ibm.com>,
linux-block@vger.kernel.org, linux-raid@vger.kernel.org,
linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org
Subject: [PATCH 11/15] block: move adjusting bd_part_count out of __blkdev_get
Date: Tue, 30 Mar 2021 18:17:23 +0200 [thread overview]
Message-ID: <20210330161727.2297292-12-hch@lst.de> (raw)
In-Reply-To: <20210330161727.2297292-1-hch@lst.de>
Keep in the callers and thus remove the for_part argument. This mirrors
what is done on the blkdev_get side and slightly simplifies
blkdev_get_part as well.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/block_dev.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 4113a27ad9e72d..044e9200783e2d 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1230,7 +1230,7 @@ void bd_unlink_disk_holder(struct block_device *bdev, struct gendisk *disk)
EXPORT_SYMBOL_GPL(bd_unlink_disk_holder);
#endif
-static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);
+static void __blkdev_put(struct block_device *bdev, fmode_t mode);
int bdev_disk_changed(struct block_device *bdev, bool invalidate)
{
@@ -1320,12 +1320,12 @@ static int blkdev_get_part(struct block_device *part, fmode_t mode)
ret = blkdev_get_whole(whole, mode);
if (ret)
goto out_put_whole;
- whole->bd_part_count++;
ret = -ENXIO;
if (!(disk->flags & GENHD_FL_UP) || !bdev_nr_sectors(part))
goto out_blkdev_put;
+ whole->bd_part_count++;
set_init_blocksize(part);
if (part->bd_bdi == &noop_backing_dev_info)
part->bd_bdi = bdi_get(disk->queue->backing_dev_info);
@@ -1334,7 +1334,7 @@ static int blkdev_get_part(struct block_device *part, fmode_t mode)
return 0;
out_blkdev_put:
- __blkdev_put(whole, mode, 1);
+ __blkdev_put(whole, mode);
out_put_whole:
bdput(whole);
return ret;
@@ -1537,14 +1537,11 @@ static int blkdev_open(struct inode * inode, struct file * filp)
return 0;
}
-static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
+static void __blkdev_put(struct block_device *bdev, fmode_t mode)
{
struct gendisk *disk = bdev->bd_disk;
struct block_device *victim = NULL;
- if (for_part)
- bdev->bd_part_count--;
-
if (!--bdev->bd_openers) {
WARN_ON_ONCE(bdev->bd_holders);
sync_blockdev(bdev);
@@ -1557,7 +1554,8 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
if (!bdev_is_partition(bdev) && disk->fops->release)
disk->fops->release(disk, mode);
if (victim) {
- __blkdev_put(victim, mode, 1);
+ victim->bd_part_count--;
+ __blkdev_put(victim, mode);
bdput(victim);
}
}
@@ -1615,7 +1613,7 @@ void blkdev_put(struct block_device *bdev, fmode_t mode)
*/
disk_flush_events(disk, DISK_EVENT_MEDIA_CHANGE);
- __blkdev_put(bdev, mode, 0);
+ __blkdev_put(bdev, mode);
mutex_unlock(&disk->open_mutex);
blkdev_put_no_open(bdev);
--
2.30.1
next prev parent reply other threads:[~2021-03-30 16:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-30 16:17 move bd_mutex to the gendisk Christoph Hellwig
2021-03-30 16:17 ` [PATCH 01/15] md: remove the code to flush an old instance in md_open Christoph Hellwig
2021-03-31 3:29 ` heming.zhao
2021-03-31 6:53 ` Christoph Hellwig
2021-03-30 16:17 ` [PATCH 02/15] md: factor out a mddev_find_locked helper from mddev_find Christoph Hellwig
2021-03-30 16:17 ` [PATCH 03/15] md: factor out a mddev_alloc_unit " Christoph Hellwig
2021-03-30 16:17 ` [PATCH 04/15] md: split mddev_find Christoph Hellwig
2021-03-30 16:17 ` [PATCH 05/15] md: refactor mddev_find_or_alloc Christoph Hellwig
2021-03-30 16:17 ` [PATCH 06/15] md: do not return existing mddevs from mddev_find_or_alloc Christoph Hellwig
2021-03-30 16:17 ` [PATCH 07/15] block: remove the -ERESTARTSYS handling in blkdev_get_by_dev Christoph Hellwig
2021-03-30 16:17 ` [PATCH 08/15] block: split __blkdev_get Christoph Hellwig
2021-03-30 16:17 ` [PATCH 09/15] block: move sync_blockdev from __blkdev_put to blkdev_put Christoph Hellwig
2021-03-30 16:17 ` [PATCH 10/15] block: move bd_mutex to struct gendisk Christoph Hellwig
2021-04-01 8:25 ` Roger Pau Monné
2021-04-08 14:29 ` Stefan Haberland
2021-03-30 16:17 ` Christoph Hellwig [this message]
2021-03-30 16:17 ` [PATCH 12/15] block: split __blkdev_put Christoph Hellwig
2021-03-30 16:17 ` [PATCH 13/15] block: move bd_part_count to struct gendisk Christoph Hellwig
2021-03-30 16:17 ` [PATCH 14/15] block: factor out a part_devt helper Christoph Hellwig
2021-03-30 16:17 ` [PATCH 15/15] block: remove bdget_disk Christoph Hellwig
2021-03-30 23:37 ` Chaitanya Kulkarni
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=20210330161727.2297292-12-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=hoeppner@linux.ibm.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=minchan@kernel.org \
--cc=ngupta@vflare.org \
--cc=roger.pau@citrix.com \
--cc=song@kernel.org \
--cc=sth@linux.ibm.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox