Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb37b94c authored by Jens Axboe's avatar Jens Axboe
Browse files

[BLOCK] Cleanup unused variable passing 



- ->init_queue() does not need the elevator passed in
- ->put_request() is a hot path and need not have the queue passed in
- cfq_update_io_seektime() does not need cfqd passed in

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

block/as-iosched.c

+1 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ static void as_exit_queue(elevator_t *e) 
/*

 * initialize elevator private data (as_data).

 */

static void *as_init_queue(request_queue_t *q, elevator_t *e)

static void *as_init_queue(request_queue_t *q)

{

	struct as_data *ad;

block/cfq-iosched.c

+4 −5
Original line number Diff line number Diff line
@@ -1464,8 +1464,7 @@ cfq_update_io_thinktime(struct cfq_data *cfqd, struct cfq_io_context *cic) 
}



static void

cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_io_context *cic,

		       struct request *rq)

cfq_update_io_seektime(struct cfq_io_context *cic, struct request *rq)

{

	sector_t sdist;

	u64 total;
@@ -1617,7 +1616,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq, 
	}



	cfq_update_io_thinktime(cfqd, cic);

	cfq_update_io_seektime(cfqd, cic, rq);

	cfq_update_io_seektime(cic, rq);

	cfq_update_idle_window(cfqd, cfqq, cic);



	cic->last_queue = jiffies;
@@ -1770,7 +1769,7 @@ static int cfq_may_queue(request_queue_t *q, int rw) 
/*

 * queue lock held here

 */

static void cfq_put_request(request_queue_t *q, struct request *rq)

static void cfq_put_request(struct request *rq)

{

	struct cfq_queue *cfqq = RQ_CFQQ(rq);
@@ -1951,7 +1950,7 @@ static void cfq_exit_queue(elevator_t *e) 
	kfree(cfqd);

}



static void *cfq_init_queue(request_queue_t *q, elevator_t *e)

static void *cfq_init_queue(request_queue_t *q)

{

	struct cfq_data *cfqd;

	int i;

block/deadline-iosched.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static void deadline_exit_queue(elevator_t *e) 
/*

 * initialize elevator private data (deadline_data).

 */

static void *deadline_init_queue(request_queue_t *q, elevator_t *e)

static void *deadline_init_queue(request_queue_t *q)

{

	struct deadline_data *dd;

block/elevator.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct elevator_type *elevator_get(const char *name) 


static void *elevator_init_queue(request_queue_t *q, struct elevator_queue *eq)

{

	return eq->ops->elevator_init_fn(q, eq);

	return eq->ops->elevator_init_fn(q);

}



static void elevator_attach(request_queue_t *q, struct elevator_queue *eq,
@@ -810,7 +810,7 @@ void elv_put_request(request_queue_t *q, struct request *rq) 
	elevator_t *e = q->elevator;



	if (e->ops->elevator_put_req_fn)

		e->ops->elevator_put_req_fn(q, rq);

		e->ops->elevator_put_req_fn(rq);

}



int elv_may_queue(request_queue_t *q, int rw)

block/noop-iosched.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ noop_latter_request(request_queue_t *q, struct request *rq) 
	return list_entry(rq->queuelist.next, struct request, queuelist);

}



static void *noop_init_queue(request_queue_t *q, elevator_t *e)

static void *noop_init_queue(request_queue_t *q)

{

	struct noop_data *nd;