diff options
| author | Ming Lei | 2018-10-29 13:57:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-13 20:08:16 +0100 |
| commit | 1ea5c403dd41f4ef91e128e0cc563dc8e2ea4c4e (patch) | |
| tree | 1e5ed168fcdc9446703036d8a431076e262fed11 /block/blk-lib.c | |
| parent | block: make sure discard bio is aligned with logical block size (diff) | |
| download | kernel-qcow2-linux-1ea5c403dd41f4ef91e128e0cc563dc8e2ea4c4e.tar.gz kernel-qcow2-linux-1ea5c403dd41f4ef91e128e0cc563dc8e2ea4c4e.tar.xz kernel-qcow2-linux-1ea5c403dd41f4ef91e128e0cc563dc8e2ea4c4e.zip | |
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: b49a0871be31a745b2ef ("block: remove split code in blkdev_issue_{discard,write_same}")
Tested-by: Rui Salvaterra <rsalvaterra@gmail.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block/blk-lib.c')
| -rw-r--r-- | block/blk-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-lib.c b/block/blk-lib.c index aa62201601c5..1f196cf0aa5d 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -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); |