commit 6eba5801dc4f468e5d1070c2ddd43f58bc77f109
Author: Jan Rękorajski <[email protected]>
Date: Sun Oct 27 00:10:57 2024 +0200
- 6.6.58
kernel-aufs.patch | 292 ++++++++++++++++++++++++++----------------------
kernel-multiarch.config | 8 +-
kernel.spec | 4 +-
3 files changed, 168 insertions(+), 136 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index c551cda5..67f28bd4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@
%define rel 1
%define basever 6.6
-%define postver .53
+%define postver .58
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -115,7 +115,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
# Source0-md5: 452098d80ba925af3a4ab35998f3aef5
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: 753c0c88a59c17aeaf6fc1ddb0760b9c
+# Patch0-md5: 31b37a402eaebcd10bdd6c8785c64e61
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index f96d06b1..fd856a60 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -470,7 +470,7 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See
Documentation/mm/remap_file_pages.rst.\n",
current->comm, current->pid);
-@@ -3016,10 +3019,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long,
start, unsigned long, size,
+@@ -3016,14 +3019,41 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long,
start, unsigned long, size,
if (vma->vm_flags & VM_LOCKED)
flags |= MAP_LOCKED;
@@ -478,16 +478,19 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
+ vma_get_file(vma);
+ file = vma->vm_file;
+ prfile = vma->vm_prfile;
-+ ret = do_mmap(vma->vm_file, start, size,
-+ prot, flags, /*vm_flags*/0, pgoff, &populate, NULL);
-+ if (!IS_ERR_VALUE(ret) && file && prfile) {
-+ struct vm_area_struct *new_vma;
++ ret = security_mmap_file(vma->vm_file, prot, flags);
++ if (!ret) {
++ ret = do_mmap(vma->vm_file, start, size,
++ prot, flags, /*vm_flags*/0, pgoff, &populate,
NULL);
++ if (!IS_ERR_VALUE(ret) && file && prfile) {
++ struct vm_area_struct *new_vma;
+
-+ new_vma = find_vma(mm, ret);
-+ if (!new_vma->vm_prfile)
-+ new_vma->vm_prfile = prfile;
-+ if (prfile)
-+ get_file(prfile);
++ new_vma = find_vma(mm, ret);
++ if (!new_vma->vm_prfile)
++ new_vma->vm_prfile = prfile;
++ if (prfile)
++ get_file(prfile);
++ }
+ }
+ /*
+ * two fput()s instead of vma_fput(vma),
@@ -498,8 +501,12 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
+ fput(prfile);
+#else
file = get_file(vma->vm_file);
+ ret = security_mmap_file(vma->vm_file, prot, flags);
+ if (ret)
+ goto out_fput;
ret = do_mmap(vma->vm_file, start, size,
prot, flags, 0, pgoff, &populate, NULL);
+ out_fput:
fput(file);
+#endif /* CONFIG_AUFS_FS */
out:
@@ -704,8 +711,8 @@ index d62e114c1b1a..ceef001775bd 100644
}
+EXPORT_SYMBOL_GPL(setfl);
- static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
- int force)
+ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
+ int force)
diff --git a/fs/file_table.c b/fs/file_table.c
index ee21b3da9d08..c45ac36795dd 100644
--- a/fs/file_table.c
@@ -905,7 +912,7 @@ index 23b129d482a7..fca4c5707a1c 100644
* security_task_alloc() - Allocate a task's LSM blob
diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs
linux/Documentation/ABI/testing/debugfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01
01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/debugfs-aufs 2022-11-05
23:02:18.955889283 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,55 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@@ -964,7 +971,7 @@ diff -urN
/usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Document
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs
linux/Documentation/ABI/testing/sysfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01
01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs 2022-11-05 23:02:18.955889283
+0100
++++ linux/Documentation/ABI/testing/sysfs-aufs 2024-10-26 23:59:56.219248059
+0200
@@ -0,0 +1,31 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@@ -999,7 +1006,7 @@ diff -urN
/usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentat
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt
linux/Documentation/filesystems/aufs/design/01intro.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt 2022-11-05
23:02:18.955889283 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,171 @@
+
+# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1174,7 +1181,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt lin
+about it. But currently I have implemented it in kernel space.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt
linux/Documentation/filesystems/aufs/design/02struct.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt 2022-11-05
23:02:18.955889283 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,258 @@
+
+# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1436,7 +1443,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt li
+For this purpose, use "aumvdown" command in aufs-util.git.
diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt
linux/Documentation/filesystems/aufs/design/03atomic_open.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt
2022-11-05 23:02:18.955889283 +0100
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt
2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,85 @@
+
+# Copyright (C) 2015-2022 Junjiro R. Okajima
@@ -1525,7 +1532,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.t
+ be implemented in aufs, but not all I am afraid.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt
linux/Documentation/filesystems/aufs/design/03lookup.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,113 @@
+
+# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1642,7 +1649,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt li
+ by over-mounting something (or another method).
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt
linux/Documentation/filesystems/aufs/design/04branch.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,74 @@
+
+# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1720,7 +1727,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt li
+ same named entry on the upper branch.
diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt
linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
2022-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,64 @@
+
+# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1788,7 +1795,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.tx
+ copyup policy.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot
linux/Documentation/filesystems/aufs/design/06dirren.dot
--- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,44 @@
+
+// to view this graph, run dot(1) command in GRAPHVIZ.
@@ -1836,7 +1843,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot li
+}
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt
linux/Documentation/filesystems/aufs/design/06dirren.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,102 @@
+
+# Copyright (C) 2017-2022 Junjiro R. Okajima
@@ -1942,7 +1949,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt li
+equivalen to udba=reval case.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt
linux/Documentation/filesystems/aufs/design/06fhsm.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,118 @@
+
+# Copyright (C) 2011-2022 Junjiro R. Okajima
@@ -2064,7 +2071,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linu
+should restore the original file state after an error happens.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt
linux/Documentation/filesystems/aufs/design/06mmap.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,72 @@
+
+# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -2140,7 +2147,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linu
+I have to give up this "looks-smater" approach.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt
linux/Documentation/filesystems/aufs/design/06xattr.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,94 @@
+
+# Copyright (C) 2014-2022 Junjiro R. Okajima
@@ -2238,7 +2245,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt lin
+now, aufs implements the branch attributes to ignore the error.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt
linux/Documentation/filesystems/aufs/design/07export.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,58 @@
+
+# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -2300,7 +2307,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/07export.txt li
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt
linux/Documentation/filesystems/aufs/design/08shwh.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,52 @@
+
+# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -2356,7 +2363,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linu
+initramfs will use it to replace the old one at the next boot.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt
linux/Documentation/filesystems/aufs/design/10dynop.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt
1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2022-11-05
23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2010-2022 Junjiro R. Okajima
@@ -2407,7 +2414,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt lin
+regular files only.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/README
linux/Documentation/filesystems/aufs/README
--- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01
01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/README 2023-09-02
12:00:06.376642958 +0200
++++ linux/Documentation/filesystems/aufs/README 2024-10-26
23:59:56.219248059 +0200
@@ -0,0 +1,409 @@
+
+Aufs6 -- advanced multi layered unification filesystem version 6.x
@@ -2799,8 +2806,8 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta
+James Burry made a donation (2016/12).
+Carsten Rose made a donation (2018/9).
+Porteus Kiosk made a donation (2018/10).
-+huronOS team: Enya Quetzalli made donations (2022/5, 2023/5 and 8).
-+Vasily Mikhaylichenko made a donation (2023/5).
++huronOS team: Enya Quetzalli made donations (2022/5, 2023/5, 8 and 2024/8).
++Vasily Mikhaylichenko made a donation (2023/5 and 2024/5).
+
+Thank you very much.
+Donations are always, including future donations, very important and
@@ -2820,7 +2827,7 @@ diff -urN
/usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta
+# End: ;
diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
--- /usr/share/empty/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h 2022-11-05 23:02:18.959222617 +0100
++++ linux/fs/aufs/aufs.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -2886,7 +2893,7 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h
linux/fs/aufs/aufs.h
+#endif /* __AUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
--- /usr/share/empty/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/branch.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,1427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -4317,7 +4324,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c
linux/fs/aufs/branch.c
+}
diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
--- /usr/share/empty/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.h 2023-10-31 09:31:04.196547417 +0100
++++ linux/fs/aufs/branch.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,375 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -4696,7 +4703,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.h
linux/fs/aufs/branch.h
+#endif /* __AUFS_BRANCH_H__ */
diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
--- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/conf.mk 2022-11-05 23:02:18.959222617 +0100
++++ linux/fs/aufs/conf.mk 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -4740,7 +4747,7 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk
linux/fs/aufs/conf.mk
+-include ${srctree}/${src}/conf_priv.mk
diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
--- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/cpup.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,1459 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -6203,7 +6210,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c
linux/fs/aufs/cpup.c
+}
diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
--- /usr/share/empty/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/cpup.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,100 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -6307,7 +6314,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h
linux/fs/aufs/cpup.h
+#endif /* __AUFS_CPUP_H__ */
diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
--- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c 2023-10-10 22:51:18.033248030 +0200
++++ linux/fs/aufs/dbgaufs.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,526 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -6837,7 +6844,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c
linux/fs/aufs/dbgaufs.c
+}
diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
--- /usr/share/empty/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.h 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dbgaufs.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -6894,7 +6901,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.h
linux/fs/aufs/dbgaufs.h
+#endif /* __DBGAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
--- /usr/share/empty/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.c 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dcsub.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -7123,7 +7130,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c
linux/fs/aufs/dcsub.c
+}
diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
--- /usr/share/empty/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.h 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dcsub.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,137 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -7264,7 +7271,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.h
linux/fs/aufs/dcsub.h
+#endif /* __AUFS_DCSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
--- /usr/share/empty/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c 2023-10-31 09:31:04.196547417 +0100
++++ linux/fs/aufs/debug.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,448 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -7716,7 +7723,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.c
linux/fs/aufs/debug.c
+}
diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
--- /usr/share/empty/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.h 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/debug.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -7911,14 +7918,14 @@ diff -urN /usr/share/empty/fs/aufs/debug.h
linux/fs/aufs/debug.h
+AuStubVoid(au_dbg_verify_kthread, void)
+AuStubInt0(__init au_debug_init, void)
+
-+#define AuDbgWhlist(w) do {} while (0)
-+#define AuDbgVdir(v) do {} while (0)
-+#define AuDbgInode(i) do {} while (0)
-+#define AuDbgDAlias(i) do {} while (0)
-+#define AuDbgDentry(d) do {} while (0)
-+#define AuDbgFile(f) do {} while (0)
-+#define AuDbgSb(sb) do {} while (0)
-+#define AuDbgSym(addr) do {} while (0)
++AuStubVoid(AuDbgWhlist, struct au_nhash *whlist)
++AuStubVoid(AuDbgVdir, struct au_vdir *vdir)
++AuStubVoid(AuDbgInode, struct inode *inode)
++AuStubVoid(AuDbgDAlias, struct inode *inode)
++AuStubVoid(AuDbgDentry, struct dentry *dentry)
++AuStubVoid(AuDbgFile, struct file *filp)
++AuStubVoid(AuDbgSb, struct super_block *sb)
++AuStubVoid(AuDbgSym, void *addr)
+#endif /* CONFIG_AUFS_DEBUG */
+
+/* ---------------------------------------------------------------------- */
@@ -7946,8 +7953,8 @@ diff -urN /usr/share/empty/fs/aufs/debug.h
linux/fs/aufs/debug.h
+#endif /* __AUFS_DEBUG_H__ */
diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
--- /usr/share/empty/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c 2023-10-31 09:31:04.196547417 +0100
-@@ -0,0 +1,1168 @@
++++ linux/fs/aufs/dentry.c 2024-10-26 23:59:56.219248059 +0200
+@@ -0,0 +1,1175 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -8814,7 +8821,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c
linux/fs/aufs/dentry.c
+{
+ int err;
+ umode_t mode, h_mode;
-+ aufs_bindex_t bindex, btail, btop, ibs, ibe;
++ aufs_bindex_t bindex, btail, btop, ibs, ibe, bwh;
+ unsigned char plus, unhashed, is_root, h_plus, h_nfs, tmpfile;
+ struct inode *h_inode, *h_cached_inode;
+ struct dentry *h_dentry;
@@ -8845,11 +8852,17 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c
linux/fs/aufs/dentry.c
+ }
+
+ btop = au_dbtop(dentry);
++ bwh = au_dbwh(dentry);
++ if (0 <= bwh && bwh < btop)
++ btop = bwh;
+ btail = btop;
+ if (inode && S_ISDIR(inode->i_mode))
+ btail = au_dbtaildir(dentry);
+ for (bindex = btop; bindex <= btail; bindex++) {
+ h_dentry = au_h_dptr(dentry, bindex);
++ if (!h_dentry
++ && (bindex == bwh && inode))
++ h_dentry = au_hi_wh(inode, bindex);
+ if (!h_dentry)
+ continue;
+
@@ -8858,6 +8871,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c
linux/fs/aufs/dentry.c
+ spin_lock(&h_dentry->d_lock);
+ h_name = &h_dentry->d_name;
+ if (unlikely(do_udba
++ && bindex != bwh
+ && !is_root
+ && ((!h_nfs
+ && (unhashed != !!d_unhashed(h_dentry)
@@ -8898,7 +8912,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c
linux/fs/aufs/dentry.c
+ h_plus = plus;
+ h_mode = mode;
+ h_cached_inode = h_inode;
-+ if (h_inode) {
++ if (h_inode && bindex != bwh) {
+ h_mode = (h_inode->i_mode & S_IFMT);
+ h_plus = (h_inode->i_nlink > 0);
+ }
@@ -9118,7 +9132,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c
linux/fs/aufs/dentry.c
+};
diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
--- /usr/share/empty/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/dentry.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,270 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -9392,7 +9406,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h
linux/fs/aufs/dentry.h
+#endif /* __AUFS_DENTRY_H__ */
diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
--- /usr/share/empty/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dinfo.c 2022-12-17 09:21:34.796521861 +0100
++++ linux/fs/aufs/dinfo.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,555 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -9951,7 +9965,7 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c
linux/fs/aufs/dinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
--- /usr/share/empty/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/dir.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,765 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -10720,7 +10734,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c
linux/fs/aufs/dir.c
+};
diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
--- /usr/share/empty/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.h 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dir.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,134 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -10858,7 +10872,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.h
linux/fs/aufs/dir.h
+#endif /* __AUFS_DIR_H__ */
diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
--- /usr/share/empty/fs/aufs/dirren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.c 2023-10-10 22:51:18.033248030 +0200
++++ linux/fs/aufs/dirren.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,1315 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -12177,7 +12191,7 @@ diff -urN /usr/share/empty/fs/aufs/dirren.c
linux/fs/aufs/dirren.c
+}
diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
--- /usr/share/empty/fs/aufs/dirren.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.h 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dirren.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -12321,7 +12335,7 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h
linux/fs/aufs/dirren.h
+#endif /* __AUFS_DIRREN_H__ */
diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
--- /usr/share/empty/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/dynop.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,366 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -12691,7 +12705,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c
linux/fs/aufs/dynop.c
+}
diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
--- /usr/share/empty/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.h 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dynop.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -12772,7 +12786,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h
linux/fs/aufs/dynop.h
+#endif /* __AUFS_DYNOP_H__ */
diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
--- /usr/share/empty/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/export.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -13606,7 +13620,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c
linux/fs/aufs/export.c
+}
diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
--- /usr/share/empty/fs/aufs/fhsm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fhsm.c 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/fhsm.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,426 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -14036,8 +14050,8 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c
linux/fs/aufs/fhsm.c
+}
diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
--- /usr/share/empty/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c 2024-04-08 14:48:47.529907936 +0200
-@@ -0,0 +1,865 @@
++++ linux/fs/aufs/file.c 2024-10-26 23:59:56.219248059 +0200
+@@ -0,0 +1,866 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -14377,6 +14391,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c
linux/fs/aufs/file.c
+ au_set_fbtop(file, btop);
+ au_set_h_fptr(file, btop, h_file);
+ au_update_figen(file);
++ file->f_mode |= h_file->f_mode & FMODE_CAN_ODIRECT;
+ /* todo: necessary? */
+ /* file->f_ra = h_file->f_ra; */
+
@@ -14905,7 +14920,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c
linux/fs/aufs/file.c
+};
diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
--- /usr/share/empty/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.h 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/file.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,342 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -15211,7 +15226,7 @@ diff -urN /usr/share/empty/fs/aufs/file.h
linux/fs/aufs/file.h
+}
+
+#ifdef CONFIG_MMU
-+#define AuDbgVmRegion(file, vma) do {} while (0)
++AuStubVoid(AuDbgVmRegion, struct file *file, struct vm_area_struct *vma)
+
+static inline void au_vm_file_reset(struct vm_area_struct *vma,
+ struct file *file)
@@ -15251,7 +15266,7 @@ diff -urN /usr/share/empty/fs/aufs/file.h
linux/fs/aufs/file.h
+#endif /* __AUFS_FILE_H__ */
diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
--- /usr/share/empty/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/finfo.c 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/finfo.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -15404,8 +15419,8 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c
linux/fs/aufs/finfo.c
+}
diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
--- /usr/share/empty/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c 2023-10-31 09:31:04.196547417 +0100
-@@ -0,0 +1,771 @@
++++ linux/fs/aufs/f_op.c 2024-10-26 23:59:56.219248059 +0200
+@@ -0,0 +1,782 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -15484,6 +15499,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c
linux/fs/aufs/f_op.c
+ au_set_fbtop(file, bindex);
+ au_set_h_fptr(file, bindex, h_file);
+ au_update_figen(file);
++ file->f_mode |= h_file->f_mode & FMODE_CAN_ODIRECT;
+ /* todo: necessary? */
+ /* file->f_ra = h_file->f_ra; */
+
@@ -15706,7 +15722,12 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c
linux/fs/aufs/f_op.c
+ } else
+ /* currently there is no such fs */
+ WARN_ON_ONCE(1);
-+ kio->ki_filp = file;
++ if (!is_sync_kiocb(kio)) {
++ /* do not restore ki_filp */
++ fput(file);
++ get_file(h_file);
++ } else
++ kio->ki_filp = file;
+
+out:
+ return err;
@@ -15764,7 +15785,12 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c
linux/fs/aufs/f_op.c
+ err = PTR_ERR(h_file);
+ if (IS_ERR(h_file))
+ goto out;
-+
++ if (!is_sync_kiocb(kio)) {
++ /* .vs. sb_start_write() in aio_write() */
++ if (S_ISREG(inode->i_mode))
++ __sb_writers_acquired(inode->i_sb, SB_FREEZE_WRITE);
++ file_end_write(file);
++ }
+ err = au_do_iter(h_file, MAY_WRITE, kio, iov_iter);
+ au_write_post(inode, h_file, &wpre, err);
+
@@ -16179,8 +16205,8 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c
linux/fs/aufs/f_op.c
+};
diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.c
--- /usr/share/empty/fs/aufs/fsctx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fsctx.c 2022-11-05 23:02:18.965889284 +0100
-@@ -0,0 +1,1242 @@
++++ linux/fs/aufs/fsctx.c 2024-10-26 23:59:56.219248059 +0200
+@@ -0,0 +1,1244 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2022 Junjiro R. Okajima
@@ -16243,6 +16269,8 @@ diff -urN /usr/share/empty/fs/aufs/fsctx.c
linux/fs/aufs/fsctx.c
+
+ root = fc->root;
+ sb = root->d_sb;
++ root = sb->s_root; /* "bind"-mount may give us non-root */
++ AuDebugOn(!IS_ROOT(root));
+ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
+ if (!err) {
+ di_write_lock_child(root);
@@ -17425,7 +17453,7 @@ diff -urN /usr/share/empty/fs/aufs/fsctx.c
linux/fs/aufs/fsctx.c
+}
diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
--- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/fstype.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,401 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -17830,7 +17858,7 @@ diff -urN /usr/share/empty/fs/aufs/fstype.h
linux/fs/aufs/fstype.h
+#endif /* __AUFS_FSTYPE_H__ */
diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h
--- /usr/share/empty/fs/aufs/hbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hbl.h 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/hbl.h 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -17899,7 +17927,7 @@ diff -urN /usr/share/empty/fs/aufs/hbl.h
linux/fs/aufs/hbl.h
+#endif /* __AUFS_HBL_H__ */
diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
--- /usr/share/empty/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000
+0100
-+++ linux/fs/aufs/hfsnotify.c 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/hfsnotify.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,290 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -18193,7 +18221,7 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c
linux/fs/aufs/hfsnotify.c
+};
diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
--- /usr/share/empty/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsplus.c 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/hfsplus.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -18257,7 +18285,7 @@ diff -urN /usr/share/empty/fs/aufs/hfsplus.c
linux/fs/aufs/hfsplus.c
+}
diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
--- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/hnotify.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,715 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -18976,7 +19004,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c
linux/fs/aufs/hnotify.c
+}
diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
--- /usr/share/empty/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/iinfo.c 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/iinfo.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,286 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -19266,7 +19294,7 @@ diff -urN /usr/share/empty/fs/aufs/iinfo.c
linux/fs/aufs/iinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
--- /usr/share/empty/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/inode.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,531 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -19801,7 +19829,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.c
linux/fs/aufs/inode.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/inode.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,707 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -20512,7 +20540,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h
linux/fs/aufs/inode.h
+#endif /* __AUFS_INODE_H__ */
diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
--- /usr/share/empty/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/ioctl.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,220 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -20736,7 +20764,7 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c
linux/fs/aufs/ioctl.c
+#endif
diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
--- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000
+0100
-+++ linux/fs/aufs/i_op_add.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/i_op_add.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,972 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -21712,7 +21740,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c
linux/fs/aufs/i_op_add.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/i_op.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,1516 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -23232,7 +23260,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c
linux/fs/aufs/i_op.c
+};
diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
--- /usr/share/empty/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000
+0100
-+++ linux/fs/aufs/i_op_del.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/i_op_del.c 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,523 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -23759,7 +23787,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c
linux/fs/aufs/i_op_del.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
--- /usr/share/empty/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000
+0100
-+++ linux/fs/aufs/i_op_ren.c 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/i_op_ren.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,1260 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -25023,7 +25051,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_ren.c
linux/fs/aufs/i_op_ren.c
+}
diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
--- /usr/share/empty/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Kconfig 2022-11-05 23:02:18.959222617 +0100
++++ linux/fs/aufs/Kconfig 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,199 @@
+# SPDX-License-Identifier: GPL-2.0
+config AUFS_FS
@@ -25226,7 +25254,7 @@ diff -urN /usr/share/empty/fs/aufs/Kconfig
linux/fs/aufs/Kconfig
+endif
diff -urN /usr/share/empty/fs/aufs/lcnt.h linux/fs/aufs/lcnt.h
--- /usr/share/empty/fs/aufs/lcnt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/lcnt.h 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/lcnt.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,186 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -25416,7 +25444,7 @@ diff -urN /usr/share/empty/fs/aufs/lcnt.h
linux/fs/aufs/lcnt.h
+#endif /* __AUFS_LCNT_H__ */
diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
--- /usr/share/empty/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.c 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/loop.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -25568,7 +25596,7 @@ diff -urN /usr/share/empty/fs/aufs/loop.c
linux/fs/aufs/loop.c
+}
diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
--- /usr/share/empty/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.h 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/loop.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -25627,7 +25655,7 @@ diff -urN /usr/share/empty/fs/aufs/loop.h
linux/fs/aufs/loop.h
+#endif /* __AUFS_LOOP_H__ */
diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
--- /usr/share/empty/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/magic.mk 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/magic.mk 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -25662,7 +25690,7 @@ diff -urN /usr/share/empty/fs/aufs/magic.mk
linux/fs/aufs/magic.mk
+endif
diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
--- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile 2022-11-05 23:02:18.959222617 +0100
++++ linux/fs/aufs/Makefile 2024-10-26 23:59:56.219248059 +0200
@@ -0,0 +1,46 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -25712,7 +25740,7 @@ diff -urN /usr/share/empty/fs/aufs/Makefile
linux/fs/aufs/Makefile
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
--- /usr/share/empty/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/module.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -25989,7 +26017,7 @@ diff -urN /usr/share/empty/fs/aufs/module.c
linux/fs/aufs/module.c
+module_exit(aufs_exit);
diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
--- /usr/share/empty/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/module.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,180 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -26173,7 +26201,7 @@ diff -urN /usr/share/empty/fs/aufs/module.h
linux/fs/aufs/module.h
+#endif /* __AUFS_MODULE_H__ */
diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
--- /usr/share/empty/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/mvdown.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,706 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -26883,7 +26911,7 @@ diff -urN /usr/share/empty/fs/aufs/mvdown.c
linux/fs/aufs/mvdown.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
--- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c 2024-04-08 14:48:48.296574603 +0200
++++ linux/fs/aufs/opts.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,1032 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -27919,7 +27947,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c
linux/fs/aufs/opts.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
--- /usr/share/empty/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h 2024-04-08 14:48:47.529907936 +0200
++++ linux/fs/aufs/opts.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,263 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -28186,7 +28214,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.h
linux/fs/aufs/opts.h
+#endif /* __AUFS_OPTS_H__ */
diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
--- /usr/share/empty/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/plink.c 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/plink.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,516 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -28706,7 +28734,7 @@ diff -urN /usr/share/empty/fs/aufs/plink.c
linux/fs/aufs/plink.c
+}
diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
--- /usr/share/empty/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/poll.c 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/poll.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -28761,7 +28789,7 @@ diff -urN /usr/share/empty/fs/aufs/poll.c
linux/fs/aufs/poll.c
+}
diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
--- /usr/share/empty/fs/aufs/posix_acl.c 1970-01-01 01:00:00.000000000
+0100
-+++ linux/fs/aufs/posix_acl.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/posix_acl.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -28873,7 +28901,7 @@ diff -urN /usr/share/empty/fs/aufs/posix_acl.c
linux/fs/aufs/posix_acl.c
+}
diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
--- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/procfs.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -29047,7 +29075,7 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c
linux/fs/aufs/procfs.c
+}
diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
--- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c 2024-04-08 14:48:47.533241270 +0200
++++ linux/fs/aufs/rdu.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,384 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -29435,7 +29463,7 @@ diff -urN /usr/share/empty/fs/aufs/rdu.c
linux/fs/aufs/rdu.c
+#endif
diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
--- /usr/share/empty/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/rwsem.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -29491,10 +29519,10 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h
linux/fs/aufs/rwsem.h
+ && debug_locks \
+ && lockdep_is_held(rw))
+#else
-+#define AuRwMustReadLock(rw) do {} while (0)
-+#define AuRwMustWriteLock(rw) do {} while (0)
-+#define AuRwMustAnyLock(rw) do {} while (0)
-+#define AuRwDestroy(rw) do {} while (0)
++AuStubVoid(AuRwMustReadLock, struct rw_semaphore *rw)
++AuStubVoid(AuRwMustWriteLock, struct rw_semaphore *rw)
++AuStubVoid(AuRwMustAnyLock, struct rw_semaphore *rw)
++AuStubVoid(AuRwDestroy, struct rw_semaphore *rw)
+#endif
+
+#define au_rw_init(rw) init_rwsem(rw)
@@ -29524,7 +29552,7 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h
linux/fs/aufs/rwsem.h
+#endif /* __AUFS_RWSEM_H__ */
diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
--- /usr/share/empty/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sbinfo.c 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/sbinfo.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,316 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -29844,7 +29872,7 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c
linux/fs/aufs/sbinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
--- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c 2023-10-10 22:51:18.033248030 +0200
++++ linux/fs/aufs/super.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,871 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -30719,7 +30747,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c
linux/fs/aufs/super.c
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2024-04-08 14:48:47.533241270 +0200
++++ linux/fs/aufs/super.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,592 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -31315,7 +31343,7 @@ diff -urN /usr/share/empty/fs/aufs/super.h
linux/fs/aufs/super.h
+#endif /* __AUFS_SUPER_H__ */
diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
--- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c 2023-10-10 22:51:18.033248030 +0200
++++ linux/fs/aufs/sysaufs.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -31413,7 +31441,7 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c
linux/fs/aufs/sysaufs.c
+}
diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
--- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.h 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/sysaufs.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -31519,7 +31547,7 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.h
linux/fs/aufs/sysaufs.h
+#endif /* __SYSAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
--- /usr/share/empty/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysfs.c 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/sysfs.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,374 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -31897,7 +31925,7 @@ diff -urN /usr/share/empty/fs/aufs/sysfs.c
linux/fs/aufs/sysfs.c
+}
diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
--- /usr/share/empty/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysrq.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/sysrq.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -32050,7 +32078,7 @@ diff -urN /usr/share/empty/fs/aufs/sysrq.c
linux/fs/aufs/sysrq.c
+}
diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
--- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c 2024-04-08 14:48:47.533241270 +0200
++++ linux/fs/aufs/vdir.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,896 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -32950,7 +32978,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c
linux/fs/aufs/vdir.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2024-04-08 14:48:47.533241270 +0200
++++ linux/fs/aufs/vfsub.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,918 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -33872,7 +33900,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c
linux/fs/aufs/vfsub.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2024-04-08 14:48:47.533241270 +0200
++++ linux/fs/aufs/vfsub.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,403 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -34279,7 +34307,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h
linux/fs/aufs/vfsub.h
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000
+0100
-+++ linux/fs/aufs/wbr_policy.c 2024-04-08 14:48:47.533241270 +0200
++++ linux/fs/aufs/wbr_policy.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -35113,7 +35141,7 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c
linux/fs/aufs/wbr_policy.c
+};
diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/whout.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,1072 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -36189,7 +36217,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.c
linux/fs/aufs/whout.c
+}
diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
--- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/whout.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,87 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -36280,7 +36308,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.h
linux/fs/aufs/whout.h
+#endif /* __AUFS_WHOUT_H__ */
diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
--- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c 2022-11-05 23:02:18.972555950 +0100
++++ linux/fs/aufs/wkq.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,372 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -36656,7 +36684,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c
linux/fs/aufs/wkq.c
+}
diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
--- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h 2024-04-08 14:48:47.533241270 +0200
++++ linux/fs/aufs/wkq.h 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -36749,7 +36777,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h
linux/fs/aufs/wkq.h
+#endif /* __AUFS_WKQ_H__ */
diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
--- /usr/share/empty/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c 2024-04-08 14:48:48.296574603 +0200
++++ linux/fs/aufs/xattr.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,360 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -36853,7 +36881,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c
linux/fs/aufs/xattr.c
+ err = 0;
+ else if (err == -EOPNOTSUPP
+ && (ignore_flags & au_xattr_out_of_list))
-+ err = 0;
++ err = 0;
+ else if (err && (verbose || au_debug_test()))
+ pr_err("%s, err %d\n", name, err);
+ goto out;
@@ -37113,7 +37141,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c
linux/fs/aufs/xattr.c
+}
diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
--- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c 2023-10-31 09:31:04.203214083 +0100
++++ linux/fs/aufs/xino.c 2024-10-26 23:59:56.222581366 +0200
@@ -0,0 +1,1926 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -39043,7 +39071,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c
linux/fs/aufs/xino.c
+}
diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h
linux/include/uapi/linux/aufs_type.h
--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h 2024-04-08 14:48:48.296574603
+0200
++++ linux/include/uapi/linux/aufs_type.h 2024-10-26 23:59:56.222581366
+0200
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
@@ -39087,7 +39115,7 @@ diff -urN
/usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+#include <limits.h>
+#endif /* __KERNEL__ */
+
-+#define AUFS_VERSION "6.6-20240226"
++#define AUFS_VERSION "6.6-20240923"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39648,10 +39676,10 @@ index 1fefc6a8d049..86f1f66305d2 100644
static int loop_clr_fd(struct loop_device *lo)
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index fa8a517ffd0c..c18f7bcef81b 100644
+index d109c1392d60..dfe82d9c6292 100644
--- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c
-@@ -311,7 +311,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct
iov_iter *iov_iter)
+@@ -317,7 +317,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct
iov_iter *iov_iter)
if (IS_ERR(h_file))
goto out;
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index eb5851bc..fe7d77ea 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -2637,6 +2637,7 @@ HID_ZYDACRON all=m
HID_SENSOR_HUB all=m
HID_SENSOR_CUSTOM_SENSOR all=m
HID_ALPS all=m
+HID_MCP2200 all=m
HID_MCP2221 all=m
#- file drivers/hid/bpf/Kconfig goes here
#- file drivers/hid/usbhid/Kconfig goes here
@@ -13746,10 +13747,10 @@ ZSWAP_COMPRESSOR_DEFAULT_LZ4 all=n
ZSWAP_COMPRESSOR_DEFAULT_LZ4HC all=n
ZSWAP_COMPRESSOR_DEFAULT_ZSTD all=n
ZSWAP_ZPOOL_DEFAULT_ZBUD all=y
-ZSWAP_ZPOOL_DEFAULT_Z3FOLD all=n
+ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED all=n
ZSWAP_ZPOOL_DEFAULT_ZSMALLOC all=n
ZBUD all=y
-Z3FOLD all=m
+Z3FOLD_DEPRECATED all=m
ZSMALLOC all=y
ZSMALLOC_STAT all=y
ZSMALLOC_CHAIN_SIZE all=8
@@ -14945,6 +14946,9 @@ GCC_PLUGIN_LATENT_ENTROPY all=n
#-
#- file security/keys/Kconfig goes here
SECURITY_DMESG_RESTRICT all=y
+PROC_MEM_ALWAYS_FORCE all=y
+PROC_MEM_FORCE_PTRACE all=n
+PROC_MEM_NO_FORCE all=n
SECURITY all=y
SECURITYFS all=y
SECURITY_NETWORK all=y
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/6eba5801dc4f468e5d1070c2ddd43f58bc77f109
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
