diff mbox series

[SRU,F,G,7/7] dm raid: remove unnecessary discard limits for raid10

Message ID 20201029030737.21204-11-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 Oct. 29, 2020, 3:07 a.m. UTC 
From: Mike Snitzer <snitzer@redhat.com>

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

Commit bcc90d280465e ("md/raid10: improve raid10 discard request")
removes raid10's inability to properly handle large discards.  So
eliminate associated constraint from dm-raid's raid10 support.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
(cherry picked from commit f0e90b6c663a7e3b4736cb318c6c7c589f152c28)
Signed-off-by: Matthew Ruffell <matthew.ruffell@canonical.com>
---
 drivers/md/dm-raid.c | 11 -----------
 1 file changed, 11 deletions(-)
diff mbox series

Patch

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 793348ae1e8c..e966cb678506 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3742,17 +3742,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));
-
-	/*
-	 * 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)