From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Ming Lei To: Jens Axboe Cc: linux-block@vger.kernel.org, Ming Lei , Rui Salvaterra , stable@vger.kernel.org, Mike Snitzer , Christoph Hellwig , Xiao Ni , Mariusz Dabrowski Subject: [PATCH 3/3] block: make sure writesame bio is aligned with logical block size Date: Fri, 26 Oct 2018 14:24:35 +0800 Message-Id: <20181026062435.21398-4-ming.lei@redhat.com> In-Reply-To: <20181026062435.21398-1-ming.lei@redhat.com> References: <20181026062435.21398-1-ming.lei@redhat.com> List-ID: Obviously the created writesame bio has to be aligned with logical block size. Fixes: b49a0871be31a745b2ef ("block: remove split code in blkdev_issue_{discard,write_same}") Cc: Rui Salvaterra Cc: stable@vger.kernel.org Cc: Mike Snitzer Cc: Christoph Hellwig Cc: Xiao Ni Cc: Mariusz Dabrowski Signed-off-by: Ming Lei --- block/blk-lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 93011785f710..1750f0e480c0 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -149,7 +149,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 = (UINT_MAX >> 9) & ~bs_mask; while (nr_sects) { bio = next_bio(bio, 1, gfp_mask); -- 2.9.5