blk-mq: Embed counters into struct mq_inflight

Store inflight counters immediately in struct mq_inflight.
That's type-safer and removes extra indirection.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 19560a16a774432e79283d676dbe2851535802f7..8538dc415499e3414f335e39306d5ead70099f21 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -93,7 +93,7 @@ static void blk_mq_hctx_clear_pending(struct blk_mq_hw_ctx *hctx,
 
 struct mq_inflight {
        struct hd_struct *part;
-       unsigned int *inflight;
+       unsigned int inflight[2];
 };
 
 static bool blk_mq_check_inflight(struct blk_mq_hw_ctx *hctx,
@@ -110,22 +110,21 @@ static bool blk_mq_check_inflight(struct blk_mq_hw_ctx *hctx,
 
 unsigned int blk_mq_in_flight(struct request_queue *q, struct hd_struct *part)
 {
-       unsigned inflight[2];
-       struct mq_inflight mi = { .part = part, .inflight = inflight, };
+       struct mq_inflight mi = { .part = part };
 
-       inflight[0] = inflight[1] = 0;
        blk_mq_queue_tag_busy_iter(q, blk_mq_check_inflight, &mi);
 
-       return inflight[0] + inflight[1];
+       return mi.inflight[0] + mi.inflight[1];
 }
 
 void blk_mq_in_flight_rw(struct request_queue *q, struct hd_struct *part,
                         unsigned int inflight[2])
 {
-       struct mq_inflight mi = { .part = part, .inflight = inflight, };
+       struct mq_inflight mi = { .part = part };
 
-       inflight[0] = inflight[1] = 0;
        blk_mq_queue_tag_busy_iter(q, blk_mq_check_inflight, &mi);
+       inflight[0] = mi.inflight[0];
+       inflight[1] = mi.inflight[1];
 }
 
 void blk_freeze_queue_start(struct request_queue *q)