Skip to content

Commit 5091cde

Browse files
committed
dm: change max_io_len() to use blk_max_size_offset()
Using blk_max_size_offset() enables DM core's splitting to impose ti->max_io_len (via q->limits.chunk_sectors) and also fallback to respecting q->limits.max_sectors if chunk_sectors isn't set. Signed-off-by: Mike Snitzer <snitzer@redhat.com>
1 parent 882ec4e commit 5091cde

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

drivers/md/dm.c

+8-12
Original file line numberDiff line numberDiff line change
@@ -1051,22 +1051,18 @@ static sector_t max_io_len_target_boundary(sector_t sector, struct dm_target *ti
10511051
static sector_t max_io_len(sector_t sector, struct dm_target *ti)
10521052
{
10531053
sector_t len = max_io_len_target_boundary(sector, ti);
1054-
sector_t offset, max_len;
1054+
sector_t max_len;
10551055

10561056
/*
10571057
* Does the target need to split even further?
1058+
* - q->limits.chunk_sectors reflects ti->max_io_len so
1059+
* blk_max_size_offset() provides required splitting.
1060+
* - blk_max_size_offset() also respects q->limits.max_sectors
10581061
*/
1059-
if (ti->max_io_len) {
1060-
offset = dm_target_offset(ti, sector);
1061-
if (unlikely(ti->max_io_len & (ti->max_io_len - 1)))
1062-
max_len = sector_div(offset, ti->max_io_len);
1063-
else
1064-
max_len = offset & (ti->max_io_len - 1);
1065-
max_len = ti->max_io_len - max_len;
1066-
1067-
if (len > max_len)
1068-
len = max_len;
1069-
}
1062+
max_len = blk_max_size_offset(dm_table_get_md(ti->table)->queue,
1063+
dm_target_offset(ti, sector));
1064+
if (len > max_len)
1065+
len = max_len;
10701066

10711067
return len;
10721068
}

0 commit comments

Comments
 (0)