Commit 8350163a authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Jens Axboe
Browse files

cfq: Write-only stuff in CFQ data structures 



There are some leftover bits from the task cooperator patch, that was
yanked out again. While it will get reintroduced, no point in having
this write-only stuff in the tree. So yank it.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent c2dea2d1

block/cfq-iosched.c

+0 −11
Original line number Diff line number Diff line
@@ -115,9 +115,6 @@ struct cfq_data { 
	unsigned int cfq_slice_idle;



	struct list_head cic_list;



	sector_t new_seek_mean;

	u64 new_seek_total;

};



/*
@@ -157,8 +154,6 @@ struct cfq_queue { 


	/* various state flags, see below */

	unsigned int flags;



	sector_t last_request_pos;

};



enum cfqq_state_flags {
@@ -1621,11 +1616,6 @@ cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_io_context *cic, 
	else

		sdist = cic->last_request_pos - rq->sector;



	if (!cic->seek_samples) {

		cfqd->new_seek_total = (7*cic->seek_total + (u64)256*sdist) / 8;

		cfqd->new_seek_mean = cfqd->new_seek_total / 256;

	}



	/*

	 * Don't allow the seek distance to get too large from the

	 * odd fragment, pagein, etc
@@ -1761,7 +1751,6 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq, 
	cfq_update_idle_window(cfqd, cfqq, cic);



	cic->last_request_pos = rq->sector + rq->nr_sectors;

	cfqq->last_request_pos = cic->last_request_pos;



	if (cfqq == cfqd->active_queue) {

		/*