blk-mq: remove the bio argument to ->prepare_request

None of the I/O schedulers actually needs it.

Christoph Hellwig committed 6 years ago

Commit 5d9c3051 parent 3382a565 files · +5 −5Browse files

Unified · Split

5 files

block/bfq-iosched.c +1 −1
block/blk-mq.c +1 −1
block/kyber-iosched.c +1 −1
block/mq-deadline.c +1 −1
include/linux/elevator.h +1 −1

block/bfq-iosched.c+1−1

@@ -6073,7 +6073,7 @@ static struct bfq_queue bfq_get_bfqq_handle_split(struct bfq_data bfqd, · 6072 unmodified lines
6073	* comments on bfq_init_rq for the reason behind this delayed	6073	* comments on bfq_init_rq for the reason behind this delayed
6074	* preparation.	6074	* preparation.
6075	*/	6075	*/
6076	static void bfq_prepare_request(struct request rq, struct bio bio)	6076	static void bfq_prepare_request(struct request *rq)
6077	{	6077	{
6078	/*	6078	/*
6079	* Regardless of whether we have an icq attached, we have to	6079	* Regardless of whether we have an icq attached, we have to

block/blk-mq.c+1−1

@@ -387,7 +387,7 @@ static struct request blk_mq_get_request(struct request_queue q, · 386 unmodified lines
387	if (e->type->icq_cache)	387	if (e->type->icq_cache)
388	blk_mq_sched_assign_ioc(rq);	388	blk_mq_sched_assign_ioc(rq);
389		389
390	e->type->ops.prepare_request(rq, bio);	390	e->type->ops.prepare_request(rq);
391	rq->rq_flags \|= RQF_ELVPRIV;	391	rq->rq_flags \|= RQF_ELVPRIV;
392	}	392	}
393	}	393	}

block/kyber-iosched.c+1−1

@@ -579,7 +579,7 @@ static bool kyber_bio_merge(struct blk_mq_hw_ctx hctx, struct bio bio, · 578 unmodified lines
579	return merged;	579	return merged;
580	}	580	}
581		581
582	static void kyber_prepare_request(struct request rq, struct bio bio)	582	static void kyber_prepare_request(struct request *rq)
583	{	583	{
584	rq_set_domain_token(rq, -1);	584	rq_set_domain_token(rq, -1);
585	}	585	}

block/mq-deadline.c+1−1

@@ -541,7 +541,7 @@ static void dd_insert_requests(struct blk_mq_hw_ctx *hctx, · 540 unmodified lines
541	* Nothing to do here. This is defined only to ensure that .finish_request	541	* Nothing to do here. This is defined only to ensure that .finish_request
542	* method is called upon request completion.	542	* method is called upon request completion.
543	*/	543	*/
544	static void dd_prepare_request(struct request rq, struct bio bio)	544	static void dd_prepare_request(struct request *rq)
545	{	545	{
546	}	546	}
547		547

include/linux/elevator.h+1−1

@@ -39,7 +39,7 @@ struct elevator_mq_ops { · 38 unmodified lines
39	void (request_merged)(struct request_queue , struct request *, enum elv_merge);	39	void (request_merged)(struct request_queue , struct request *, enum elv_merge);
40	void (requests_merged)(struct request_queue , struct request , struct request );	40	void (requests_merged)(struct request_queue , struct request , struct request );
41	void (limit_depth)(unsigned int, struct blk_mq_alloc_data );	41	void (limit_depth)(unsigned int, struct blk_mq_alloc_data );
42	void (prepare_request)(struct request , struct bio *bio);	42	void (prepare_request)(struct request );
43	void (finish_request)(struct request );	43	void (finish_request)(struct request );
44	void (insert_requests)(struct blk_mq_hw_ctx , struct list_head *, bool);	44	void (insert_requests)(struct blk_mq_hw_ctx , struct list_head *, bool);
45	struct request (dispatch_request)(struct blk_mq_hw_ctx *);	45	struct request (dispatch_request)(struct blk_mq_hw_ctx *);