summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2022-05-19 12:52:31 +0200
committerJens Axboe <axboe@kernel.dk>2022-05-19 06:52:36 -0600
commite79cf8892e332b9dafc99aef02189a2897eced24 (patch)
tree799dfd1175af2a90307750a5c51136b31dcb294a
parentc5ac56bb6110e42e79d3106866658376b2e48ab9 (diff)
downloadlinux-e79cf8892e332b9dafc99aef02189a2897eced24.tar.gz
bfq: Remove superfluous conversion from RQ_BIC()
We store struct bfq_io_cq pointer in rq->elv.priv[0] in bfq_init_rq().
Thus a call to icq_to_bic() in RQ_BIC() is wrong. Luckily it does no
harm currently because struct io_iq is the first one in struct
bfq_io_cq.

Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220519105235.31397-3-jack@suse.cz
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/bfq-iosched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 9e1d713de942..62de9f865610 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -374,7 +374,7 @@ static const unsigned long bfq_activation_stable_merging = 600;
  */
 static const unsigned long bfq_late_stable_merging = 600;
 
-#define RQ_BIC(rq)		icq_to_bic((rq)->elv.priv[0])
+#define RQ_BIC(rq)		((struct bfq_io_cq *)((rq)->elv.priv[0]))
 #define RQ_BFQQ(rq)		((rq)->elv.priv[1])
 
 struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, bool is_sync)