Commit f09dbec9 authored Aug 06, 2020 by Keith Busch Committed by Greg Kroah-Hartman Sep 03, 2020

block: fix get_max_io_size()



commit e4b469c66f3cbb81c2e94d31123d7bcdf3c1dabd upstream.

A previous commit aligning splits to physical block sizes inadvertently
modified one return case such that that it now returns 0 length splits
when the number of sectors doesn't exceed the physical offset. This
later hits a BUG in bio_split(). Restore the previous working behavior.

Fixes: 9cc5169c ("block: Improve physical block alignment of split bios")
Reported-by: Eric Deal <eric.deal@wdc.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2f4b202e

block/blk-merge.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ static inline unsigned get_max_io_size(struct request_queue *q,
		if (max_sectors > start_offset)
		return max_sectors - start_offset;

		return sectors & (lbs - 1);
		return sectors & ~(lbs - 1);
		}

		static inline unsigned get_max_segment_size(const struct request_queue *q,