aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--block/blk-mq.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index b7b8437f0a04..568773de9a7f 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -579,20 +579,18 @@ void blk_mq_free_plug_rqs(struct blk_plug *plug)
inline void __blk_mq_end_request(struct request *rq, blk_status_t error)
{
- u64 now = 0;
+ if (blk_mq_need_time_stamp(rq)) {
+ u64 now = ktime_get_ns();
- if (blk_mq_need_time_stamp(rq))
- now = ktime_get_ns();
+ if (rq->rq_flags & RQF_STATS) {
+ blk_mq_poll_stats_start(rq->q);
+ blk_stat_add(rq, now);
+ }
- if (rq->rq_flags & RQF_STATS) {
- blk_mq_poll_stats_start(rq->q);
- blk_stat_add(rq, now);
+ blk_mq_sched_completed_request(rq, now);
+ blk_account_io_done(rq, now);
}
- blk_mq_sched_completed_request(rq, now);
-
- blk_account_io_done(rq, now);
-
if (rq->end_io) {
rq_qos_done(rq->q, rq);
rq->end_io(rq, error);