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

• Lines: 43
• Date: Sun Aug 13 20:19:12 1995
• Orig file: v1.3.18/linux/drivers/block/ll_rw_blk.c
• Orig date: Fri Jul 7 08:54:45 1995

diff -u --recursive --new-file v1.3.18/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -243,7 +243,7 @@
 					if (disk_index < 4)
 						kstat.dk_drive[disk_index]++;
 					break;
-		case HD_MAJOR:
+		case IDE0_MAJOR:	/* same as HD_MAJOR */
 		case XT_DISK_MAJOR:	disk_index = (MINOR(req->dev) & 0x0040) >> 6;
 					kstat.dk_drive[disk_index]++;
 					break;
@@ -305,6 +305,7 @@
 		if (blk_size[major][MINOR(bh->b_dev)] < (sector + count)>>1) {
 			bh->b_dirt = bh->b_uptodate = 0;
 			bh->b_req = 0;
+			printk("attempt to access beyond end of device\n");
 			return;
 		}
 	/* Uhhuh.. Nasty dead-lock possible here.. */
@@ -334,7 +335,9 @@
 	     || major == IDE1_MAJOR
 	     || major == FLOPPY_MAJOR
 	     || major == SCSI_DISK_MAJOR
-	     || major == SCSI_CDROM_MAJOR)
+	     || major == SCSI_CDROM_MAJOR
+	     || major == IDE2_MAJOR
+	     || major == IDE3_MAJOR)
 	    && (req = blk_dev[major].current_request))
 	{
 #ifdef CONFIG_BLK_DEV_HD
@@ -583,11 +586,11 @@
 		req->next = NULL;
 	}
 	memset(ro_bits,0,sizeof(ro_bits));
+#ifdef CONFIG_BLK_DEV_IDE
+	mem_start = ide_init(mem_start,mem_end); /* this MUST preceed hd_init */
+#endif
 #ifdef CONFIG_BLK_DEV_HD
 	mem_start = hd_init(mem_start,mem_end);
-#endif
-#ifdef CONFIG_BLK_DEV_IDE
-	mem_start = ide_init(mem_start,mem_end);
 #endif
 #ifdef CONFIG_BLK_DEV_XD
 	mem_start = xd_init(mem_start,mem_end);