Skip to content

Commit 65f33b3

Browse files
committed
block: fix incorrect branching in blk_max_size_offset()
If non-zero 'chunk_sectors' is passed in to blk_max_size_offset() that override will be incorrectly ignored. Old blk_max_size_offset() branching, prior to commit 3ee16db, must be used only if passed 'chunk_sectors' override is zero. Fixes: 3ee16db ("dm: fix IO splitting") Cc: stable@vger.kernel.org # 5.9 Reported-by: John Dorminy <jdorminy@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
1 parent bde3808 commit 65f33b3

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

include/linux/blkdev.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,10 +1076,12 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q,
10761076
sector_t offset,
10771077
unsigned int chunk_sectors)
10781078
{
1079-
if (!chunk_sectors && q->limits.chunk_sectors)
1080-
chunk_sectors = q->limits.chunk_sectors;
1081-
else
1082-
return q->limits.max_sectors;
1079+
if (!chunk_sectors) {
1080+
if (q->limits.chunk_sectors)
1081+
chunk_sectors = q->limits.chunk_sectors;
1082+
else
1083+
return q->limits.max_sectors;
1084+
}
10831085

10841086
if (likely(is_power_of_2(chunk_sectors)))
10851087
chunk_sectors -= offset & (chunk_sectors - 1);

0 commit comments

Comments
 (0)