patch-2.4.0-test2 linux/fs/partitions/check.c

Next file: linux/fs/partitions/msdos.c
Previous file: linux/fs/partitions/acorn.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/fs/partitions/check.c linux/fs/partitions/check.c
@@ -33,7 +33,7 @@
 #include "ibm.h"
 
 extern void device_init(void);
-extern void md_setup_drive(void);
+extern void md_run_setup(void);
 extern int *blk_size[];
 extern void rd_load(void);
 extern void initrd_load(void);
@@ -311,9 +311,9 @@
 		devfs_flags |= DEVFS_FL_REMOVABLE;
 	sprintf (devname, "part%d", part);
 	dev->part[minor + part].de =
-	    devfs_register (dir, devname, 0, devfs_flags,
+	    devfs_register (dir, devname, devfs_flags,
 			    dev->major, minor + part,
-			    S_IFBLK | S_IRUSR | S_IWUSR, 0, 0,
+			    S_IFBLK | S_IRUSR | S_IWUSR,
 			    dev->fops, NULL);
 }
 
@@ -349,8 +349,8 @@
 	devfs_mk_symlink (devfs_handle, symlink, 0, DEVFS_FL_DEFAULT,
 			  dirname + pos, 0, &slave, NULL);
 	dev->part[minor].de =
-	    devfs_register (dir, "disc", 4, devfs_flags, dev->major, minor,
-			    S_IFBLK | S_IRUSR | S_IWUSR, 0, 0, dev->fops,NULL);
+	    devfs_register (dir, "disc", devfs_flags, dev->major, minor,
+			    S_IFBLK | S_IRUSR | S_IWUSR, dev->fops, NULL);
 	devfs_auto_unregister (dev->part[minor].de, slave);
 	if (!dev->de_arr)
 		devfs_auto_unregister (slave, dir);
@@ -437,7 +437,7 @@
 	rd_load();
 #endif
 #ifdef CONFIG_BLK_DEV_MD
-	autodetect_raid();
+	md_run_setup();
 #endif
 	return 0;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)