Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82cbc11a authored by Ingo Molnar's avatar Ingo Molnar Committed by Arjan van de Ven
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parent 02c15def

init/do_mounts_md.c

+21 −15
Original line number Diff line number Diff line
@@ -264,13 +264,10 @@ static int __init raid_setup(char *str) 
__setup("raid=", raid_setup);

__setup("md=", md_setup);



void __init md_run_setup(void)

static void autodetect_raid(void)

{

	create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));

	int fd;



	if (raid_noautodetect)

		printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");

	else {

	/*

	 * 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
@@ -279,11 +276,20 @@ void __init md_run_setup(void) 
	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);

	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)

{

	create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));



	if (raid_noautodetect)

		printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");

	else

		autodetect_raid();

	md_setup_drive();

}