diff mbox series

[v2] md: Explicitly create command-line configured devices

Message ID YpdHay7qyUzbvnxg@arachsys.com (mailing list archive)
State New, archived
Headers show
Series [v2] md: Explicitly create command-line configured devices | expand

Commit Message

Chris Webb June 1, 2022, 11:03 a.m. UTC 
Boot-time assembly of arrays with md= command-line arguments breaks when
CONFIG_BLOCK_LEGACY_AUTOLOAD is unset. md_setup_drive() in md-autodetect.c
calls blkdev_get_by_dev(), assuming this implicitly creates the block
device.

Fix this by attempting to md_alloc() the array first. As in the probe path,
ignore any error as failure is caught by blkdev_get_by_dev() anyway.

Signed-off-by: Chris Webb <chris@arachsys.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
v2: Correction from Christoph's review: dropped redundant 'extern' from
md_alloc() prototype in md.h.

 drivers/md/md-autodetect.c | 1 +
 drivers/md/md.c            | 2 +-
 drivers/md/md.h            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

Comments

Song Liu June 1, 2022, 11:18 p.m. UTC | #1 
On Wed, Jun 1, 2022 at 4:03 AM Chris Webb <chris@arachsys.com> wrote:
>
> Boot-time assembly of arrays with md= command-line arguments breaks when
> CONFIG_BLOCK_LEGACY_AUTOLOAD is unset. md_setup_drive() in md-autodetect.c
> calls blkdev_get_by_dev(), assuming this implicitly creates the block
> device.
>
> Fix this by attempting to md_alloc() the array first. As in the probe path,
> ignore any error as failure is caught by blkdev_get_by_dev() anyway.
>
> Signed-off-by: Chris Webb <chris@arachsys.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>

Applied to md-next.

Thanks!
Song
diff mbox series

Patch

diff --git a/drivers/md/md-autodetect.c b/drivers/md/md-autodetect.c
index 2cf973722f59..344910ba435c 100644
--- a/drivers/md/md-autodetect.c
+++ b/drivers/md/md-autodetect.c
@@ -169,6 +169,7 @@  static void __init md_setup_drive(struct md_setup_args *args)
 
 	pr_info("md: Loading %s: %s\n", name, args->device_names);
 
+	md_alloc(mdev, name);
 	bdev = blkdev_get_by_dev(mdev, FMODE_READ, NULL);
 	if (IS_ERR(bdev)) {
 		pr_err("md: open failed - cannot start array %s\n", name);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 707e802d0082..5a4bca886572 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5638,7 +5638,7 @@  int mddev_init_writes_pending(struct mddev *mddev)
 }
 EXPORT_SYMBOL_GPL(mddev_init_writes_pending);
 
-static int md_alloc(dev_t dev, char *name)
+int md_alloc(dev_t dev, char *name)
 {
 	/*
 	 * If dev is zero, name is the name of a device to allocate with
diff --git a/drivers/md/md.h b/drivers/md/md.h
index cf2cbb17acbd..8da7ec314bbf 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -751,6 +751,7 @@  extern int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev);
 extern int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale);
 
 extern void mddev_init(struct mddev *mddev);
+int md_alloc(dev_t dev, char *name);
 extern int md_run(struct mddev *mddev);
 extern int md_start(struct mddev *mddev);
 extern void md_stop(struct mddev *mddev);