kernel-5.6.6

2020-04-22 13:27:03 +03:00
parent 467988ac34
commit aa6b613d3e
4 changed files with 1462 additions and 3793 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
@@ -33,7 +33,7 @@
        </BuildDependencies>
        <Patches>
            <!-- Linux patches -->
-            <Patch level="1" compressionType="xz">patches/linux/patch-5.6.4.xz</Patch>
+            <Patch level="1" compressionType="xz">patches/linux/patch-5.6.6.xz</Patch>
            <!-- Mageia Linux patches-->
            <Patch level="1">patches/mageia/fs-aufs-5.6.patch</Patch>
            <Patch level="1">patches/mageia/fs-aufs-5.6-modular.patch</Patch>
@@ -53,6 +53,7 @@
            <Patch level="1">patches/mageia/fs-MAINTAINERS-add-exfat-filesystem.patch</Patch>
            <Patch level="1">patches/mageia/fs-exfat-update-file-system-parameter-handling.patch</Patch>
            <Patch level="1">patches/mageia/fs-exfat-add-module_alias_fs.patch</Patch>
+            <Patch level="1">patches/mageia/fs-exfat-fix-discard-support.patch</Patch>
            <Patch level="1">patches/mageia/CVE-2019-12379.patch</Patch>
        </Patches>
    </Source>
@@ -112,6 +113,17 @@
    </Package>

    <History>
+        <Update release="36">
+            <Date>2020-04-18</Date>
+            <Version>5.6.6</Version>
+            <Comment>Version bump.</Comment>
+            <Type package="kernel">security</Type>
+            <Requires>
+                <Action package="kernel">systemRestart</Action>
+            </Requires>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
        <Update release="35">
            <Date>2020-04-13</Date>
            <Version>5.6.4</Version>