perf ver. bump

2020-05-04 23:20:21 +03:00
parent ba4986abe8
commit 0314303da4
3 changed files with 41 additions and 1 deletions
@@ -0,0 +1,32 @@
+From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
+Subject: [PATCH 4/4] exfat: Fix discard support
+Date: Tue, 17 Mar 2020 23:25:55 +0100
+
+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>
+---
+ fs/exfat/super.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/fs/exfat/super.c b/fs/exfat/super.c
+index 16ed202ef527..30e914ad17b5 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;
+-- 
+2.20.1