aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-raid.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-04-05 13:21:23 -0400
committerJens Axboe <axboe@fb.com>2017-04-08 13:25:38 -0400
commit48920ff2a5a940cd07d12cc79e4a2c75f1185aee (patch)
tree0505a85fce20a0d34c5d4bbc71ba8771a037e209 /drivers/md/dm-raid.c
parent45c21793a6601b29926d67f7a07fe4077a45072e (diff)
block: remove the discard_zeroes_data flag
Now that we use the proper REQ_OP_WRITE_ZEROES operation everywhere we can kill this hack. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/md/dm-raid.c')
-rw-r--r--drivers/md/dm-raid.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index f8564d63982f..468f1380de1d 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -2813,7 +2813,9 @@ static void configure_discard_support(struct raid_set *rs)
2813 /* Assume discards not supported until after checks below. */ 2813 /* Assume discards not supported until after checks below. */
2814 ti->discards_supported = false; 2814 ti->discards_supported = false;
2815 2815
2816 /* RAID level 4,5,6 require discard_zeroes_data for data integrity! */ 2816 /*
2817 * XXX: RAID level 4,5,6 require zeroing for safety.
2818 */
2817 raid456 = (rs->md.level == 4 || rs->md.level == 5 || rs->md.level == 6); 2819 raid456 = (rs->md.level == 4 || rs->md.level == 5 || rs->md.level == 6);
2818 2820
2819 for (i = 0; i < rs->raid_disks; i++) { 2821 for (i = 0; i < rs->raid_disks; i++) {
@@ -2827,8 +2829,6 @@ static void configure_discard_support(struct raid_set *rs)
2827 return; 2829 return;
2828 2830
2829 if (raid456) { 2831 if (raid456) {
2830 if (!q->limits.discard_zeroes_data)
2831 return;
2832 if (!devices_handle_discard_safely) { 2832 if (!devices_handle_discard_safely) {
2833 DMERR("raid456 discard support disabled due to discard_zeroes_data uncertainty."); 2833 DMERR("raid456 discard support disabled due to discard_zeroes_data uncertainty.");
2834 DMERR("Set dm-raid.devices_handle_discard_safely=Y to override."); 2834 DMERR("Set dm-raid.devices_handle_discard_safely=Y to override.");