Extract the logic of polling one hw queue and related statistics
handling out as the helper function.
Signed-off-by: Jeffle Xu <jefflexu@xxxxxxxxxxxxxxxxx>
---
block/blk-mq.c | 5 +----
include/linux/blk-mq.h | 13 +++++++++++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 214fa30b460a..6ef9f0b038c2 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3876,11 +3876,8 @@ int blk_mq_poll(struct request_queue *q, blk_qc_t cookie, bool spin)
do {
int ret;
- hctx->poll_invoked++;
-
- ret = q->mq_ops->poll(hctx);
+ ret = blk_mq_poll_hctx(q, hctx);
if (ret > 0) {
- hctx->poll_success++;
__set_current_state(TASK_RUNNING);
return ret;
}
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 6a7b693b9917..b406cab347d6 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -614,6 +614,19 @@ static inline void blk_rq_bio_prep(struct request *rq, struct bio *bio,
rq->rq_disk = bio->bi_bdev->bd_disk;
}
+static inline int blk_mq_poll_hctx(struct request_queue *q,
+ struct blk_mq_hw_ctx *hctx)
+{
+ int ret;
+
+ hctx->poll_invoked++;
+ ret = q->mq_ops->poll(hctx);
+ if (ret > 0)
+ hctx->poll_success++;
+
+ return ret;
+}
+
blk_qc_t blk_mq_submit_bio(struct bio *bio);
int blk_mq_poll(struct request_queue *q, blk_qc_t cookie, bool spin);
void blk_mq_hctx_set_fq_lock_class(struct blk_mq_hw_ctx *hctx,
--
2.27.0
