[PATCH 3/3] block: make sure writesame bio is aligned with logical block size

[Ming Lei]

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 <rsalvate...@gmail.com>
Cc: sta...@vger.kernel.org
Cc: Mike Snitzer <snit...@redhat.com>
Cc: Christoph Hellwig <h...@lst.de>
Cc: Xiao Ni <x...@redhat.com>
Cc: Mariusz Dabrowski <mariusz.dabrow...@intel.com>
Signed-off-by: Ming Lei <ming....@redhat.com>
---
 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