diff options
| author | Jiufei Xue <jiufei.xue@linux.alibaba.com> | 2018-02-27 20:10:03 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-08 22:41:05 -0800 |
| commit | 17644a0bbb190b6286106e98392f3d60ee020a23 (patch) | |
| tree | 65335b6919522bab6b8c3b42ce8063dc4a808598 /block | |
| parent | eae6179f55396f7ee708c7da1f9d84688412b62e (diff) | |
| download | linux-stable-17644a0bbb190b6286106e98392f3d60ee020a23.tar.gz linux-stable-17644a0bbb190b6286106e98392f3d60ee020a23.tar.bz2 linux-stable-17644a0bbb190b6286106e98392f3d60ee020a23.zip | |
block: fix the count of PGPGOUT for WRITE_SAME
commit 7c5a0dcf557c6511a61e092ba887de28882fe857 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 95b7ea996ac2..c01f4907dbbc 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2277,7 +2277,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); |