[PATCH 04/18] block: rework requesting modules for unclaimed devices

Christoph Hellwig
2020-10-29T15:10:07Z

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>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
block/genhd.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 8be38725aad4e5..0e9f67e79c53fd 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1028,6 +1028,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;
@@ -1052,6 +1059,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;
@@ -1290,15 +1305,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;
@@ -1310,7 +1316,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