diff options
| author | Song Liu <songliubraving@fb.com> | 2020-12-09 13:53:31 -0800 |
|---|---|---|
| committer | Song Liu <songliubraving@fb.com> | 2020-12-09 20:43:48 -0800 |
| commit | e2782f560c298efc2e23c7e54b3acf54e8a6ba72 (patch) | |
| tree | dbc250342acbb70881fcc0a709e29a485f3503d7 | |
| parent | 7e7986f9d3ba69a7375a41080a1f8c8012cb0923 (diff) | |
| download | linux-fullhistory-e2782f560c298efc2e23c7e54b3acf54e8a6ba72.tar.gz | |
Revert "dm raid: remove unnecessary discard limits for raid10"
This reverts commit f0e90b6c663a7e3b4736cb318c6c7c589f152c28.
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>
| -rw-r--r-- | drivers/md/dm-raid.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 9c1f7c4de65b35..dc8568ab96f243 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3728,6 +3728,17 @@ static void raid_io_hints(struct dm_target *ti, struct queue_limits *limits) blk_limits_io_min(limits, chunk_size_bytes); 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. + */ + 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); + } } static void raid_postsuspend(struct dm_target *ti) |