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>

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 3d411716d7ee4d2a4c57df277adb95ce32d2ab8d..50c8f034c01c5760d373acab90df496efa753127 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -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
  * 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

diff --git a/block/blk-mq.c b/block/blk-mq.c
index c6dcd390be2d233fc90261fb22e1baad6960adeb..f15722cbfac64374d645aa3f209db84986e1a852 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -387,7 +387,7 @@ static struct request *blk_mq_get_request(struct request_queue *q,
                        if (e->type->icq_cache)
                                blk_mq_sched_assign_ioc(rq);
 
-                       e->type->ops.prepare_request(rq, bio);
+                       e->type->ops.prepare_request(rq);
                        rq->rq_flags |= RQF_ELVPRIV;
                }
        }

diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
index 34dcea0ef6377e341732163a82c8a3bc8f972042..a38c5ab103d12bfc2b4dbb03298c5f39a4564390 100644 (file)
--- a/block/kyber-iosched.c
+++ b/block/kyber-iosched.c
@@ -579,7 +579,7 @@ static bool kyber_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio,
        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);
 }

diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index b490f47fd553ce7956d16d1f287558f580c57457..b57470e154c8f599584beb6170da013b87b7fc18 100644 (file)
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -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
  * 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)
 {
 }
 

diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 901bda352dcb726dd54f0b865de4e17a531f4a6e..bacc40a0bdf393892541a3823cf07fbe7328031e 100644 (file)
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -39,7 +39,7 @@ struct elevator_mq_ops {
        void (*request_merged)(struct request_queue *, struct request *, enum elv_merge);
        void (*requests_merged)(struct request_queue *, struct request *, struct request *);
        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 (*insert_requests)(struct blk_mq_hw_ctx *, struct list_head *, bool);
        struct request *(*dispatch_request)(struct blk_mq_hw_ctx *);