Commit 5d9c305b authored May 29, 2020 by Christoph Hellwig Committed by Jens Axboe May 29, 2020

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



None of the I/O schedulers actually needs it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 3382a567

block/bfq-iosched.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6073,7 +6073,7 @@ static struct bfq_queue bfq_get_bfqq_handle_split(struct bfq_data bfqd,
	* comments on bfq_init_rq for the reason behind this delayed		* comments on bfq_init_rq for the reason behind this delayed
	* preparation.		* preparation.
	*/		*/
	static void bfq_prepare_request(struct request rq, struct bio bio)		static void bfq_prepare_request(struct request *rq)
	{		{
	/*		/*
	* Regardless of whether we have an icq attached, we have to		* Regardless of whether we have an icq attached, we have to

block/blk-mq.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -387,7 +387,7 @@ static struct request blk_mq_get_request(struct request_queue q,
	if (e->type->icq_cache)		if (e->type->icq_cache)
	blk_mq_sched_assign_ioc(rq);		blk_mq_sched_assign_ioc(rq);

	e->type->ops.prepare_request(rq, bio);		e->type->ops.prepare_request(rq);
	rq->rq_flags \|= RQF_ELVPRIV;		rq->rq_flags \|= RQF_ELVPRIV;
	}		}
	}		}

block/kyber-iosched.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -579,7 +579,7 @@ static bool kyber_bio_merge(struct blk_mq_hw_ctx hctx, struct bio bio,
	return merged;		return merged;
	}		}

	static void kyber_prepare_request(struct request rq, struct bio bio)		static void kyber_prepare_request(struct request *rq)
	{		{
	rq_set_domain_token(rq, -1);		rq_set_domain_token(rq, -1);
	}		}

block/mq-deadline.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -541,7 +541,7 @@ static void dd_insert_requests(struct blk_mq_hw_ctx *hctx,
	* Nothing to do here. This is defined only to ensure that .finish_request		* Nothing to do here. This is defined only to ensure that .finish_request
	* method is called upon request completion.		* method is called upon request completion.
	*/		*/
	static void dd_prepare_request(struct request rq, struct bio bio)		static void dd_prepare_request(struct request *rq)
	{		{
	}		}

include/linux/elevator.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ struct elevator_mq_ops {
	void (request_merged)(struct request_queue , struct request *, enum elv_merge);		void (request_merged)(struct request_queue , struct request *, enum elv_merge);
	void (requests_merged)(struct request_queue , struct request , struct request );		void (requests_merged)(struct request_queue , struct request , struct request );
	void (limit_depth)(unsigned int, struct blk_mq_alloc_data );		void (limit_depth)(unsigned int, struct blk_mq_alloc_data );
	void (prepare_request)(struct request , struct bio *bio);		void (prepare_request)(struct request );
	void (finish_request)(struct request );		void (finish_request)(struct request );
	void (insert_requests)(struct blk_mq_hw_ctx , struct list_head *, bool);		void (insert_requests)(struct blk_mq_hw_ctx , struct list_head *, bool);
	struct request (dispatch_request)(struct blk_mq_hw_ctx *);		struct request (dispatch_request)(struct blk_mq_hw_ctx *);