patch-2.4.0-test2 linux/drivers/block/rd.c

• Lines: 32
• Date: Wed Jun 21 22:31:00 2000
• Orig file: v2.4.0-test1/linux/drivers/block/rd.c
• Orig date: Mon Jun 19 16:31:58 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/block/rd.c linux/drivers/block/rd.c
@@ -411,7 +411,7 @@
 	devfs_handle = devfs_mk_dir (NULL, "rd", 0, NULL);
 	devfs_register_series (devfs_handle, "%u", NUM_RAMDISKS,
 			       DEVFS_FL_DEFAULT, MAJOR_NR, 0,
-			       S_IFBLK | S_IRUSR | S_IWUSR, 0, 0,
+			       S_IFBLK | S_IRUSR | S_IWUSR,
 			       &fd_fops, NULL);
 
 	for (i = 0; i < NUM_RAMDISKS; i++)
@@ -693,6 +693,9 @@
 	iput(inode);
 }
 
+#ifdef CONFIG_MAC_FLOPPY
+int swim3_fd_eject(int devnum);
+#endif
 
 static void __init rd_load_disk(int n)
 {
@@ -713,6 +716,12 @@
 	if (rd_prompt) {
 #ifdef CONFIG_BLK_DEV_FD
 		floppy_eject();
+#endif
+#ifdef CONFIG_MAC_FLOPPY
+		if(MAJOR(ROOT_DEV) == FLOPPY_MAJOR)
+			swim3_fd_eject(MINOR(ROOT_DEV));
+		else if(MAJOR(real_root_dev) == FLOPPY_MAJOR)
+			swim3_fd_eject(MINOR(real_root_dev));
 #endif
 		printk(KERN_NOTICE
 		       "VFS: Insert root floppy disk to be loaded into RAM disk and press ENTER\n");