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

Commit 1ea5c403 authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

block: make sure writesame bio is aligned with logical block size 



commit 34ffec60b27aa81d04e274e71e4c6ef740f75fc7 upstream.

Obviously the created writesame bio has to be aligned with logical block
size, and use bio_allowed_max_sectors() to retrieve this number.

Cc: stable@vger.kernel.org
Cc: Mike Snitzer <snitzer@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Xiao Ni <xni@redhat.com>
Cc: Mariusz Dabrowski <mariusz.dabrowski@intel.com>
Fixes: b49a0871 ("block: remove split code in blkdev_issue_{discard,write_same}")
Tested-by: default avatarRui Salvaterra <rsalvaterra@gmail.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 14657efd

block/blk-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int __blkdev_issue_write_same(struct block_device *bdev, sector_t sector, 
		return -EOPNOTSUPP;



	/* Ensure that max_write_same_sectors doesn't overflow bi_size */

	max_write_same_sectors = UINT_MAX >> 9;

	max_write_same_sectors = bio_allowed_max_sectors(q);



	while (nr_sects) {

		bio = next_bio(bio, 1, gfp_mask);