summaryrefslogtreecommitdiffstats
path: root/block/blk-exec.c
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <khlebnikov@yandex-team.ru>2020-05-27 07:24:16 +0200
committerJens Axboe <axboe@kernel.dk>2020-05-27 13:21:23 +0200
commitb5af37ab3a2b143e278340d2c6fa5790d53817e7 (patch)
treeff8c29b292e97a0ae4ceaa79e37bdb0bb4f8c8d7 /block/blk-exec.c
parentblock: account merge of two requests (diff)
downloadlinux-b5af37ab3a2b143e278340d2c6fa5790d53817e7.tar.xz
linux-b5af37ab3a2b143e278340d2c6fa5790d53817e7.zip
block: add a blk_account_io_merge_bio helper
Move the non-"new_io" branch of blk_account_io_start() into separate function. Fix merge accounting for discards (they were counted as write merges). The new blk_account_io_merge_bio() doesn't call update_io_ticks() unlike blk_account_io_start(), as there is no reason for that. [hch: rebased] Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-exec.c')
-rw-r--r--block/blk-exec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c
index e20a852ae432..85324d53d072 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -55,7 +55,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
rq->rq_disk = bd_disk;
rq->end_io = done;
- blk_account_io_start(rq, true);
+ blk_account_io_start(rq);
/*
* don't check dying flag for MQ because the request won't