Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c5a0dcf authored by Jiufei Xue's avatar Jiufei Xue Committed by Jens Axboe
Browse files

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: 74d46992 ("block: replace bi_bdev with a gendisk pointer and partitions index")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJiufei Xue <jiufei.xue@linux.alibaba.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f3bc78d2

block/blk-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2434,7 +2434,7 @@ blk_qc_t submit_bio(struct bio *bio) 
		unsigned int count;

		unsigned int count;





		if (unlikely(bio_op(bio) == REQ_OP_WRITE_SAME))

		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

		else

			count = bio_sectors(bio);

			count = bio_sectors(bio);