patch-2.4.0-test3 linux/drivers/block/md.c

• Lines: 35
• Date: Fri Jul 7 15:53:58 2000
• Orig file: v2.4.0-test2/linux/drivers/block/md.c
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/block/md.c linux/drivers/block/md.c
@@ -496,7 +496,7 @@
 	mddev->sb = (mdp_super_t *) __get_free_page (GFP_KERNEL);
 	if (!mddev->sb)
 		return -ENOMEM;
-	md_clear_page((unsigned long)mddev->sb);
+	md_clear_page(mddev->sb);
 	return 0;
 }
 
@@ -510,7 +510,7 @@
 		printk (OUT_OF_MEM);
 		return -EINVAL;
 	}
-	md_clear_page((unsigned long)rdev->sb);
+	md_clear_page(rdev->sb);
 
 	return 0;
 }
@@ -804,6 +804,7 @@
 	del_mddev_mapping(mddev, MKDEV(MD_MAJOR, mdidx(mddev)));
 	md_list_del(&mddev->all_mddevs);
 	MD_INIT_LIST_HEAD(&mddev->all_mddevs);
+	blk_cleanup_queue(&mddev->queue);
 	kfree(mddev);
 }
 
@@ -3627,7 +3628,7 @@
 		printk (KERN_ALERT "Unable to get major %d for md\n", MD_MAJOR);
 		return (-1);
 	}
-	devfs_handle = devfs_mk_dir (NULL, "md", 0, NULL);
+	devfs_handle = devfs_mk_dir (NULL, "md", NULL);
 	devfs_register_series (devfs_handle, "%u",MAX_MD_DEVS,DEVFS_FL_DEFAULT,
 				MAJOR_NR, 0, S_IFBLK | S_IRUSR | S_IWUSR,
 				&md_fops, NULL);