From b7e038a92449f191395fbb86538b14093c529833 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>

Date: Tue, 17 Mar 2020 22:46:52 +0100

Subject: [Backport b7e038a92449] exfat: Fix discard support

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Discard support was always unconditionally disabled. Now it is disabled

only in the case when blk_queue_discard() returns false.

Signed-off-by: Pali Rohár <pali@kernel.org>

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>

---

 src/super.c | 5 +++--

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

diff --git a/src/super.c b/src/super.c

index 16ed202ef5279abc40b23d03cd346b4baf4c23d3..30e914ad17b59643bb9ad99beb7868a79659dcee 100644

--- a/src/super.c

+++ b/src/super.c

@@ -531,10 +531,11 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc)

 	if (opts->discard) {

 		struct request_queue *q = bdev_get_queue(sb->s_bdev);

-		if (!blk_queue_discard(q))

+		if (!blk_queue_discard(q)) {

 			exfat_msg(sb, KERN_WARNING,

 				"mounting with \"discard\" option, but the device does not support discard");

-		opts->discard = 0;

+			opts->discard = 0;

+		}

 	}

 	sb->s_flags |= SB_NODIRATIME;

-- 

2.31.1