Skip to content

Commit e2782f5

Browse files
committed
Revert "dm raid: remove unnecessary discard limits for raid10"
This reverts commit f0e90b6. Matthew Ruffell reported data corruption in raid10 due to the changes in discard handling [1]. Revert these changes before we find a proper fix. [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1907262/ Cc: Matthew Ruffell <matthew.ruffell@canonical.com> Cc: Xiao Ni <xni@redhat.com> Cc: Mike Snitzer <snitzer@redhat.com> Acked-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Song Liu <songliubraving@fb.com>
1 parent 7e7986f commit e2782f5

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

drivers/md/dm-raid.c

+11
Original file line numberDiff line numberDiff line change
@@ -3728,6 +3728,17 @@ static void raid_io_hints(struct dm_target *ti, struct queue_limits *limits)
37283728

37293729
blk_limits_io_min(limits, chunk_size_bytes);
37303730
blk_limits_io_opt(limits, chunk_size_bytes * mddev_data_stripes(rs));
3731+
3732+
/*
3733+
* RAID10 personality requires bio splitting,
3734+
* RAID0/1/4/5/6 don't and process large discard bios properly.
3735+
*/
3736+
if (rs_is_raid10(rs)) {
3737+
limits->discard_granularity = max(chunk_size_bytes,
3738+
limits->discard_granularity);
3739+
limits->max_discard_sectors = min_not_zero(rs->md.chunk_sectors,
3740+
limits->max_discard_sectors);
3741+
}
37313742
}
37323743

37333744
static void raid_postsuspend(struct dm_target *ti)

0 commit comments

Comments
 (0)