From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Denis Efremov <efremov@linux.com>,
"David S. Miller" <davem@davemloft.net>,
Song Liu <song@kernel.org>, Al Viro <viro@zeniv.linux.org.uk>,
Finn Thain <fthain@telegraphics.com.au>,
Michael Schmitz <schmitzmic@gmail.com>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-ide@vger.kernel.org, linux-raid@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-m68k@lists.linux-m68k.org
Subject: [PATCH 05/19] block: rework requesting modules for unclaimed devices
Date: Thu, 3 Sep 2020 10:01:05 +0200 [thread overview]
Message-ID: <20200903080119.441674-6-hch@lst.de> (raw)
In-Reply-To: <20200903080119.441674-1-hch@lst.de>
Instead of reusing the ranges in bdev_map, add a new helper that is
called if no ranges was found. This is a first step to unpeel and
eventually remove the complex ranges structure.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/genhd.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index 034e9089965a82..d9ecc751fc956c 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1033,6 +1033,13 @@ static ssize_t disk_badblocks_store(struct device *dev,
return badblocks_store(disk->bb, page, len, 0);
}
+static void request_gendisk_module(dev_t devt)
+{
+ if (request_module("block-major-%d-%d", MAJOR(devt), MINOR(devt)) > 0)
+ /* Make old-style 2.4 aliases work */
+ request_module("block-major-%d", MAJOR(devt));
+}
+
static struct gendisk *lookup_gendisk(dev_t dev, int *partno)
{
struct kobject *kobj;
@@ -1057,6 +1064,14 @@ static struct gendisk *lookup_gendisk(dev_t dev, int *partno)
probe = p->probe;
best = p->range - 1;
*partno = dev - p->dev;
+
+ if (!probe) {
+ mutex_unlock(&bdev_map_lock);
+ module_put(owner);
+ request_gendisk_module(dev);
+ goto retry;
+ }
+
if (p->lock && p->lock(dev, data) < 0) {
module_put(owner);
continue;
@@ -1295,15 +1310,6 @@ static const struct seq_operations partitions_op = {
};
#endif
-
-static struct kobject *base_probe(dev_t devt, int *partno, void *data)
-{
- if (request_module("block-major-%d-%d", MAJOR(devt), MINOR(devt)) > 0)
- /* Make old-style 2.4 aliases work */
- request_module("block-major-%d", MAJOR(devt));
- return NULL;
-}
-
static void bdev_map_init(void)
{
struct bdev_map *base;
@@ -1315,7 +1321,6 @@ static void bdev_map_init(void)
base->dev = 1;
base->range = ~0 ;
- base->probe = base_probe;
for (i = 0; i < 255; i++)
bdev_map[i] = base;
}
--
2.28.0
next prev parent reply other threads:[~2020-09-03 8:02 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 8:01 simplify gendisk lookup and remove struct block_device aliases v3 Christoph Hellwig
2020-09-03 8:01 ` [PATCH 01/19] char_dev: replace cdev_map with an xarray Christoph Hellwig
2020-09-04 10:16 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 02/19] block: merge drivers/base/map.c into block/genhd.c Christoph Hellwig
2020-09-04 10:17 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 03/19] block: cleanup del_gendisk a bit Christoph Hellwig
2020-09-04 10:18 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 04/19] block: split block_class_lock Christoph Hellwig
2020-09-04 10:19 ` Hannes Reinecke
2020-09-03 8:01 ` Christoph Hellwig [this message]
2020-09-04 10:20 ` [PATCH 05/19] block: rework requesting modules for unclaimed devices Hannes Reinecke
2020-09-03 8:01 ` [PATCH 06/19] block: add an optional probe callback to major_names Christoph Hellwig
2020-09-04 10:20 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 07/19] ide: remove ide_{,un}register_region Christoph Hellwig
2020-09-03 8:01 ` [PATCH 08/19] swim: don't call blk_register_region Christoph Hellwig
2020-09-04 10:21 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 09/19] sd: use __register_blkdev to avoid a modprobe for an unregistered dev_t Christoph Hellwig
2020-09-04 10:22 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 10/19] brd: use __register_blkdev to allocate devices on demand Christoph Hellwig
2020-09-04 10:23 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 11/19] loop: " Christoph Hellwig
2020-09-04 10:24 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 12/19] md: " Christoph Hellwig
2020-09-04 10:25 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 13/19] ide: switch to __register_blkdev for command set probing Christoph Hellwig
2020-09-04 10:26 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 14/19] floppy: use a separate gendisk for each media format Christoph Hellwig
2020-09-04 9:59 ` Denis Efremov
2020-09-04 10:28 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 15/19] amiflop: use separate gendisks for Amiga vs MS-DOS mode Christoph Hellwig
2020-09-04 10:28 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 16/19] ataflop: use a separate gendisk for each media format Christoph Hellwig
2020-09-03 8:14 ` John Paul Adrian Glaubitz
2020-09-04 10:29 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 17/19] z2ram: reindent Christoph Hellwig
2020-09-04 10:29 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 18/19] z2ram: use separate gendisk for the different modes Christoph Hellwig
2020-09-04 10:30 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 19/19] block: switch gendisk lookup to a simple xarray Christoph Hellwig
2020-09-04 10:30 ` Hannes Reinecke
-- strict thread matches above, loose matches on Subject: below --
2020-08-30 6:24 simplify gendisk lookup and remove struct block_device aliases v2 Christoph Hellwig
2020-08-30 6:24 ` [PATCH 05/19] block: rework requesting modules for unclaimed devices Christoph Hellwig
2020-08-26 6:24 simplify gendisk lookup and remove struct block_device aliases Christoph Hellwig
2020-08-26 6:24 ` [PATCH 05/19] block: rework requesting modules for unclaimed devices Christoph Hellwig
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=20200903080119.441674-6-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=davem@davemloft.net \
--cc=efremov@linux.com \
--cc=fthain@telegraphics.com.au \
--cc=gregkh@linuxfoundation.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=schmitzmic@gmail.com \
--cc=song@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).