summaryrefslogtreecommitdiffstats
path: root/block/blk-mq.c
diff options
context:
space:
mode:
authorOmar Sandoval <osandov@fb.com>2018-05-09 02:08:52 -0700
committerJens Axboe <axboe@kernel.dk>2018-05-09 08:33:07 -0600
commit4bc6339a583cec650b05d6fdcc83f03f941c1a3b (patch)
tree9d5b1c5d7fe63fd197a99b2add28378ef06ab123 /block/blk-mq.c
parent84c7afcebed913c93d50f116b046b7f0d8ec0cdc (diff)
downloadlinux-0-day-4bc6339a583cec650b05d6fdcc83f03f941c1a3b.tar.gz
linux-0-day-4bc6339a583cec650b05d6fdcc83f03f941c1a3b.tar.xz
block: move blk_stat_add() to __blk_mq_end_request()
We want this next to blk_account_io_done() for the next change so that we can call ktime_get() only once for both. Signed-off-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
-rw-r--r--block/blk-mq.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 17612e04d0414..39b4e9834d825 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -506,6 +506,11 @@ EXPORT_SYMBOL_GPL(blk_mq_free_request);
inline void __blk_mq_end_request(struct request *rq, blk_status_t error)
{
+ if (rq->rq_flags & RQF_STATS) {
+ blk_mq_poll_stats_start(rq->q);
+ blk_stat_add(rq);
+ }
+
blk_account_io_done(rq);
if (rq->end_io) {
@@ -545,10 +550,6 @@ static void __blk_mq_complete_request(struct request *rq)
if (rq->internal_tag != -1)
blk_mq_sched_completed_request(rq);
- if (rq->rq_flags & RQF_STATS) {
- blk_mq_poll_stats_start(rq->q);
- blk_stat_add(rq);
- }
if (!test_bit(QUEUE_FLAG_SAME_COMP, &rq->q->queue_flags)) {
rq->q->softirq_done_fn(rq);