patch-2.3.99-pre1 linux/include/linux/blk.h

• Lines: 28
• Date: Tue Mar 14 18:38:08 2000
• Orig file: v2.3.51/linux/include/linux/blk.h
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.51/linux/include/linux/blk.h linux/include/linux/blk.h
@@ -18,17 +18,7 @@
  * NOTE that writes may use only the low 2/3 of these: reads
  * take precedence.
  */
-#define NR_REQUEST	128
-
-/*
- * This is used in the elevator algorithm.  We don't prioritise reads
- * over writes any more --- although reads are more time-critical than
- * writes, by treating them equally we increase filesystem throughput.
- * This turns out to give better overall performance.  -- sct
- */
-#define IN_ORDER(s1,s2) \
-((s1)->rq_dev < (s2)->rq_dev || (((s1)->rq_dev == (s2)->rq_dev && \
-(s1)->sector < (s2)->sector)))
+#define NR_REQUEST	256
 
 /*
  * Initialization functions.
@@ -102,7 +92,7 @@
 	{
 		if (req->cmd == READ)
 			req->q->elevator.read_pendings--;
-		req->q->nr_segments -= req->nr_segments;
+		req->q->elevator.nr_segments -= req->nr_segments;
 		req->q = NULL;
 	}
 	list_del(&req->queue);