Merge tag 'for-4.15/dm-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / md / dm-raid.c

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 366c625b9591f87493ca21643f517a14af13f898..6319d846e0adb8c264f98676f0c2ddb8e85bdbb7 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -2887,9 +2887,6 @@ static void configure_discard_support(struct raid_set *rs)
        bool raid456;
        struct dm_target *ti = rs->ti;
 
-       /* Assume discards not supported until after checks below. */
-       ti->discards_supported = false;
-
        /*
         * XXX: RAID level 4,5,6 require zeroing for safety.
         */
@@ -2914,9 +2911,6 @@ static void configure_discard_support(struct raid_set *rs)
                }
        }
 
-       /* All RAID members properly support discards */
-       ti->discards_supported = true;
-
        /*
         * RAID1 and RAID10 personalities require bio splitting,
         * RAID0/4/5/6 don't and process large discard bios properly.