summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-05-13 12:49:34 +0200
committerJens Axboe <axboe@kernel.dk>2020-05-19 09:35:24 -0600
commit76268f3ac0a69e76270af5f67ab239ccd796ae56 (patch)
treecdb87416f6b127b8dbddd9e4cf4727af5e0463ff /block/blk-merge.c
parentb2f609e191edc9c7a9dec603318461eeb23f8a6b (diff)
downloadlinux-76268f3ac0a69e76270af5f67ab239ccd796ae56.tar.gz
linux-76268f3ac0a69e76270af5f67ab239ccd796ae56.tar.bz2
linux-76268f3ac0a69e76270af5f67ab239ccd796ae56.zip
block: don't call part_{inc,dec}_in_flight for blk-mq devices
part_inc_in_flight and part_dec_in_flight are no-ops for blk-mq queues, so remove the calls in purely blk-mq callers. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-merge.c')
-rw-r--r--block/blk-merge.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 1a9036398214..6a4538d39efd 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -677,8 +677,6 @@ static void blk_account_io_merge(struct request *req)
part_stat_lock();
part = req->part;
- part_dec_in_flight(req->q, part, rq_data_dir(req));
-
hd_struct_put(part);
part_stat_unlock();
}