forked from Minki/linux
warning: fix init do_mounts_md c
fix warning: init/do_mounts_md.c: In function ‘md_run_setup’: init/do_mounts_md.c:282: warning: ISO C90 forbids mixed declarations and code also, use the opportunity to put the RAID autodetection code into a separate function - this also solves a checkpatch style warning. No code changed: md5: aa36a35faef371b05f1974ad583bdbbd do_mounts_md.o.before.asm aa36a35faef371b05f1974ad583bdbbd do_mounts_md.o.after.asm Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
02c15def84
commit
82cbc11a41
|
@ -264,26 +264,32 @@ static int __init raid_setup(char *str)
|
||||||
__setup("raid=", raid_setup);
|
__setup("raid=", raid_setup);
|
||||||
__setup("md=", md_setup);
|
__setup("md=", md_setup);
|
||||||
|
|
||||||
|
static void 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");
|
||||||
|
while (driver_probe_done() < 0)
|
||||||
|
msleep(100);
|
||||||
|
fd = sys_open("/dev/md0", 0, 0);
|
||||||
|
if (fd >= 0) {
|
||||||
|
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
|
||||||
|
sys_close(fd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void __init md_run_setup(void)
|
void __init md_run_setup(void)
|
||||||
{
|
{
|
||||||
create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
|
create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
|
||||||
|
|
||||||
if (raid_noautodetect)
|
if (raid_noautodetect)
|
||||||
printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
|
printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
|
||||||
else {
|
else
|
||||||
/*
|
autodetect_raid();
|
||||||
* 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");
|
|
||||||
while (driver_probe_done() < 0)
|
|
||||||
msleep(100);
|
|
||||||
int fd = sys_open("/dev/md0", 0, 0);
|
|
||||||
if (fd >= 0) {
|
|
||||||
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
|
|
||||||
sys_close(fd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
md_setup_drive();
|
md_setup_drive();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user