--- /opt/kernel/linux-2.4.0-test2/drivers/block/elevator.c	Tue Jun 27 03:53:40 2000
+++ drivers/block/elevator.c	Tue Jun 27 03:44:58 2000
@@ -161,7 +161,7 @@
 			 int *max_sectors, int *max_segments)
 {
 	struct list_head *entry, *head = &q->queue_head;
-	unsigned int count = bh->b_size >> 9;
+	unsigned int count = bh->b_size >> 9, ret = ELEVATOR_NO_MERGE;
 
 	entry = head;
 	if (q->head_active && !q->plugged)
@@ -179,13 +179,28 @@
 			continue;
 		if ((*req)->rq_dev != bh->b_rdev)
 			continue;
-		if ((*req)->sector + (*req)->nr_sectors == bh->b_rsector)
-			return ELEVATOR_BACK_MERGE;
-		if ((*req)->sector - count == bh->b_rsector)
-			return ELEVATOR_FRONT_MERGE;
-		(*req)->elevator_sequence--;
+		if ((*req)->sector + (*req)->nr_sectors == bh->b_rsector) {
+			ret = ELEVATOR_BACK_MERGE;
+			break;
+		}
+		if ((*req)->sector - count == bh->b_rsector) {
+			ret = ELEVATOR_FRONT_MERGE;
+			break;
+		}
 	}
-	return ELEVATOR_NO_MERGE;
+
+	/*
+	 * second pass scan of requests that got passed over, if any
+	 */
+	if (ret != ELEVATOR_NO_MERGE && *req) {
+		entry = &(*req)->queue;
+		while ((entry = entry->next) != head) {
+			struct request *tmp = blkdev_entry_to_request(entry);
+			tmp->elevator_sequence--;
+		}
+	}
+
+	return ret;
 }
 
 /*