patch-1.3.28 linux/drivers/block/ramdisk.c

• Lines: 18
• Date: Mon Sep 18 08:54:07 1995
• Orig file: v1.3.27/linux/drivers/block/ramdisk.c
• Orig date: Thu Sep 7 17:17:17 1995

diff -u --recursive --new-file v1.3.27/linux/drivers/block/ramdisk.c linux/drivers/block/ramdisk.c
@@ -40,7 +40,7 @@
 	addr = rd_start + (CURRENT->sector << 9);
 	len = CURRENT->current_nr_sectors << 9;
 
-	if ((MINOR(CURRENT->dev) != RAMDISK_MINOR) ||
+	if ((MINOR(CURRENT->rq_dev) != RAMDISK_MINOR) ||
 	    (addr+len > rd_start+rd_length)) {
 		end_request(0);
 		goto repeat;
@@ -190,7 +190,7 @@
 		printk("\ndone\n");
 
 		/* We loaded the file system image.  Prepare for mounting it. */
-		ROOT_DEV = ((MEM_MAJOR << 8) | RAMDISK_MINOR);
+		ROOT_DEV = MKDEV(MEM_MAJOR, RAMDISK_MINOR);
 		return;
 	}
 }