From: Tejun Heo cfq_data->idle_start, cfq_data->end_prio and cfq_rq->end_pos are not used in meaningful way. Remove'em. Signed-off-by: Tejun Heo Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/block/cfq-iosched.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff -puN drivers/block/cfq-iosched.c~cfq-remove-serveral-unused-fields-from-cfq-data-structures drivers/block/cfq-iosched.c --- 25/drivers/block/cfq-iosched.c~cfq-remove-serveral-unused-fields-from-cfq-data-structures 2005-05-25 00:18:13.000000000 -0700 +++ 25-akpm/drivers/block/cfq-iosched.c 2005-05-25 00:18:13.000000000 -0700 @@ -143,11 +143,10 @@ struct cfq_data { */ struct timer_list idle_slice_timer; struct work_struct unplug_work; - unsigned long idle_start; struct cfq_queue *active_queue; struct cfq_io_context *active_cic; - int cur_prio, cur_end_prio, end_prio; + int cur_prio, cur_end_prio; unsigned int dispatch_slice; struct timer_list idle_class_timer; @@ -234,8 +233,6 @@ struct cfq_rq { struct cfq_queue *cfq_queue; struct cfq_io_context *io_context; - sector_t end_pos; - unsigned in_flight : 1; unsigned accounted : 1; unsigned is_sync : 1; @@ -770,12 +767,9 @@ static int cfq_get_next_prio_level(struc cfqd->cur_end_prio = cfqd->cur_prio; cfqd->cur_prio = 0; } - if (cfqd->cur_end_prio > cfqd->end_prio) - cfqd->end_prio = cfqd->cur_end_prio; - if (cfqd->end_prio == CFQ_PRIO_LISTS) { + if (cfqd->cur_end_prio == CFQ_PRIO_LISTS) { cfqd->cur_prio = 0; cfqd->cur_end_prio = 0; - cfqd->end_prio = 0; } return prio; @@ -876,7 +870,6 @@ static int cfq_arm_slice_timer(struct cf if (!timer_pending(&cfqd->idle_slice_timer)) { unsigned long slice_left = cfqq->slice_end - 1; - cfqd->idle_start = jiffies; cfqd->idle_slice_timer.expires = min(jiffies + cfqd->cfq_slice_idle, slice_left); add_timer(&cfqd->idle_slice_timer); } @@ -926,7 +919,6 @@ static void cfq_dispatch_sort(request_qu cfq_del_crq_rb(crq); cfq_remove_merge_hints(q, crq); - crq->end_pos = crq->request->sector + crq->request->nr_sectors; crq->in_flight = 1; crq->requeued = 0; cfqq->in_flight++; _