diff options
author | Jens Axboe <axboe@fb.com> | 2016-12-05 12:14:35 -0700 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2016-12-05 12:14:35 -0700 |
commit | 8eb2947a4e7aa7f6cd8d998143f216acd7c912fd (patch) | |
tree | 5b26e2113c96b94ae6a937e89e5c340c22324cd2 /block | |
parent | 39f4f0709c36cc9114bbeac00bd7abd518f0477c (diff) | |
parent | 6e85eaf3078bcc8552ca32a0938dbf7d2b495af0 (diff) |
Merge branch 'for-4.10/block' into for-next
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index bac12caece06..90db5b490df9 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1237,7 +1237,7 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio) { init_request_from_bio(rq, bio); - blk_account_io_start(rq, 1); + blk_account_io_start(rq, true); } static inline bool hctx_allow_merges(struct blk_mq_hw_ctx *hctx) |