git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[safe/jmp/linux-2.6]
/
init
/
do_mounts_md.c
diff --git
a/init/do_mounts_md.c
b/init/do_mounts_md.c
index
48b3fad
..
69aebbf
100644
(file)
--- a/
init/do_mounts_md.c
+++ b/
init/do_mounts_md.c
@@
-1,5
+1,6
@@
-
-#include <linux/raid/md.h>
+#include <linux/delay.h>
+#include <linux/raid/md_u.h>
+#include <linux/raid/md_p.h>
#include "do_mounts.h"
#include "do_mounts.h"
@@
-112,8
+113,6
@@
static int __init md_setup(char *str)
return 1;
}
return 1;
}
-#define MdpMinorShift 6
-
static void __init md_setup_drive(void)
{
int minor, i, ent, partitioned;
static void __init md_setup_drive(void)
{
int minor, i, ent, partitioned;
@@
-271,7
+270,7
@@
static int __init raid_setup(char *str)
__setup("raid=", raid_setup);
__setup("md=", md_setup);
__setup("raid=", raid_setup);
__setup("md=", md_setup);
-static void autodetect_raid(void)
+static void
__init
autodetect_raid(void)
{
int fd;
{
int fd;
@@
-281,8
+280,9
@@
static void autodetect_raid(void)
*/
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");
*/
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");
- while (driver_probe_done() < 0)
- msleep(100);
+
+ wait_for_device_probe();
+
fd = sys_open("/dev/md0", 0, 0);
if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
fd = sys_open("/dev/md0", 0, 0);
if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);