From 3261433f4ad896f88486d7c8f5e2936a1d446011 Mon Sep 17 00:00:00 2001 From: Khalid Elmously Date: Wed, 9 Dec 2020 02:02:56 -0500 Subject: [PATCH] Revert "dm raid: fix discard limits for raid1 and raid10" BugLink: https://bugs.launchpad.net/bugs/1907262 This reverts commit 0088d67f740d3b4ecf02cdc02fef9f82da9be132. Signed-off-by: Khalid Elmously --- drivers/md/dm-raid.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 793348ae1e8cd..10e8b2fe787b5 100644 --- 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; } }