From b53247f004cbba24622e87ca73fa62bd1cb949bd Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 5 May 2022 15:56:37 +0300 Subject: [PATCH] kernel-5.15.37 --- .../kernel/files/patches/mageia/fs-aufs5.15.patch | 13 +++++++------ .../files/patches/mageia/fs-aufs5.15.patch | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/kernel/kernel/files/patches/mageia/fs-aufs5.15.patch b/kernel/kernel/files/patches/mageia/fs-aufs5.15.patch index df625e5b..3484d64f 100644 --- a/kernel/kernel/files/patches/mageia/fs-aufs5.15.patch +++ b/kernel/kernel/files/patches/mageia/fs-aufs5.15.patch @@ -16518,10 +16518,12 @@ diff -Nurp linux-5.15.37/fs/aufs/hbl.h linux-5.15.37-aufs/fs/aufs/hbl.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_HBL_H__ */ -diff -Nurp linux-5.15.37/fs/aufs/hfsnotify.c linux-5.15.37-aufs/fs/aufs/hfsnotify.c ---- linux-5.15.37/fs/aufs/hfsnotify.c 1970-01-01 02:00:00.000000000 +0200 -+++ linux-5.15.37-aufs/fs/aufs/hfsnotify.c 2022-04-08 20:22:30.613616524 +0300 -@@ -0,0 +1,276 @@ +diff --git a/fs/aufs/hfsnotify.c b/fs/aufs/hfsnotify.c +new file mode 100644 +index 000000000000..c2c7766d6cf1 +--- /dev/null ++++ b/fs/aufs/hfsnotify.c +@@ -0,0 +1,275 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2005-2021 Junjiro R. Okajima @@ -16681,8 +16683,7 @@ diff -Nurp linux-5.15.37/fs/aufs/hfsnotify.c linux-5.15.37-aufs/fs/aufs/hfsnotif + struct inode *h_dir, *h_inode; + struct fsnotify_mark *inode_mark; + -+ AuDebugOn(!(data_type == FSNOTIFY_EVENT_INODE -+ || data_type == FSNOTIFY_EVENT_DENTRY)); ++ AuDebugOn(data_type != FSNOTIFY_EVENT_INODE); + + err = 0; + /* if FS_UNMOUNT happens, there must be another bug */ diff --git a/kernel/tools/cpupowertools/files/patches/mageia/fs-aufs5.15.patch b/kernel/tools/cpupowertools/files/patches/mageia/fs-aufs5.15.patch index df625e5b..3484d64f 100644 --- a/kernel/tools/cpupowertools/files/patches/mageia/fs-aufs5.15.patch +++ b/kernel/tools/cpupowertools/files/patches/mageia/fs-aufs5.15.patch @@ -16518,10 +16518,12 @@ diff -Nurp linux-5.15.37/fs/aufs/hbl.h linux-5.15.37-aufs/fs/aufs/hbl.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_HBL_H__ */ -diff -Nurp linux-5.15.37/fs/aufs/hfsnotify.c linux-5.15.37-aufs/fs/aufs/hfsnotify.c ---- linux-5.15.37/fs/aufs/hfsnotify.c 1970-01-01 02:00:00.000000000 +0200 -+++ linux-5.15.37-aufs/fs/aufs/hfsnotify.c 2022-04-08 20:22:30.613616524 +0300 -@@ -0,0 +1,276 @@ +diff --git a/fs/aufs/hfsnotify.c b/fs/aufs/hfsnotify.c +new file mode 100644 +index 000000000000..c2c7766d6cf1 +--- /dev/null ++++ b/fs/aufs/hfsnotify.c +@@ -0,0 +1,275 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2005-2021 Junjiro R. Okajima @@ -16681,8 +16683,7 @@ diff -Nurp linux-5.15.37/fs/aufs/hfsnotify.c linux-5.15.37-aufs/fs/aufs/hfsnotif + struct inode *h_dir, *h_inode; + struct fsnotify_mark *inode_mark; + -+ AuDebugOn(!(data_type == FSNOTIFY_EVENT_INODE -+ || data_type == FSNOTIFY_EVENT_DENTRY)); ++ AuDebugOn(data_type != FSNOTIFY_EVENT_INODE); + + err = 0; + /* if FS_UNMOUNT happens, there must be another bug */