Skip to content

Commit

Permalink
Revert "dm raid: fix discard limits for raid1 and raid10"
Browse files Browse the repository at this point in the history
BugLink: https://bugs.launchpad.net/bugs/1907262

This reverts commit 0088d67.

Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
  • Loading branch information
Khalid Elmously committed Dec 9, 2020
1 parent f682261 commit 3261433
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions drivers/md/dm-raid.c
Original file line number Diff line number Diff line change
Expand Up @@ -3744,14 +3744,12 @@ static void raid_io_hints(struct dm_target *ti, struct queue_limits *limits)
blk_limits_io_opt(limits, chunk_size_bytes * mddev_data_stripes(rs));

/*
* RAID10 personality requires bio splitting,
* RAID0/1/4/5/6 don't and process large discard bios properly.
* RAID1 and RAID10 personalities require bio splitting,
* RAID0/4/5/6 don't and process large discard bios properly.
*/
if (rs_is_raid10(rs)) {
limits->discard_granularity = max(chunk_size_bytes,
limits->discard_granularity);
limits->max_discard_sectors = min_not_zero(rs->md.chunk_sectors,
limits->max_discard_sectors);
if (rs_is_raid1(rs) || rs_is_raid10(rs)) {
limits->discard_granularity = chunk_size_bytes;
limits->max_discard_sectors = rs->md.chunk_sectors;
}
}

Expand Down

0 comments on commit 3261433

Please sign in to comment.