aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJiufei Xue <jiufei.xue@linux.alibaba.com>2018-02-27 20:10:03 +0800
committerJens Axboe <axboe@kernel.dk>2018-03-01 08:41:23 -0700
commit7c5a0dcf557c6511a61e092ba887de28882fe857 (patch)
treeda84e1c427e6ef6f7bd1a203cfef657fbc5dca42 /block
parentf3bc78d2d4b489590540ab2788d5376583e28173 (diff)
downloadlinux-stericsson-7c5a0dcf557c6511a61e092ba887de28882fe857.tar.gz
block: fix the count of PGPGOUT for WRITE_SAME
The vm counters is counted in sectors, so we should do the conversation in submit_bio. Fixes: 74d46992e0d9 ("block: replace bi_bdev with a gendisk pointer and partitions index") Cc: stable@vger.kernel.org Reviewed-by: Omar Sandoval <osandov@fb.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jiufei Xue <jiufei.xue@linux.alibaba.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 2d1a7bbe0634..6d82c4f7fadd 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2434,7 +2434,7 @@ blk_qc_t submit_bio(struct bio *bio)
unsigned int count;
if (unlikely(bio_op(bio) == REQ_OP_WRITE_SAME))
- count = queue_logical_block_size(bio->bi_disk->queue);
+ count = queue_logical_block_size(bio->bi_disk->queue) >> 9;
else
count = bio_sectors(bio);