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

Next file: linux/drivers/block/md.c
Previous file: linux/drivers/block/linear.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.86/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -468,9 +468,8 @@
 		default:
 			panic("ll_rw_page: bad block dev cmd, must be R/W");
 	}
-	if (mem_map[MAP_NR(buffer)].locked)
+	if (set_bit(PG_locked, &mem_map[MAP_NR(buffer)].flags))
 		panic ("ll_rw_page: page already locked");
-	mem_map[MAP_NR(buffer)].locked = 1;
 	brw_page(rw, (unsigned long) buffer, dev, &block, PAGE_SIZE, 0);
 }
 
@@ -636,7 +635,7 @@
 	loop_init();
 #endif
 #ifdef CONFIG_BLK_DEV_IDE
-	ide_init();		/* this MUST preceed hd_init */
+	ide_init();		/* this MUST precede hd_init */
 #endif
 #ifdef CONFIG_BLK_DEV_HD
 	hd_init();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this