Revert "dm raid: fix discard limits for raid1 and raid10"

BugLink: https://bugs.launchpad.net/bugs/1907262
This reverts commit 4fc36ad7b4e049c8690e4b2888c3bccad223d30e.

Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 2f41e38e06475f86b98f464d600cbeea00260b82..b0aa595e4375d8689ea338d2ca676a1870d2bc1b 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -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;
        }
 }