diff mbox series

[SRU,F,G,H,6/6] dm raid: remove unnecessary discard limits for raid0 and raid10

Message ID 20210506040442.10877-12-matthew.ruffell@canonical.com
State New
Headers show
Series raid10: Block discard is very slow, causing severe delays for mkfs and fstrim operations | expand

Commit Message

Matthew Ruffell May 6, 2021, 4:04 a.m. UTC 
From: Mike Snitzer <snitzer@redhat.com>

BugLink: https://bugs.launchpad.net/bugs/1896578

Commit 29efc390b946 ("md/md0: optimize raid0 discard handling") and
commit d30588b2731f ("md/raid10: improve raid10 discard request")
remove MD raid0's and raid10's inability to properly handle large
discards. So eliminate associated constraints from dm-raid's support.

Depends-on: 29efc390b946 ("md/md0: optimize raid0 discard handling")
Depends-on: d30588b2731f ("md/raid10: improve raid10 discard request")
Reported-by: Matthew Ruffell <matthew.ruffell@canonical.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
(cherry picked from commit ca4a4e9a55beeb138bb06e3867f5e486da896d44)
Signed-off-by: Matthew Ruffell <matthew.ruffell@canonical.com>
---
 drivers/md/dm-raid.c | 9 ---------
 1 file changed, 9 deletions(-)
diff mbox series

Patch

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index cab12b2251ba..294f34d2d61b 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3727,15 +3727,6 @@  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));
-
-	/*
-	 * RAID0 and RAID10 personalities require bio splitting,
-	 * RAID1/4/5/6 don't and process large discard bios properly.
-	 */
-	if (rs_is_raid0(rs) || rs_is_raid10(rs)) {
-		limits->discard_granularity = chunk_size_bytes;
-		limits->max_discard_sectors = rs->md.chunk_sectors;
-	}
 }
 
 static void raid_postsuspend(struct dm_target *ti)