From: Pali Rohár <pali@kernel.org>
Date: Tue, 17 Mar 2020 21:46:52 +0000 (+0100)
Subject: exfat: Fix discard support
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b7e038a92449f191395fbb86538b14093c529833;p=linux.git

exfat: Fix discard support

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>
---

diff --git a/fs/exfat/super.c b/fs/exfat/super.c
index 16ed202ef5279..30e914ad17b59 100644
--- a/fs/exfat/super.c
+++ b/fs/exfat/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;