diff -urpN -X /home/fletch/.diff.exclude 620-devfs_fixup/drivers/block/deadline-iosched.c 630-iosched_hashes/drivers/block/deadline-iosched.c
--- 620-devfs_fixup/drivers/block/deadline-iosched.c	Mon Mar 17 21:43:42 2003
+++ 630-iosched_hashes/drivers/block/deadline-iosched.c	Sun Apr 20 22:30:57 2003
@@ -28,7 +28,7 @@ static int writes_starved = 2;    /* max
 static int fifo_batch = 16;       /* # of sequential requests treated as one
 				     by the above parameters. For throughput. */
 
-static const int deadline_hash_shift = 10;
+static const int deadline_hash_shift = 6;
 #define DL_HASH_BLOCK(sec)	((sec) >> 3)
 #define DL_HASH_FN(sec)		(hash_long(DL_HASH_BLOCK((sec)), deadline_hash_shift))
 #define DL_HASH_ENTRIES		(1 << deadline_hash_shift)
diff -urpN -X /home/fletch/.diff.exclude 620-devfs_fixup/drivers/block/ll_rw_blk.c 630-iosched_hashes/drivers/block/ll_rw_blk.c
--- 620-devfs_fixup/drivers/block/ll_rw_blk.c	Sun Apr 20 22:23:18 2003
+++ 630-iosched_hashes/drivers/block/ll_rw_blk.c	Sun Apr 20 22:30:57 2003
@@ -2198,8 +2198,8 @@ int __init blk_dev_init(void)
 	queue_nr_requests = (total_ram >> 9) & ~7;
 	if (queue_nr_requests < 16)
 		queue_nr_requests = 16;
-	if (queue_nr_requests > 128)
-		queue_nr_requests = 128;
+	if (queue_nr_requests > 32)
+		queue_nr_requests = 32;
 
 	batch_requests = queue_nr_requests / 8;
 	if (batch_requests > 8)
diff -urpN -X /home/fletch/.diff.exclude 620-devfs_fixup/drivers/scsi/sd.c 630-iosched_hashes/drivers/scsi/sd.c
--- 620-devfs_fixup/drivers/scsi/sd.c	Sun Apr 20 22:32:28 2003
+++ 630-iosched_hashes/drivers/scsi/sd.c	Sun Apr 20 19:35:03 2003
@@ -124,9 +124,6 @@ static int sd_major(int major_idx)
 		return SCSI_DISK1_MAJOR + major_idx - 1;
 	case 8 ... 15:
 		return SCSI_DISK8_MAJOR + major_idx - 8;
-#define MAX_IDX       (TOTAL_SD_DISKS >> 4)
-	case 16 ... MAX_IDX:
-		return SCSI_DISK15_MAJOR;
 	default:
 		BUG();
 		return 0;	/* shut up gcc */