forked from pool/mdadm
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
|
From fdbf7aaa19564520055971724b70ae1652e35788 Mon Sep 17 00:00:00 2001
|
||
|
|
From: NeilBrown <neilb@suse.com>
|
||
|
|
Date: Mon, 25 Sep 2017 15:52:19 +1000
|
||
|
|
Subject: [PATCH] mdopen: call "modprobe md_mod" if it might be needed.
|
||
|
|
Git-commit: fdbf7aaa19564520055971724b70ae1652e35788
|
||
|
|
Patch-mainline: mdadm-4.0+
|
||
|
|
References: bsc#1069165, bsc#1069167, bsc#1068030
|
||
|
|
|
||
|
|
Creating an array by opening a block-device with major number of 9
|
||
|
|
will transparently load the md module if needed.
|
||
|
|
Creating an array by opening
|
||
|
|
/sys/module/md_mod/parameters/new_array
|
||
|
|
and writing to it won't, it will just fail if md_mod isn't loaded.
|
||
|
|
|
||
|
|
So when opening that file fails with ENOENT, run "modprobe md_mod" and
|
||
|
|
try again.
|
||
|
|
|
||
|
|
This fixes a bug whereby if you have "CREATE names=yes" in mdadm.conf,
|
||
|
|
and the md modules isn't loaded, then creating or assembling an
|
||
|
|
array will not honor the "names=yes" configuration.
|
||
|
|
|
||
|
|
Signed-off-by: NeilBrown <neilb@suse.com>
|
||
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
||
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
||
|
|
|
||
|
|
---
|
||
|
|
mdopen.c | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/mdopen.c b/mdopen.c
|
||
|
|
index 3c0052f..dcdc6f2 100644
|
||
|
|
--- a/mdopen.c
|
||
|
|
+++ b/mdopen.c
|
||
|
|
@@ -312,6 +312,10 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
|
||
|
|
if (block_udev)
|
||
|
|
udev_block(devnm);
|
||
|
|
fd = open("/sys/module/md_mod/parameters/new_array", O_WRONLY);
|
||
|
|
+ if (fd < 0 && errno == ENOENT) {
|
||
|
|
+ system("modprobe md_mod");
|
||
|
|
+ fd = open("/sys/module/md_mod/parameters/new_array", O_WRONLY);
|
||
|
|
+ }
|
||
|
|
if (fd >= 0) {
|
||
|
|
n = write(fd, devnm, strlen(devnm));
|
||
|
|
close(fd);
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|