From 5d47c89f29eab6e9e224d7ac8c0baf4da72c9493 Mon Sep 17 00:00:00 2001

From: Mike Snitzer <snitzer@redhat.com>

Date: Thu, 16 Nov 2017 15:42:26 -0500

Subject: [PATCH] dm: clear all discard attributes in queue_limits when

 discards are disabled

Git-commit: 5d47c89f29eab6e9e224d7ac8c0baf4da72c9493

Patch-mainline: v4.15-rc1

References: bsc#1093023

Otherwise, it can happen that the QUEUE_FLAG_DISCARD isn't set but the

various discard attributes (which get exposed via sysfs) may be set.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>

Signed-off-by: Coly Li <colyli@suse.de>

---

 drivers/md/dm-table.c | 10 ++++++++--

 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c

index 6f1ec12c287c..3acf8f56eb64 100644

--- a/drivers/md/dm-table.c

+++ b/drivers/md/dm-table.c

@@ -1801,9 +1801,15 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,

 	 */

 	q->limits = *limits;

-	if (!dm_table_supports_discards(t))

+	if (!dm_table_supports_discards(t)) {

 		queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);

-	else

+		/* Must also clear discard limits... */

+		q->limits.max_discard_sectors = 0;

+		q->limits.max_hw_discard_sectors = 0;

+		q->limits.discard_granularity = 0;

+		q->limits.discard_alignment = 0;

+		q->limits.discard_misaligned = 0;

+	} else

 		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);

 	if (dm_table_supports_flush(t, (1UL << QUEUE_FLAG_WC))) {

-- 

2.16.3