---

yaml --- r: 10191 b: refs/heads/master c: cb19833 h: refs/heads/master i: 10189: 5a130c1 10187: 0c47ec5 10183: ab9d80d 10175: 04ddc33 v: v3
git-mirror · Oct 28, 2005 · 97984f0 · 97984f0
1 parent f992415
commit 97984f0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c9f7836406f41ef9da6ee68d7a0448fdb97b5ef
+refs/heads/master: cb19833dccb32f97cacbfff834b53523915f13f6
diff --git a/trunk/drivers/block/elevator.c b/trunk/drivers/block/elevator.c
@@ -136,7 +136,6 @@ static int elevator_attach(request_queue_t *q, struct elevator_type *e,
 	q->elevator = eq;
 	q->end_sector = 0;
 	q->boundary_rq = NULL;
-	q->max_back_kb = 0;
 
 	if (eq->ops->elevator_init_fn)
 		ret = eq->ops->elevator_init_fn(q, eq);
@@ -227,16 +226,13 @@ void elevator_exit(elevator_t *e)
 void elv_dispatch_sort(request_queue_t *q, struct request *rq)
 {
 	sector_t boundary;
-	unsigned max_back;
 	struct list_head *entry;
 
 	if (q->last_merge == rq)
 		q->last_merge = NULL;
 
 	boundary = q->end_sector;
-	max_back = q->max_back_kb * 2;
-	boundary = boundary > max_back ? boundary - max_back : 0;
-
+
 	list_for_each_prev(entry, &q->queue_head) {
 		struct request *pos = list_entry_rq(entry);
 

diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
@@ -339,7 +339,6 @@ struct request_queue
 	 */
 	sector_t		end_sector;
 	struct request		*boundary_rq;
-	unsigned int		max_back_kb;
 
 	/*
 	 * Auto-unplugging state