patch-2.1.18 linux/drivers/block/ll_rw_blk.c

• Lines: 22
• Date: Mon Dec 23 10:13:53 1996
• Orig file: v2.1.17/linux/drivers/block/ll_rw_blk.c
• Orig date: Sun Dec 22 16:37:30 1996

diff -u --recursive --new-file v2.1.17/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -375,7 +375,8 @@
 	req = *get_queue(bh->b_rdev);
 	if (!req) {
 		/* MD and loop can't handle plugging without deadlocking */
-		if (major != MD_MAJOR && major != LOOP_MAJOR)
+		if (major != MD_MAJOR && major != LOOP_MAJOR && 
+		    major != DDV_MAJOR)
 			plug_device(blk_dev + major);
 	} else switch (major) {
 	     case IDE0_MAJOR:	/* same as HD_MAJOR */
@@ -725,5 +726,11 @@
 #ifdef CONFIG_BLK_DEV_MD
 	md_init();
 #endif CONFIG_BLK_DEV_MD
+#ifdef CONFIG_APBLOCK
+	ap_init();
+#endif
+#ifdef CONFIG_DDV
+	ddv_init();
+#endif
 	return 0;
 }