patch-2.3.36 linux/drivers/scsi/scsi_merge.c

• Lines: 31
• Date: Thu Dec 30 23:24:22 1999
• Orig file: v2.3.35/linux/drivers/scsi/scsi_merge.c
• Orig date: Wed Dec 29 13:13:19 1999

diff -u --recursive --new-file v2.3.35/linux/drivers/scsi/scsi_merge.c linux/drivers/scsi/scsi_merge.c
@@ -290,30 +290,6 @@
 
 	count = bh->b_size >> 9;
 	sector = bh->b_rsector;
-#if CONFIG_HIGHMEM
-	/*
-	 * This is a temporary hack for the time being.
-	 * In some cases, the ll_rw_blk layer is creating
-	 * bounce buffers for us - this implies that we don't
-	 * need to down here, but queue management becomes quite
-	 * difficult otherwise.  When the ll_rw_blk layer gets
-	 * cleaned up to handle bounce buffers better, then
-	 * this hack can be cleaned up.
-	 */
-	if( sector == -1 )
-	{
-		struct buffer_head * bh_new;
-		bh_new = (struct buffer_head *) bh->b_dev_id;
-		if( bh_new != NULL )
-		{
-			sector = bh_new->b_rsector;
-		}
-		if( sector == -1 )
-		{
-			panic("Unable to merge ambiguous block request");
-		}
-	}
-#endif
 
 	/*
 	 * We come in here in one of two cases.   The first is that we