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 15/15] block: remove bdget_disk
Date: Tue, 30 Mar 2021 18:17:27 +0200 [thread overview]
Message-ID: <20210330161727.2297292-16-hch@lst.de> (raw)
In-Reply-To: <20210330161727.2297292-1-hch@lst.de>
Just opencode the xa_load in the callers, as none of them actually
needs a reference to the bdev.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/genhd.c | 35 +++++------------------------------
block/partitions/core.c | 25 ++++++++++++-------------
include/linux/genhd.h | 1 -
3 files changed, 17 insertions(+), 44 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index 232c8420b04973..f0d4cf80dac1ea 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -778,32 +778,6 @@ void blk_request_module(dev_t devt)
request_module("block-major-%d", MAJOR(devt));
}
-/**
- * bdget_disk - do bdget() by gendisk and partition number
- * @disk: gendisk of interest
- * @partno: partition number
- *
- * Find partition @partno from @disk, do bdget() on it.
- *
- * CONTEXT:
- * Don't care.
- *
- * RETURNS:
- * Resulting block_device on success, NULL on failure.
- */
-struct block_device *bdget_disk(struct gendisk *disk, int partno)
-{
- struct block_device *bdev = NULL;
-
- rcu_read_lock();
- bdev = xa_load(&disk->part_tbl, partno);
- if (bdev && !bdgrab(bdev))
- bdev = NULL;
- rcu_read_unlock();
-
- return bdev;
-}
-
/*
* print a full list of all partitions - intended for places where the root
* filesystem can't be mounted and thus to give the victim some idea of what
@@ -1328,13 +1302,14 @@ module_init(proc_genhd_init);
dev_t part_devt(struct gendisk *disk, u8 partno)
{
- struct block_device *part = bdget_disk(disk, partno);
+ struct block_device *part;
dev_t devt = 0;
- if (part) {
+ rcu_read_lock();
+ part = xa_load(&disk->part_tbl, partno);
+ if (part)
devt = part->bd_dev;
- bdput(part);
- }
+ rcu_read_unlock();
return devt;
}
diff --git a/block/partitions/core.c b/block/partitions/core.c
index 162b9b35c53171..00e425c668a5f8 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -322,6 +322,8 @@ static struct block_device *add_partition(struct gendisk *disk, int partno,
const char *dname;
int err;
+ lockdep_assert_held(&disk->open_mutex);
+
/*
* Partitions are not supported on zoned block devices that are used as
* such.
@@ -454,14 +456,13 @@ int bdev_add_partition(struct block_device *bdev, int partno,
int bdev_del_partition(struct block_device *bdev, int partno)
{
- struct block_device *part;
- int ret;
-
- part = bdget_disk(bdev->bd_disk, partno);
- if (!part)
- return -ENXIO;
+ struct block_device *part = NULL;
+ int ret = -ENXIO;
mutex_lock(&bdev->bd_disk->open_mutex);
+ part = xa_load(&bdev->bd_disk->part_tbl, partno);
+ if (!part)
+ goto out_unlock;
ret = -EBUSY;
if (part->bd_openers)
@@ -474,21 +475,20 @@ int bdev_del_partition(struct block_device *bdev, int partno)
ret = 0;
out_unlock:
mutex_unlock(&bdev->bd_disk->open_mutex);
- bdput(part);
return ret;
}
int bdev_resize_partition(struct block_device *bdev, int partno,
sector_t start, sector_t length)
{
- struct block_device *part;
- int ret = 0;
+ struct block_device *part = NULL;
+ int ret = -ENXIO;
- part = bdget_disk(bdev->bd_disk, partno);
+ mutex_lock(&bdev->bd_disk->open_mutex);
+ part = xa_load(&bdev->bd_disk->part_tbl, partno);
if (!part)
- return -ENXIO;
+ goto out_unlock;
- mutex_lock(&bdev->bd_disk->open_mutex);
ret = -EINVAL;
if (start != part->bd_start_sect)
goto out_unlock;
@@ -502,7 +502,6 @@ int bdev_resize_partition(struct block_device *bdev, int partno,
ret = 0;
out_unlock:
mutex_unlock(&bdev->bd_disk->open_mutex);
- bdput(part);
return ret;
}
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 819366811349eb..674fc0761105bc 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -241,7 +241,6 @@ static inline void add_disk_no_queue_reg(struct gendisk *disk)
}
extern void del_gendisk(struct gendisk *gp);
-extern struct block_device *bdget_disk(struct gendisk *disk, int partno);
void set_disk_ro(struct gendisk *disk, bool read_only);
--
2.30.1
next prev parent reply other threads:[~2021-03-30 16:19 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 ` [PATCH 11/15] block: move adjusting bd_part_count out of __blkdev_get Christoph Hellwig
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 ` Christoph Hellwig [this message]
2021-03-30 23:37 ` [PATCH 15/15] block: remove bdget_disk 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-16-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;
as well as URLs for NNTP newsgroup(s).