patch-1.3.45 linux/drivers/block/genhd.c

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

diff -u --recursive --new-file v1.3.44/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -109,9 +109,7 @@
 	   * This block is from a device that we're about to stomp on.
 	   * So make sure nobody thinks this block is usable.
 	   */
-		bh->b_dirt = 0;
-		bh->b_uptodate = 0;
-		bh->b_req = 0;
+		bh->b_state = 0;
 
 		if (*(unsigned short *) (bh->b_data+510) != 0xAA55)
 			goto done;
@@ -194,9 +192,10 @@
 		return -1;
 	}
 	data = bh->b_data;
-	bh->b_dirt = 0;		/* In some cases we modify the geometry    */
-	bh->b_uptodate = 0;	/*  of the drive (below), so ensure that   */
-	bh->b_req = 0;		/*  nobody else tries to re-use this data. */
+	/* In some cases we modify the geometry    */
+	/*  of the drive (below), so ensure that   */
+	/*  nobody else tries to re-use this data. */
+	bh->b_state = 0;
 #ifdef CONFIG_BLK_DEV_IDE
 check_table:
 #endif

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