Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf ver. bump

Browse Source
This commit is contained in:
Rmys
2020-05-04 23:20:21 +03:00
parent ba4986abe8
commit 0314303da4
3 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/tools/perf/files/patches/linux/patch-5.6.10.xz
BIN
View File
Binary file not shown.
kernel/tools/perf/files/patches/mageia/fs-exfat-fix-discard-support.patch
+32
View File
@@ -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
kernel/tools/perf/pspec.xml
+9 -1
View File
@@ -42,7 +42,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.10.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>
@@ -62,6 +62,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>
@@ -96,6 +97,13 @@
</Files>
</Package>
<History>
<Update release="19">
<Date>2020-05-04</Date>
<Version>5.6.10</Version>
<Comment>Version bump.</Comment>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="18">
<Date>2020-04-13</Date>
<Version>5.6.4</Version>