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	Fri May 30 19:33:27 2003
+++ 630-iosched_hashes/drivers/scsi/sd.c	Fri May 30 19:33:28 2003
@@ -127,9 +127,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 */
diff -urpN -X /home/fletch/.diff.exclude 620-devfs_fixup/include/linux/blkdev.h 630-iosched_hashes/include/linux/blkdev.h
--- 620-devfs_fixup/include/linux/blkdev.h	Fri May 30 19:02:22 2003
+++ 630-iosched_hashes/include/linux/blkdev.h	Fri May 30 21:58:19 2003
@@ -21,7 +21,7 @@ struct elevator_s;
 typedef struct elevator_s elevator_t;
 
 #define BLKDEV_MIN_RQ	4
-#define BLKDEV_MAX_RQ	128
+#define BLKDEV_MAX_RQ	32
 
 struct request_list {
 	int count[2];