md: move the early init autodetect code to drivers/md/
authorChristoph Hellwig <hch@lst.de>
Sun, 7 Jun 2020 14:18:59 +0000 (16:18 +0200)
committerChristoph Hellwig <hch@lst.de>
Thu, 16 Jul 2020 13:34:47 +0000 (15:34 +0200)
Just like the NFS and CIFS root code this better lives with the
driver it is tightly integrated with.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Song Liu <song@kernel.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/md/Makefile
drivers/md/md-autodetect.c [new file with mode: 0644]
include/linux/raid/detect.h
init/Makefile
init/do_mounts.c
init/do_mounts.h
init/do_mounts_md.c [deleted file]

index 31840f95cd408bc70e6152a6d4d62446e218e62f..6d3e234dc46a5d44db7e15cc4dc1d0e6d1b9213d 100644 (file)
@@ -43,6 +43,9 @@ obj-$(CONFIG_MD_FAULTY)               += faulty.o
 obj-$(CONFIG_MD_CLUSTER)       += md-cluster.o
 obj-$(CONFIG_BCACHE)           += bcache/
 obj-$(CONFIG_BLK_DEV_MD)       += md-mod.o
+ifeq ($(CONFIG_BLK_DEV_MD),y)
+obj-y                          += md-autodetect.o
+endif
 obj-$(CONFIG_BLK_DEV_DM)       += dm-mod.o
 obj-$(CONFIG_BLK_DEV_DM_BUILTIN) += dm-builtin.o
 obj-$(CONFIG_DM_UNSTRIPED)     += dm-unstripe.o
diff --git a/drivers/md/md-autodetect.c b/drivers/md/md-autodetect.c
new file mode 100644 (file)
index 0000000..fe806f7
--- /dev/null
@@ -0,0 +1,315 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/kernel.h>
+#include <linux/blkdev.h>
+#include <linux/init.h>
+#include <linux/syscalls.h>
+#include <linux/mount.h>
+#include <linux/major.h>
+#include <linux/delay.h>
+#include <linux/raid/detect.h>
+#include <linux/raid/md_u.h>
+#include <linux/raid/md_p.h>
+
+/*
+ * When md (and any require personalities) are compiled into the kernel
+ * (not a module), arrays can be assembles are boot time using with AUTODETECT
+ * where specially marked partitions are registered with md_autodetect_dev(),
+ * and with MD_BOOT where devices to be collected are given on the boot line
+ * with md=.....
+ * The code for that is here.
+ */
+
+#ifdef CONFIG_MD_AUTODETECT
+static int __initdata raid_noautodetect;
+#else
+static int __initdata raid_noautodetect=1;
+#endif
+static int __initdata raid_autopart;
+
+static struct {
+       int minor;
+       int partitioned;
+       int level;
+       int chunk;
+       char *device_names;
+} md_setup_args[256] __initdata;
+
+static int md_setup_ents __initdata;
+
+/*
+ * Parse the command-line parameters given our kernel, but do not
+ * actually try to invoke the MD device now; that is handled by
+ * md_setup_drive after the low-level disk drivers have initialised.
+ *
+ * 27/11/1999: Fixed to work correctly with the 2.3 kernel (which
+ *             assigns the task of parsing integer arguments to the
+ *             invoked program now).  Added ability to initialise all
+ *             the MD devices (by specifying multiple "md=" lines)
+ *             instead of just one.  -- KTK
+ * 18May2000: Added support for persistent-superblock arrays:
+ *             md=n,0,factor,fault,device-list   uses RAID0 for device n
+ *             md=n,-1,factor,fault,device-list  uses LINEAR for device n
+ *             md=n,device-list      reads a RAID superblock from the devices
+ *             elements in device-list are read by name_to_kdev_t so can be
+ *             a hex number or something like /dev/hda1 /dev/sdb
+ * 2001-06-03: Dave Cinege <dcinege@psychosis.com>
+ *             Shifted name_to_kdev_t() and related operations to md_set_drive()
+ *             for later execution. Rewrote section to make devfs compatible.
+ */
+static int __init md_setup(char *str)
+{
+       int minor, level, factor, fault, partitioned = 0;
+       char *pername = "";
+       char *str1;
+       int ent;
+
+       if (*str == 'd') {
+               partitioned = 1;
+               str++;
+       }
+       if (get_option(&str, &minor) != 2) {    /* MD Number */
+               printk(KERN_WARNING "md: Too few arguments supplied to md=.\n");
+               return 0;
+       }
+       str1 = str;
+       for (ent=0 ; ent< md_setup_ents ; ent++)
+               if (md_setup_args[ent].minor == minor &&
+                   md_setup_args[ent].partitioned == partitioned) {
+                       printk(KERN_WARNING "md: md=%s%d, Specified more than once. "
+                              "Replacing previous definition.\n", partitioned?"d":"", minor);
+                       break;
+               }
+       if (ent >= ARRAY_SIZE(md_setup_args)) {
+               printk(KERN_WARNING "md: md=%s%d - too many md initialisations\n", partitioned?"d":"", minor);
+               return 0;
+       }
+       if (ent >= md_setup_ents)
+               md_setup_ents++;
+       switch (get_option(&str, &level)) {     /* RAID level */
+       case 2: /* could be 0 or -1.. */
+               if (level == 0 || level == LEVEL_LINEAR) {
+                       if (get_option(&str, &factor) != 2 ||   /* Chunk Size */
+                                       get_option(&str, &fault) != 2) {
+                               printk(KERN_WARNING "md: Too few arguments supplied to md=.\n");
+                               return 0;
+                       }
+                       md_setup_args[ent].level = level;
+                       md_setup_args[ent].chunk = 1 << (factor+12);
+                       if (level ==  LEVEL_LINEAR)
+                               pername = "linear";
+                       else
+                               pername = "raid0";
+                       break;
+               }
+               /* FALL THROUGH */
+       case 1: /* the first device is numeric */
+               str = str1;
+               /* FALL THROUGH */
+       case 0:
+               md_setup_args[ent].level = LEVEL_NONE;
+               pername="super-block";
+       }
+
+       printk(KERN_INFO "md: Will configure md%d (%s) from %s, below.\n",
+               minor, pername, str);
+       md_setup_args[ent].device_names = str;
+       md_setup_args[ent].partitioned = partitioned;
+       md_setup_args[ent].minor = minor;
+
+       return 1;
+}
+
+static inline int create_dev(char *name, dev_t dev)
+{
+       ksys_unlink(name);
+       return ksys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
+}
+
+static void __init md_setup_drive(void)
+{
+       int minor, i, ent, partitioned;
+       dev_t dev;
+       dev_t devices[MD_SB_DISKS+1];
+
+       for (ent = 0; ent < md_setup_ents ; ent++) {
+               int fd;
+               int err = 0;
+               char *devname;
+               mdu_disk_info_t dinfo;
+               char name[16];
+
+               minor = md_setup_args[ent].minor;
+               partitioned = md_setup_args[ent].partitioned;
+               devname = md_setup_args[ent].device_names;
+
+               sprintf(name, "/dev/md%s%d", partitioned?"_d":"", minor);
+               if (partitioned)
+                       dev = MKDEV(mdp_major, minor << MdpMinorShift);
+               else
+                       dev = MKDEV(MD_MAJOR, minor);
+               create_dev(name, dev);
+               for (i = 0; i < MD_SB_DISKS && devname != NULL; i++) {
+                       struct kstat stat;
+                       char *p;
+                       char comp_name[64];
+
+                       p = strchr(devname, ',');
+                       if (p)
+                               *p++ = 0;
+
+                       dev = name_to_dev_t(devname);
+                       if (strncmp(devname, "/dev/", 5) == 0)
+                               devname += 5;
+                       snprintf(comp_name, 63, "/dev/%s", devname);
+                       if (vfs_stat(comp_name, &stat) == 0 &&
+                           S_ISBLK(stat.mode))
+                               dev = new_decode_dev(stat.rdev);
+                       if (!dev) {
+                               printk(KERN_WARNING "md: Unknown device name: %s\n", devname);
+                               break;
+                       }
+
+                       devices[i] = dev;
+
+                       devname = p;
+               }
+               devices[i] = 0;
+
+               if (!i)
+                       continue;
+
+               printk(KERN_INFO "md: Loading md%s%d: %s\n",
+                       partitioned ? "_d" : "", minor,
+                       md_setup_args[ent].device_names);
+
+               fd = ksys_open(name, 0, 0);
+               if (fd < 0) {
+                       printk(KERN_ERR "md: open failed - cannot start "
+                                       "array %s\n", name);
+                       continue;
+               }
+               if (ksys_ioctl(fd, SET_ARRAY_INFO, 0) == -EBUSY) {
+                       printk(KERN_WARNING
+                              "md: Ignoring md=%d, already autodetected. (Use raid=noautodetect)\n",
+                              minor);
+                       ksys_close(fd);
+                       continue;
+               }
+
+               if (md_setup_args[ent].level != LEVEL_NONE) {
+                       /* non-persistent */
+                       mdu_array_info_t ainfo;
+                       ainfo.level = md_setup_args[ent].level;
+                       ainfo.size = 0;
+                       ainfo.nr_disks =0;
+                       ainfo.raid_disks =0;
+                       while (devices[ainfo.raid_disks])
+                               ainfo.raid_disks++;
+                       ainfo.md_minor =minor;
+                       ainfo.not_persistent = 1;
+
+                       ainfo.state = (1 << MD_SB_CLEAN);
+                       ainfo.layout = 0;
+                       ainfo.chunk_size = md_setup_args[ent].chunk;
+                       err = ksys_ioctl(fd, SET_ARRAY_INFO, (long)&ainfo);
+                       for (i = 0; !err && i <= MD_SB_DISKS; i++) {
+                               dev = devices[i];
+                               if (!dev)
+                                       break;
+                               dinfo.number = i;
+                               dinfo.raid_disk = i;
+                               dinfo.state = (1<<MD_DISK_ACTIVE)|(1<<MD_DISK_SYNC);
+                               dinfo.major = MAJOR(dev);
+                               dinfo.minor = MINOR(dev);
+                               err = ksys_ioctl(fd, ADD_NEW_DISK,
+                                                (long)&dinfo);
+                       }
+               } else {
+                       /* persistent */
+                       for (i = 0; i <= MD_SB_DISKS; i++) {
+                               dev = devices[i];
+                               if (!dev)
+                                       break;
+                               dinfo.major = MAJOR(dev);
+                               dinfo.minor = MINOR(dev);
+                               ksys_ioctl(fd, ADD_NEW_DISK, (long)&dinfo);
+                       }
+               }
+               if (!err)
+                       err = ksys_ioctl(fd, RUN_ARRAY, 0);
+               if (err)
+                       printk(KERN_WARNING "md: starting md%d failed\n", minor);
+               else {
+                       /* reread the partition table.
+                        * I (neilb) and not sure why this is needed, but I cannot
+                        * boot a kernel with devfs compiled in from partitioned md
+                        * array without it
+                        */
+                       ksys_close(fd);
+                       fd = ksys_open(name, 0, 0);
+                       ksys_ioctl(fd, BLKRRPART, 0);
+               }
+               ksys_close(fd);
+       }
+}
+
+static int __init raid_setup(char *str)
+{
+       int len, pos;
+
+       len = strlen(str) + 1;
+       pos = 0;
+
+       while (pos < len) {
+               char *comma = strchr(str+pos, ',');
+               int wlen;
+               if (comma)
+                       wlen = (comma-str)-pos;
+               else    wlen = (len-1)-pos;
+
+               if (!strncmp(str, "noautodetect", wlen))
+                       raid_noautodetect = 1;
+               if (!strncmp(str, "autodetect", wlen))
+                       raid_noautodetect = 0;
+               if (strncmp(str, "partitionable", wlen)==0)
+                       raid_autopart = 1;
+               if (strncmp(str, "part", wlen)==0)
+                       raid_autopart = 1;
+               pos += wlen+1;
+       }
+       return 1;
+}
+
+__setup("raid=", raid_setup);
+__setup("md=", md_setup);
+
+static void __init autodetect_raid(void)
+{
+       int fd;
+
+       /*
+        * Since we don't want to detect and use half a raid array, we need to
+        * wait for the known devices to complete their probing
+        */
+       printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n");
+       printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
+
+       wait_for_device_probe();
+
+       fd = ksys_open("/dev/md0", 0, 0);
+       if (fd >= 0) {
+               ksys_ioctl(fd, RAID_AUTORUN, raid_autopart);
+               ksys_close(fd);
+       }
+}
+
+void __init md_run_setup(void)
+{
+       create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
+
+       if (raid_noautodetect)
+               printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=autodetect will force)\n");
+       else
+               autodetect_raid();
+       md_setup_drive();
+}
index 37dd3f40cd316eb2287ce27dc7659a4875ef31ad..1f029a71c3ef05f7f453e2bd7f4b470ee0b840c9 100644 (file)
@@ -1,3 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
 void md_autodetect_dev(dev_t dev);
+
+#ifdef CONFIG_BLK_DEV_MD
+void md_run_setup(void);
+#else
+static inline void md_run_setup(void)
+{
+}
+#endif
index 57499b1ff4714dd6ad4b3b636998b0cba444b66b..6bc37f64b3617cd6a21c46f14f528441d45328c5 100644 (file)
@@ -18,7 +18,6 @@ obj-y                          += init_task.o
 mounts-y                       := do_mounts.o
 mounts-$(CONFIG_BLK_DEV_RAM)   += do_mounts_rd.o
 mounts-$(CONFIG_BLK_DEV_INITRD)        += do_mounts_initrd.o
-mounts-$(CONFIG_BLK_DEV_MD)    += do_mounts_md.o
 
 # dependencies on generated files need to be listed explicitly
 $(obj)/version.o: include/generated/compile.h
index 29d326b6c29d2d05b05adf647e1f38bb1bef07d1..1a4dfa17fb2899005a10dd22fba9b2626d9781dd 100644 (file)
@@ -23,6 +23,7 @@
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
 #include <linux/nfs_mount.h>
+#include <linux/raid/detect.h>
 #include <uapi/linux/mount.h>
 
 #include "do_mounts.h"
index 7513d1c14d13fe2f5c9072a8929b41d70f0c1f5c..50d6c8941e15a1e68ca19b033d4b20dc9aa704d5 100644 (file)
@@ -41,13 +41,3 @@ bool __init initrd_load(void);
 static inline bool initrd_load(void) { return false; }
 
 #endif
-
-#ifdef CONFIG_BLK_DEV_MD
-
-void md_run_setup(void);
-
-#else
-
-static inline void md_run_setup(void) {}
-
-#endif
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
deleted file mode 100644 (file)
index 359363e..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <linux/delay.h>
-#include <linux/raid/md_u.h>
-#include <linux/raid/md_p.h>
-
-#include "do_mounts.h"
-
-/*
- * When md (and any require personalities) are compiled into the kernel
- * (not a module), arrays can be assembles are boot time using with AUTODETECT
- * where specially marked partitions are registered with md_autodetect_dev(),
- * and with MD_BOOT where devices to be collected are given on the boot line
- * with md=.....
- * The code for that is here.
- */
-
-#ifdef CONFIG_MD_AUTODETECT
-static int __initdata raid_noautodetect;
-#else
-static int __initdata raid_noautodetect=1;
-#endif
-static int __initdata raid_autopart;
-
-static struct {
-       int minor;
-       int partitioned;
-       int level;
-       int chunk;
-       char *device_names;
-} md_setup_args[256] __initdata;
-
-static int md_setup_ents __initdata;
-
-/*
- * Parse the command-line parameters given our kernel, but do not
- * actually try to invoke the MD device now; that is handled by
- * md_setup_drive after the low-level disk drivers have initialised.
- *
- * 27/11/1999: Fixed to work correctly with the 2.3 kernel (which
- *             assigns the task of parsing integer arguments to the
- *             invoked program now).  Added ability to initialise all
- *             the MD devices (by specifying multiple "md=" lines)
- *             instead of just one.  -- KTK
- * 18May2000: Added support for persistent-superblock arrays:
- *             md=n,0,factor,fault,device-list   uses RAID0 for device n
- *             md=n,-1,factor,fault,device-list  uses LINEAR for device n
- *             md=n,device-list      reads a RAID superblock from the devices
- *             elements in device-list are read by name_to_kdev_t so can be
- *             a hex number or something like /dev/hda1 /dev/sdb
- * 2001-06-03: Dave Cinege <dcinege@psychosis.com>
- *             Shifted name_to_kdev_t() and related operations to md_set_drive()
- *             for later execution. Rewrote section to make devfs compatible.
- */
-static int __init md_setup(char *str)
-{
-       int minor, level, factor, fault, partitioned = 0;
-       char *pername = "";
-       char *str1;
-       int ent;
-
-       if (*str == 'd') {
-               partitioned = 1;
-               str++;
-       }
-       if (get_option(&str, &minor) != 2) {    /* MD Number */
-               printk(KERN_WARNING "md: Too few arguments supplied to md=.\n");
-               return 0;
-       }
-       str1 = str;
-       for (ent=0 ; ent< md_setup_ents ; ent++)
-               if (md_setup_args[ent].minor == minor &&
-                   md_setup_args[ent].partitioned == partitioned) {
-                       printk(KERN_WARNING "md: md=%s%d, Specified more than once. "
-                              "Replacing previous definition.\n", partitioned?"d":"", minor);
-                       break;
-               }
-       if (ent >= ARRAY_SIZE(md_setup_args)) {
-               printk(KERN_WARNING "md: md=%s%d - too many md initialisations\n", partitioned?"d":"", minor);
-               return 0;
-       }
-       if (ent >= md_setup_ents)
-               md_setup_ents++;
-       switch (get_option(&str, &level)) {     /* RAID level */
-       case 2: /* could be 0 or -1.. */
-               if (level == 0 || level == LEVEL_LINEAR) {
-                       if (get_option(&str, &factor) != 2 ||   /* Chunk Size */
-                                       get_option(&str, &fault) != 2) {
-                               printk(KERN_WARNING "md: Too few arguments supplied to md=.\n");
-                               return 0;
-                       }
-                       md_setup_args[ent].level = level;
-                       md_setup_args[ent].chunk = 1 << (factor+12);
-                       if (level ==  LEVEL_LINEAR)
-                               pername = "linear";
-                       else
-                               pername = "raid0";
-                       break;
-               }
-               /* FALL THROUGH */
-       case 1: /* the first device is numeric */
-               str = str1;
-               /* FALL THROUGH */
-       case 0:
-               md_setup_args[ent].level = LEVEL_NONE;
-               pername="super-block";
-       }
-
-       printk(KERN_INFO "md: Will configure md%d (%s) from %s, below.\n",
-               minor, pername, str);
-       md_setup_args[ent].device_names = str;
-       md_setup_args[ent].partitioned = partitioned;
-       md_setup_args[ent].minor = minor;
-
-       return 1;
-}
-
-static void __init md_setup_drive(void)
-{
-       int minor, i, ent, partitioned;
-       dev_t dev;
-       dev_t devices[MD_SB_DISKS+1];
-
-       for (ent = 0; ent < md_setup_ents ; ent++) {
-               int fd;
-               int err = 0;
-               char *devname;
-               mdu_disk_info_t dinfo;
-               char name[16];
-
-               minor = md_setup_args[ent].minor;
-               partitioned = md_setup_args[ent].partitioned;
-               devname = md_setup_args[ent].device_names;
-
-               sprintf(name, "/dev/md%s%d", partitioned?"_d":"", minor);
-               if (partitioned)
-                       dev = MKDEV(mdp_major, minor << MdpMinorShift);
-               else
-                       dev = MKDEV(MD_MAJOR, minor);
-               create_dev(name, dev);
-               for (i = 0; i < MD_SB_DISKS && devname != NULL; i++) {
-                       struct kstat stat;
-                       char *p;
-                       char comp_name[64];
-
-                       p = strchr(devname, ',');
-                       if (p)
-                               *p++ = 0;
-
-                       dev = name_to_dev_t(devname);
-                       if (strncmp(devname, "/dev/", 5) == 0)
-                               devname += 5;
-                       snprintf(comp_name, 63, "/dev/%s", devname);
-                       if (vfs_stat(comp_name, &stat) == 0 &&
-                           S_ISBLK(stat.mode))
-                               dev = new_decode_dev(stat.rdev);
-                       if (!dev) {
-                               printk(KERN_WARNING "md: Unknown device name: %s\n", devname);
-                               break;
-                       }
-
-                       devices[i] = dev;
-
-                       devname = p;
-               }
-               devices[i] = 0;
-
-               if (!i)
-                       continue;
-
-               printk(KERN_INFO "md: Loading md%s%d: %s\n",
-                       partitioned ? "_d" : "", minor,
-                       md_setup_args[ent].device_names);
-
-               fd = ksys_open(name, 0, 0);
-               if (fd < 0) {
-                       printk(KERN_ERR "md: open failed - cannot start "
-                                       "array %s\n", name);
-                       continue;
-               }
-               if (ksys_ioctl(fd, SET_ARRAY_INFO, 0) == -EBUSY) {
-                       printk(KERN_WARNING
-                              "md: Ignoring md=%d, already autodetected. (Use raid=noautodetect)\n",
-                              minor);
-                       ksys_close(fd);
-                       continue;
-               }
-
-               if (md_setup_args[ent].level != LEVEL_NONE) {
-                       /* non-persistent */
-                       mdu_array_info_t ainfo;
-                       ainfo.level = md_setup_args[ent].level;
-                       ainfo.size = 0;
-                       ainfo.nr_disks =0;
-                       ainfo.raid_disks =0;
-                       while (devices[ainfo.raid_disks])
-                               ainfo.raid_disks++;
-                       ainfo.md_minor =minor;
-                       ainfo.not_persistent = 1;
-
-                       ainfo.state = (1 << MD_SB_CLEAN);
-                       ainfo.layout = 0;
-                       ainfo.chunk_size = md_setup_args[ent].chunk;
-                       err = ksys_ioctl(fd, SET_ARRAY_INFO, (long)&ainfo);
-                       for (i = 0; !err && i <= MD_SB_DISKS; i++) {
-                               dev = devices[i];
-                               if (!dev)
-                                       break;
-                               dinfo.number = i;
-                               dinfo.raid_disk = i;
-                               dinfo.state = (1<<MD_DISK_ACTIVE)|(1<<MD_DISK_SYNC);
-                               dinfo.major = MAJOR(dev);
-                               dinfo.minor = MINOR(dev);
-                               err = ksys_ioctl(fd, ADD_NEW_DISK,
-                                                (long)&dinfo);
-                       }
-               } else {
-                       /* persistent */
-                       for (i = 0; i <= MD_SB_DISKS; i++) {
-                               dev = devices[i];
-                               if (!dev)
-                                       break;
-                               dinfo.major = MAJOR(dev);
-                               dinfo.minor = MINOR(dev);
-                               ksys_ioctl(fd, ADD_NEW_DISK, (long)&dinfo);
-                       }
-               }
-               if (!err)
-                       err = ksys_ioctl(fd, RUN_ARRAY, 0);
-               if (err)
-                       printk(KERN_WARNING "md: starting md%d failed\n", minor);
-               else {
-                       /* reread the partition table.
-                        * I (neilb) and not sure why this is needed, but I cannot
-                        * boot a kernel with devfs compiled in from partitioned md
-                        * array without it
-                        */
-                       ksys_close(fd);
-                       fd = ksys_open(name, 0, 0);
-                       ksys_ioctl(fd, BLKRRPART, 0);
-               }
-               ksys_close(fd);
-       }
-}
-
-static int __init raid_setup(char *str)
-{
-       int len, pos;
-
-       len = strlen(str) + 1;
-       pos = 0;
-
-       while (pos < len) {
-               char *comma = strchr(str+pos, ',');
-               int wlen;
-               if (comma)
-                       wlen = (comma-str)-pos;
-               else    wlen = (len-1)-pos;
-
-               if (!strncmp(str, "noautodetect", wlen))
-                       raid_noautodetect = 1;
-               if (!strncmp(str, "autodetect", wlen))
-                       raid_noautodetect = 0;
-               if (strncmp(str, "partitionable", wlen)==0)
-                       raid_autopart = 1;
-               if (strncmp(str, "part", wlen)==0)
-                       raid_autopart = 1;
-               pos += wlen+1;
-       }
-       return 1;
-}
-
-__setup("raid=", raid_setup);
-__setup("md=", md_setup);
-
-static void __init autodetect_raid(void)
-{
-       int fd;
-
-       /*
-        * Since we don't want to detect and use half a raid array, we need to
-        * wait for the known devices to complete their probing
-        */
-       printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n");
-       printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
-
-       wait_for_device_probe();
-
-       fd = ksys_open("/dev/md0", 0, 0);
-       if (fd >= 0) {
-               ksys_ioctl(fd, RAID_AUTORUN, raid_autopart);
-               ksys_close(fd);
-       }
-}
-
-void __init md_run_setup(void)
-{
-       create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
-
-       if (raid_noautodetect)
-               printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=autodetect will force)\n");
-       else
-               autodetect_raid();
-       md_setup_drive();
-}