aboutsummaryrefslogtreecommitdiffstats
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-03-10 02:52:07 -0500
committerJens Axboe <jaxboe@fusionio.com>2011-03-10 02:52:07 -0500
commit7eaceaccab5f40bbfda044629a6298616aeaed50 (patch)
tree33954d12f63e25a47eb6d86ef3d3d0a5e62bf752 /block/cfq-iosched.c
parent73c101011926c5832e6e141682180c4debe2cf45 (diff)
block: remove per-queue plugging
Code has been converted over to the new explicit on-stack plugging, and delay users have been converted to use the new API for that. So lets kill off the old plugging along with aops->sync_page(). Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r--block/cfq-iosched.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 3202c7e87fb3..ef631539dd2a 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -499,13 +499,6 @@ static inline void cfq_schedule_dispatch(struct cfq_data *cfqd)
499 } 499 }
500} 500}
501 501
502static int cfq_queue_empty(struct request_queue *q)
503{
504 struct cfq_data *cfqd = q->elevator->elevator_data;
505
506 return !cfqd->rq_queued;
507}
508
509/* 502/*
510 * Scale schedule slice based on io priority. Use the sync time slice only 503 * Scale schedule slice based on io priority. Use the sync time slice only
511 * if a queue is marked sync and has sync io queued. A sync queue with async 504 * if a queue is marked sync and has sync io queued. A sync queue with async
@@ -4061,7 +4054,6 @@ static struct elevator_type iosched_cfq = {
4061 .elevator_add_req_fn = cfq_insert_request, 4054 .elevator_add_req_fn = cfq_insert_request,
4062 .elevator_activate_req_fn = cfq_activate_request, 4055 .elevator_activate_req_fn = cfq_activate_request,
4063 .elevator_deactivate_req_fn = cfq_deactivate_request, 4056 .elevator_deactivate_req_fn = cfq_deactivate_request,
4064 .elevator_queue_empty_fn = cfq_queue_empty,
4065 .elevator_completed_req_fn = cfq_completed_request, 4057 .elevator_completed_req_fn = cfq_completed_request,
4066 .elevator_former_req_fn = elv_rb_former_request, 4058 .elevator_former_req_fn = elv_rb_former_request,
4067 .elevator_latter_req_fn = elv_rb_latter_request, 4059 .elevator_latter_req_fn = elv_rb_latter_request,