Commit cb19833d authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe

[BLOCK] kill generic max_back_kb handling

This patch kills max_back_kb handling from elv_dispatch_sort() and
kills max_back_kb field from struct request_queue.
Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent 4c9f7836
...@@ -136,7 +136,6 @@ static int elevator_attach(request_queue_t *q, struct elevator_type *e, ...@@ -136,7 +136,6 @@ static int elevator_attach(request_queue_t *q, struct elevator_type *e,
q->elevator = eq; q->elevator = eq;
q->end_sector = 0; q->end_sector = 0;
q->boundary_rq = NULL; q->boundary_rq = NULL;
q->max_back_kb = 0;
if (eq->ops->elevator_init_fn) if (eq->ops->elevator_init_fn)
ret = eq->ops->elevator_init_fn(q, eq); ret = eq->ops->elevator_init_fn(q, eq);
...@@ -227,15 +226,12 @@ void elevator_exit(elevator_t *e) ...@@ -227,15 +226,12 @@ void elevator_exit(elevator_t *e)
void elv_dispatch_sort(request_queue_t *q, struct request *rq) void elv_dispatch_sort(request_queue_t *q, struct request *rq)
{ {
sector_t boundary; sector_t boundary;
unsigned max_back;
struct list_head *entry; struct list_head *entry;
if (q->last_merge == rq) if (q->last_merge == rq)
q->last_merge = NULL; q->last_merge = NULL;
boundary = q->end_sector; 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) { list_for_each_prev(entry, &q->queue_head) {
struct request *pos = list_entry_rq(entry); struct request *pos = list_entry_rq(entry);
......
...@@ -339,7 +339,6 @@ struct request_queue ...@@ -339,7 +339,6 @@ struct request_queue
*/ */
sector_t end_sector; sector_t end_sector;
struct request *boundary_rq; struct request *boundary_rq;
unsigned int max_back_kb;
/* /*
* Auto-unplugging state * Auto-unplugging state
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment