From 97984f030181dd230aefa5c23d46db39c8573d93 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 24 Oct 2005 08:35:58 +0200 Subject: [PATCH] --- yaml --- r: 10191 b: refs/heads/master c: cb19833dccb32f97cacbfff834b53523915f13f6 h: refs/heads/master i: 10189: 5a130c1485d5e209480faabb6294a6b37331cc70 10187: 0c47ec5455a64021f162634a33b67c353690f355 10183: ab9d80d614e367be458f864a6763593fb6c8ddaa 10175: 04ddc33fdec456b6d9b6f772f9257a84346f5374 v: v3 --- [refs] | 2 +- trunk/drivers/block/elevator.c | 6 +----- trunk/include/linux/blkdev.h | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fc7d8da3ea23..b39abb59e4b4 100644 --- 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 index 415144372c75..af2388e73f61 100644 --- 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 index bd55b1df8997..159dbcd2eb59 100644 --- 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