diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config index b727f122..5053a85c 100644 --- a/kernel/kernel/files/configs/kernel-x86_64-config +++ b/kernel/kernel/files/configs/kernel-x86_64-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.15.125 Kernel Configuration +# Linux/x86_64 5.15.131 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Pisi Linux) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/kernel/kernel/files/patches/aufs5/aufs5-mmap.patch b/kernel/kernel/files/patches/aufs5/aufs5-mmap.patch index c74ea225..443d3a9b 100644 --- a/kernel/kernel/files/patches/aufs5/aufs5-mmap.patch +++ b/kernel/kernel/files/patches/aufs5/aufs5-mmap.patch @@ -179,7 +179,7 @@ index 00e391e75880..d8b52d814319 100644 if (page->mapping != mapping) { unlock_page(page); diff --git a/mm/mmap.c b/mm/mmap.c -index 6bb553ed5c55..3f9d6d155171 100644 +index 6bb553ed5c55..44a7823a0de3 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -183,7 +183,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) @@ -200,6 +200,15 @@ index 6bb553ed5c55..3f9d6d155171 100644 } if (next->anon_vma) anon_vma_merge(vma, next); +@@ -1810,7 +1810,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, + * fput the vma->vm_file here or we would add an extra fput for file + * and cause general protection fault ultimately. + */ +- fput(vma->vm_file); ++ vma_fput(vma); + vm_area_free(vma); + vma = merge; + /* Update vm_flags to pick up the change. */ @@ -1873,7 +1873,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, return addr; @@ -253,7 +262,7 @@ index 6bb553ed5c55..3f9d6d155171 100644 + new_vma = find_vma(mm, ret); + if (!new_vma->vm_prfile) + new_vma->vm_prfile = prfile; -+ if (new_vma != vma) ++ if (prfile) + get_file(prfile); + } + /* diff --git a/kernel/kernel/files/patches/aufs5/aufs5.15.41-20230227.patch b/kernel/kernel/files/patches/aufs5/aufs5.15.41-20230828.patch similarity index 98% rename from kernel/kernel/files/patches/aufs5/aufs5.15.41-20230227.patch rename to kernel/kernel/files/patches/aufs5/aufs5.15.41-20230828.patch index 7c9a89c2..d89c609b 100644 --- a/kernel/kernel/files/patches/aufs5/aufs5.15.41-20230227.patch +++ b/kernel/kernel/files/patches/aufs5/aufs5.15.41-20230828.patch @@ -1,6 +1,6 @@ -diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.41/Documentation/ABI/testing/debugfs-aufs +diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.131/Documentation/ABI/testing/debugfs-aufs --- /dev/null -+++ linux-5.15.41/Documentation/ABI/testing/debugfs-aufs 2023-05-03 15:06:21.698490052 +0300 ++++ linux-5.15.131/Documentation/ABI/testing/debugfs-aufs 2023-09-11 14:32:48.142722627 +0300 @@ -0,0 +1,55 @@ +What: /debug/aufs/si_/ +Date: March 2009 @@ -57,9 +57,9 @@ diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.41/Documentati + be created. + When the aufs mount option 'noxino' is specified, it + will be empty. About XINO files, see the aufs manual. -diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-5.15.41/Documentation/ABI/testing/sysfs-aufs +diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-5.15.131/Documentation/ABI/testing/sysfs-aufs --- /dev/null -+++ linux-5.15.41/Documentation/ABI/testing/sysfs-aufs 2023-05-03 15:06:21.698490052 +0300 ++++ linux-5.15.131/Documentation/ABI/testing/sysfs-aufs 2023-09-11 14:32:48.142722627 +0300 @@ -0,0 +1,31 @@ +What: /sys/fs/aufs/si_/ +Date: March 2009 @@ -92,9 +92,9 @@ diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-5.15.41/Documentation + even if it is the default path. + When the aufs mount option 'noxino' is specified, it + will be empty. About XINO files, see the aufs manual. -diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt +diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.131/Documentation/filesystems/aufs/design/01intro.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt 2023-05-03 15:06:21.698490052 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/01intro.txt 2023-09-11 14:32:48.142722627 +0300 @@ -0,0 +1,171 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -267,9 +267,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.41/ +Some people may think it is better to pass such work to user space +helper, instead of doing in kernel space. Actually I am still thinking +about it. But currently I have implemented it in kernel space. -diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt +diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.131/Documentation/filesystems/aufs/design/02struct.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt 2023-05-03 15:06:21.698490052 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/02struct.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,258 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -529,9 +529,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.41 +- etc. + +For this purpose, use "aumvdown" command in aufs-util.git. -diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt +diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5.15.131/Documentation/filesystems/aufs/design/03atomic_open.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/03atomic_open.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,85 @@ + +# Copyright (C) 2015-2021 Junjiro R. Okajima @@ -618,9 +618,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5. + ->atomic_open() are lost. in the ordinary case, the checks are + done by VFS:do_last(), lookup_open() and atomic_open(). some can + be implemented in aufs, but not all I am afraid. -diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt +diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.131/Documentation/filesystems/aufs/design/03lookup.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/03lookup.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,113 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -735,9 +735,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.41 + test, and skip the revalidation in step 4. It is useful and improves + aufs performance when system surely hide the aufs branches from user, + by over-mounting something (or another method). -diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt +diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.131/Documentation/filesystems/aufs/design/04branch.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/04branch.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,74 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -813,9 +813,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.41 + - a file on the branch is mmap-ed. + - a regular file on the branch is opened for write and there is no + same named entry on the upper branch. -diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt +diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.15.131/Documentation/filesystems/aufs/design/05wbr_policy.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/05wbr_policy.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,64 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -881,9 +881,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.1 + where the source and the target exists and selects the higher + one. If the selected branch is readonly, then aufs follows the + copyup policy. -diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot +diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.131/Documentation/filesystems/aufs/design/06dirren.dot --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/06dirren.dot 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,31 @@ + +// to view this graph, run dot(1) command in GRAPHVIZ. @@ -916,9 +916,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.41 + +aufs_lookup -> whinfo [label="load/remove"]; +} -diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt +diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.131/Documentation/filesystems/aufs/design/06dirren.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/06dirren.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,102 @@ + +# Copyright (C) 2017-2021 Junjiro R. Okajima @@ -1022,9 +1022,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.41 +contains two names, before- and after-rename, the name comparision in +UDBA handler may not work correctly. In this case, the behaviour will be +equivalen to udba=reval case. -diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt +diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.131/Documentation/filesystems/aufs/design/06fhsm.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/06fhsm.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,120 @@ + +# Copyright (C) 2011-2021 Junjiro R. Okajima @@ -1146,9 +1146,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.41/D + +And of course, in every step, an error may happen. So the operation +should restore the original file state after an error happens. -diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt +diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.131/Documentation/filesystems/aufs/design/06mmap.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/06mmap.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,72 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1222,9 +1222,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.41/D + equivalent to vm_prfile described above. + +I have to give up this "looks-smater" approach. -diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt +diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.131/Documentation/filesystems/aufs/design/06xattr.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/06xattr.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,96 @@ + +# Copyright (C) 2014-2021 Junjiro R. Okajima @@ -1322,9 +1322,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.41/ +Some contradiction may happen I am afraid. +Do we need another attribute to stop copying XATTR? I am unsure. For +now, aufs implements the branch attributes to ignore the error. -diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt +diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.131/Documentation/filesystems/aufs/design/07export.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/07export.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,58 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1384,9 +1384,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.41 + convert it into ESTALE for NFSD. +- readdir(): call lockdep_on/off() because filldir in NFSD calls + lookup_one_len(), vfs_getattr(), encode_fh() and others. -diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt +diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.131/Documentation/filesystems/aufs/design/08shwh.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/08shwh.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,52 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1440,9 +1440,9 @@ diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.41/D + +This new squashfs archive can be stored on the boot device and the +initramfs will use it to replace the old one at the next boot. -diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt +diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.131/Documentation/filesystems/aufs/design/10dynop.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt 2023-05-03 15:06:21.699490040 +0300 ++++ linux-5.15.131/Documentation/filesystems/aufs/design/10dynop.txt 2023-09-11 14:32:48.143722614 +0300 @@ -0,0 +1,47 @@ + +# Copyright (C) 2010-2021 Junjiro R. Okajima @@ -1491,10 +1491,10 @@ diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.41/ +XIP (DAX) mainly. +Currently this approach is applied to address_space_operations for +regular files only. -diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentation/filesystems/aufs/README +diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.131/Documentation/filesystems/aufs/README --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/README 2023-05-03 15:06:21.698490052 +0300 -@@ -0,0 +1,406 @@ ++++ linux-5.15.131/Documentation/filesystems/aufs/README 2023-09-11 14:32:48.142722627 +0300 +@@ -0,0 +1,407 @@ + +Aufs5 -- advanced multi layered unification filesystem version 5.x +http://aufs.sf.net @@ -1883,7 +1883,8 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio +James Burry made a donation (2016/12). +Carsten Rose made a donation (2018/9). +Porteus Kiosk made a donation (2018/10). -+Enya Quetzalli Gomez Rodriguez made a donation (2022/5). ++huronOS team: Enya Quetzalli made donations (2022/5, 2023/5 and 8). ++Vasily Mikhaylichenko made a donation (2023/5). + +Thank you very much. +Donations are always, including future donations, very important and @@ -1901,9 +1902,9 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio +# Local variables: ; +# mode: text; +# End: ; -diff -Naur null/fs/aufs/aufs.h linux-5.15.41/fs/aufs/aufs.h +diff -Naur null/fs/aufs/aufs.h linux-5.15.131/fs/aufs/aufs.h --- /dev/null -+++ linux-5.15.41/fs/aufs/aufs.h 2023-05-03 15:06:21.700490027 +0300 ++++ linux-5.15.131/fs/aufs/aufs.h 2023-09-11 14:32:48.145722589 +0300 @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -1967,9 +1968,9 @@ diff -Naur null/fs/aufs/aufs.h linux-5.15.41/fs/aufs/aufs.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_H__ */ -diff -Naur null/fs/aufs/branch.c linux-5.15.41/fs/aufs/branch.c +diff -Naur null/fs/aufs/branch.c linux-5.15.131/fs/aufs/branch.c --- /dev/null -+++ linux-5.15.41/fs/aufs/branch.c 2023-05-03 15:06:21.701490015 +0300 ++++ linux-5.15.131/fs/aufs/branch.c 2023-09-11 14:32:48.145722589 +0300 @@ -0,0 +1,1427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -3398,9 +3399,9 @@ diff -Naur null/fs/aufs/branch.c linux-5.15.41/fs/aufs/branch.c + + return err; +} -diff -Naur null/fs/aufs/branch.h linux-5.15.41/fs/aufs/branch.h +diff -Naur null/fs/aufs/branch.h linux-5.15.131/fs/aufs/branch.h --- /dev/null -+++ linux-5.15.41/fs/aufs/branch.h 2023-05-03 15:06:21.701490015 +0300 ++++ linux-5.15.131/fs/aufs/branch.h 2023-09-11 14:32:48.145722589 +0300 @@ -0,0 +1,375 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -3777,9 +3778,9 @@ diff -Naur null/fs/aufs/branch.h linux-5.15.41/fs/aufs/branch.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_BRANCH_H__ */ -diff -Naur null/fs/aufs/conf.mk linux-5.15.41/fs/aufs/conf.mk +diff -Naur null/fs/aufs/conf.mk linux-5.15.131/fs/aufs/conf.mk --- /dev/null -+++ linux-5.15.41/fs/aufs/conf.mk 2023-05-03 15:06:21.701490015 +0300 ++++ linux-5.15.131/fs/aufs/conf.mk 2023-09-11 14:32:48.145722589 +0300 @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -3821,9 +3822,9 @@ diff -Naur null/fs/aufs/conf.mk linux-5.15.41/fs/aufs/conf.mk +${obj}/sysfs.o: ${AuConfName} + +-include ${srctree}/${src}/conf_priv.mk -diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c +diff -Naur null/fs/aufs/cpup.c linux-5.15.131/fs/aufs/cpup.c --- /dev/null -+++ linux-5.15.41/fs/aufs/cpup.c 2023-05-03 15:06:21.701490015 +0300 ++++ linux-5.15.131/fs/aufs/cpup.c 2023-09-11 14:32:48.145722589 +0300 @@ -0,0 +1,1459 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5284,9 +5285,9 @@ diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c + dput(parent); + return err; +} -diff -Naur null/fs/aufs/cpup.h linux-5.15.41/fs/aufs/cpup.h +diff -Naur null/fs/aufs/cpup.h linux-5.15.131/fs/aufs/cpup.h --- /dev/null -+++ linux-5.15.41/fs/aufs/cpup.h 2023-05-03 15:06:21.701490015 +0300 ++++ linux-5.15.131/fs/aufs/cpup.h 2023-09-11 14:32:48.145722589 +0300 @@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5388,9 +5389,9 @@ diff -Naur null/fs/aufs/cpup.h linux-5.15.41/fs/aufs/cpup.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_CPUP_H__ */ -diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.41/fs/aufs/dbgaufs.c +diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.131/fs/aufs/dbgaufs.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dbgaufs.c 2023-05-03 15:06:21.701490015 +0300 ++++ linux-5.15.131/fs/aufs/dbgaufs.c 2023-09-11 14:32:48.145722589 +0300 @@ -0,0 +1,526 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5918,9 +5919,9 @@ diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.41/fs/aufs/dbgaufs.c + err = 0; + return err; +} -diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.41/fs/aufs/dbgaufs.h +diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.131/fs/aufs/dbgaufs.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dbgaufs.h 2023-05-03 15:06:21.701490015 +0300 ++++ linux-5.15.131/fs/aufs/dbgaufs.h 2023-09-11 14:32:48.146722577 +0300 @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5975,9 +5976,9 @@ diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.41/fs/aufs/dbgaufs.h + +#endif /* __KERNEL__ */ +#endif /* __DBGAUFS_H__ */ -diff -Naur null/fs/aufs/dcsub.c linux-5.15.41/fs/aufs/dcsub.c +diff -Naur null/fs/aufs/dcsub.c linux-5.15.131/fs/aufs/dcsub.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dcsub.c 2023-05-03 15:06:21.701490015 +0300 ++++ linux-5.15.131/fs/aufs/dcsub.c 2023-09-11 14:32:48.146722577 +0300 @@ -0,0 +1,225 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6204,9 +6205,9 @@ diff -Naur null/fs/aufs/dcsub.c linux-5.15.41/fs/aufs/dcsub.c + + return path_is_under(path + 0, path + 1); +} -diff -Naur null/fs/aufs/dcsub.h linux-5.15.41/fs/aufs/dcsub.h +diff -Naur null/fs/aufs/dcsub.h linux-5.15.131/fs/aufs/dcsub.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dcsub.h 2023-05-03 15:06:21.702490002 +0300 ++++ linux-5.15.131/fs/aufs/dcsub.h 2023-09-11 14:32:48.146722577 +0300 @@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -6345,9 +6346,9 @@ diff -Naur null/fs/aufs/dcsub.h linux-5.15.41/fs/aufs/dcsub.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DCSUB_H__ */ -diff -Naur null/fs/aufs/debug.c linux-5.15.41/fs/aufs/debug.c +diff -Naur null/fs/aufs/debug.c linux-5.15.131/fs/aufs/debug.c --- /dev/null -+++ linux-5.15.41/fs/aufs/debug.c 2023-05-03 15:06:21.702490002 +0300 ++++ linux-5.15.131/fs/aufs/debug.c 2023-09-11 14:32:48.146722577 +0300 @@ -0,0 +1,444 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6793,9 +6794,9 @@ diff -Naur null/fs/aufs/debug.c linux-5.15.41/fs/aufs/debug.c + + return 0; +} -diff -Naur null/fs/aufs/debug.h linux-5.15.41/fs/aufs/debug.h +diff -Naur null/fs/aufs/debug.h linux-5.15.131/fs/aufs/debug.h --- /dev/null -+++ linux-5.15.41/fs/aufs/debug.h 2023-05-03 15:06:21.702490002 +0300 ++++ linux-5.15.131/fs/aufs/debug.h 2023-09-11 14:32:48.146722577 +0300 @@ -0,0 +1,226 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -7023,9 +7024,9 @@ diff -Naur null/fs/aufs/debug.h linux-5.15.41/fs/aufs/debug.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DEBUG_H__ */ -diff -Naur null/fs/aufs/dentry.c linux-5.15.41/fs/aufs/dentry.c +diff -Naur null/fs/aufs/dentry.c linux-5.15.131/fs/aufs/dentry.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dentry.c 2023-05-03 15:06:21.702490002 +0300 ++++ linux-5.15.131/fs/aufs/dentry.c 2023-09-11 14:32:48.146722577 +0300 @@ -0,0 +1,1168 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -8195,9 +8196,9 @@ diff -Naur null/fs/aufs/dentry.c linux-5.15.41/fs/aufs/dentry.c +const struct dentry_operations aufs_dop_noreval = { + .d_release = aufs_d_release +}; -diff -Naur null/fs/aufs/dentry.h linux-5.15.41/fs/aufs/dentry.h +diff -Naur null/fs/aufs/dentry.h linux-5.15.131/fs/aufs/dentry.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dentry.h 2023-05-03 15:06:21.702490002 +0300 ++++ linux-5.15.131/fs/aufs/dentry.h 2023-09-11 14:32:48.146722577 +0300 @@ -0,0 +1,269 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -8468,9 +8469,9 @@ diff -Naur null/fs/aufs/dentry.h linux-5.15.41/fs/aufs/dentry.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DENTRY_H__ */ -diff -Naur null/fs/aufs/dinfo.c linux-5.15.41/fs/aufs/dinfo.c +diff -Naur null/fs/aufs/dinfo.c linux-5.15.131/fs/aufs/dinfo.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dinfo.c 2023-05-03 15:06:21.702490002 +0300 ++++ linux-5.15.131/fs/aufs/dinfo.c 2023-09-11 14:32:48.146722577 +0300 @@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9026,9 +9027,9 @@ diff -Naur null/fs/aufs/dinfo.c linux-5.15.41/fs/aufs/dinfo.c + return bindex; + return -1; +} -diff -Naur null/fs/aufs/dir.c linux-5.15.41/fs/aufs/dir.c +diff -Naur null/fs/aufs/dir.c linux-5.15.131/fs/aufs/dir.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dir.c 2023-05-03 15:06:21.702490002 +0300 ++++ linux-5.15.131/fs/aufs/dir.c 2023-09-11 14:32:48.146722577 +0300 @@ -0,0 +1,765 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9795,9 +9796,9 @@ diff -Naur null/fs/aufs/dir.c linux-5.15.41/fs/aufs/dir.c + .flush = aufs_flush_dir, + .fsync = aufs_fsync_dir +}; -diff -Naur null/fs/aufs/dir.h linux-5.15.41/fs/aufs/dir.h +diff -Naur null/fs/aufs/dir.h linux-5.15.131/fs/aufs/dir.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dir.h 2023-05-03 15:06:21.702490002 +0300 ++++ linux-5.15.131/fs/aufs/dir.h 2023-09-11 14:32:48.147722564 +0300 @@ -0,0 +1,134 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -9933,9 +9934,9 @@ diff -Naur null/fs/aufs/dir.h linux-5.15.41/fs/aufs/dir.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DIR_H__ */ -diff -Naur null/fs/aufs/dirren.c linux-5.15.41/fs/aufs/dirren.c +diff -Naur null/fs/aufs/dirren.c linux-5.15.131/fs/aufs/dirren.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dirren.c 2023-05-03 15:06:21.703489990 +0300 ++++ linux-5.15.131/fs/aufs/dirren.c 2023-09-11 14:32:48.147722564 +0300 @@ -0,0 +1,1315 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11252,9 +11253,9 @@ diff -Naur null/fs/aufs/dirren.c linux-5.15.41/fs/aufs/dirren.c +out: + return err; +} -diff -Naur null/fs/aufs/dirren.h linux-5.15.41/fs/aufs/dirren.h +diff -Naur null/fs/aufs/dirren.h linux-5.15.131/fs/aufs/dirren.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dirren.h 2023-05-03 15:06:21.703489990 +0300 ++++ linux-5.15.131/fs/aufs/dirren.h 2023-09-11 14:32:48.147722564 +0300 @@ -0,0 +1,140 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11396,9 +11397,9 @@ diff -Naur null/fs/aufs/dirren.h linux-5.15.41/fs/aufs/dirren.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DIRREN_H__ */ -diff -Naur null/fs/aufs/dynop.c linux-5.15.41/fs/aufs/dynop.c +diff -Naur null/fs/aufs/dynop.c linux-5.15.131/fs/aufs/dynop.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dynop.c 2023-05-03 15:06:21.703489990 +0300 ++++ linux-5.15.131/fs/aufs/dynop.c 2023-09-11 14:32:48.147722564 +0300 @@ -0,0 +1,368 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11768,9 +11769,9 @@ diff -Naur null/fs/aufs/dynop.c linux-5.15.41/fs/aufs/dynop.c + for (i = 0; i < AuDyLast; i++) + WARN_ON(!hlist_bl_empty(dynop + i)); +} -diff -Naur null/fs/aufs/dynop.h linux-5.15.41/fs/aufs/dynop.h +diff -Naur null/fs/aufs/dynop.h linux-5.15.131/fs/aufs/dynop.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dynop.h 2023-05-03 15:06:21.703489990 +0300 ++++ linux-5.15.131/fs/aufs/dynop.h 2023-09-11 14:32:48.147722564 +0300 @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11849,9 +11850,9 @@ diff -Naur null/fs/aufs/dynop.h linux-5.15.41/fs/aufs/dynop.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DYNOP_H__ */ -diff -Naur null/fs/aufs/export.c linux-5.15.41/fs/aufs/export.c +diff -Naur null/fs/aufs/export.c linux-5.15.131/fs/aufs/export.c --- /dev/null -+++ linux-5.15.41/fs/aufs/export.c 2023-05-03 15:06:21.703489990 +0300 ++++ linux-5.15.131/fs/aufs/export.c 2023-09-11 14:32:48.147722564 +0300 @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -12683,9 +12684,9 @@ diff -Naur null/fs/aufs/export.c linux-5.15.41/fs/aufs/export.c + BUILD_BUG_ON(sizeof(u) != sizeof(int)); + atomic_set(&sbinfo->si_xigen_next, u); +} -diff -Naur null/fs/aufs/fhsm.c linux-5.15.41/fs/aufs/fhsm.c +diff -Naur null/fs/aufs/fhsm.c linux-5.15.131/fs/aufs/fhsm.c --- /dev/null -+++ linux-5.15.41/fs/aufs/fhsm.c 2023-05-03 15:06:21.703489990 +0300 ++++ linux-5.15.131/fs/aufs/fhsm.c 2023-09-11 14:32:48.147722564 +0300 @@ -0,0 +1,427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13114,9 +13115,9 @@ diff -Naur null/fs/aufs/fhsm.c linux-5.15.41/fs/aufs/fhsm.c + if (u != AUFS_FHSM_CACHE_DEF_SEC) + seq_printf(seq, ",fhsm_sec=%u", u); +} -diff -Naur null/fs/aufs/file.c linux-5.15.41/fs/aufs/file.c +diff -Naur null/fs/aufs/file.c linux-5.15.131/fs/aufs/file.c --- /dev/null -+++ linux-5.15.41/fs/aufs/file.c 2023-05-03 15:06:21.703489990 +0300 ++++ linux-5.15.131/fs/aufs/file.c 2023-09-11 14:32:48.148722552 +0300 @@ -0,0 +1,863 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13981,9 +13982,9 @@ diff -Naur null/fs/aufs/file.c linux-5.15.41/fs/aufs/file.c + .swap_deactivate = aufs_swap_deactivate +#endif /* CONFIG_AUFS_DEBUG */ +}; -diff -Naur null/fs/aufs/file.h linux-5.15.41/fs/aufs/file.h +diff -Naur null/fs/aufs/file.h linux-5.15.131/fs/aufs/file.h --- /dev/null -+++ linux-5.15.41/fs/aufs/file.h 2023-05-03 15:06:21.704489977 +0300 ++++ linux-5.15.131/fs/aufs/file.h 2023-09-11 14:32:48.148722552 +0300 @@ -0,0 +1,342 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -14327,9 +14328,9 @@ diff -Naur null/fs/aufs/file.h linux-5.15.41/fs/aufs/file.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_FILE_H__ */ -diff -Naur null/fs/aufs/finfo.c linux-5.15.41/fs/aufs/finfo.c +diff -Naur null/fs/aufs/finfo.c linux-5.15.131/fs/aufs/finfo.c --- /dev/null -+++ linux-5.15.41/fs/aufs/finfo.c 2023-05-03 15:06:21.704489977 +0300 ++++ linux-5.15.131/fs/aufs/finfo.c 2023-09-11 14:32:48.148722552 +0300 @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -14480,9 +14481,9 @@ diff -Naur null/fs/aufs/finfo.c linux-5.15.41/fs/aufs/finfo.c +out: + return err; +} -diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c +diff -Naur null/fs/aufs/f_op.c linux-5.15.131/fs/aufs/f_op.c --- /dev/null -+++ linux-5.15.41/fs/aufs/f_op.c 2023-05-03 15:06:21.703489990 +0300 ++++ linux-5.15.131/fs/aufs/f_op.c 2023-09-11 14:32:48.147722564 +0300 @@ -0,0 +1,775 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -15259,9 +15260,9 @@ diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c + .fallocate = aufs_fallocate, + .copy_file_range = aufs_copy_file_range +}; -diff -Naur null/fs/aufs/fsctx.c linux-5.15.41/fs/aufs/fsctx.c +diff -Naur null/fs/aufs/fsctx.c linux-5.15.131/fs/aufs/fsctx.c --- /dev/null -+++ linux-5.15.41/fs/aufs/fsctx.c 2023-05-03 15:06:21.704489977 +0300 ++++ linux-5.15.131/fs/aufs/fsctx.c 2023-09-11 14:32:48.148722552 +0300 @@ -0,0 +1,1242 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -16505,9 +16506,9 @@ diff -Naur null/fs/aufs/fsctx.c linux-5.15.41/fs/aufs/fsctx.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/fstype.h linux-5.15.41/fs/aufs/fstype.h +diff -Naur null/fs/aufs/fstype.h linux-5.15.131/fs/aufs/fstype.h --- /dev/null -+++ linux-5.15.41/fs/aufs/fstype.h 2023-05-03 15:06:21.704489977 +0300 ++++ linux-5.15.131/fs/aufs/fstype.h 2023-09-11 14:32:48.148722552 +0300 @@ -0,0 +1,401 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -16910,9 +16911,9 @@ diff -Naur null/fs/aufs/fstype.h linux-5.15.41/fs/aufs/fstype.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_FSTYPE_H__ */ -diff -Naur null/fs/aufs/hbl.h linux-5.15.41/fs/aufs/hbl.h +diff -Naur null/fs/aufs/hbl.h linux-5.15.131/fs/aufs/hbl.h --- /dev/null -+++ linux-5.15.41/fs/aufs/hbl.h 2023-05-03 15:06:21.704489977 +0300 ++++ linux-5.15.131/fs/aufs/hbl.h 2023-09-11 14:32:48.148722552 +0300 @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -16979,9 +16980,9 @@ diff -Naur null/fs/aufs/hbl.h linux-5.15.41/fs/aufs/hbl.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_HBL_H__ */ -diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.41/fs/aufs/hfsnotify.c +diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.131/fs/aufs/hfsnotify.c --- /dev/null -+++ linux-5.15.41/fs/aufs/hfsnotify.c 2023-05-03 15:06:21.704489977 +0300 ++++ linux-5.15.131/fs/aufs/hfsnotify.c 2023-09-11 14:32:48.148722552 +0300 @@ -0,0 +1,288 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17271,9 +17272,9 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.41/fs/aufs/hfsnotify.c + .fin_br = au_hfsn_fin_br, + .init_br = au_hfsn_init_br +}; -diff -Naur null/fs/aufs/hfsplus.c linux-5.15.41/fs/aufs/hfsplus.c +diff -Naur null/fs/aufs/hfsplus.c linux-5.15.131/fs/aufs/hfsplus.c --- /dev/null -+++ linux-5.15.41/fs/aufs/hfsplus.c 2023-05-03 15:06:21.704489977 +0300 ++++ linux-5.15.131/fs/aufs/hfsplus.c 2023-09-11 14:32:48.148722552 +0300 @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17335,9 +17336,9 @@ diff -Naur null/fs/aufs/hfsplus.c linux-5.15.41/fs/aufs/hfsplus.c + au_lcnt_dec(&br->br_nfiles); + } +} -diff -Naur null/fs/aufs/hnotify.c linux-5.15.41/fs/aufs/hnotify.c +diff -Naur null/fs/aufs/hnotify.c linux-5.15.131/fs/aufs/hnotify.c --- /dev/null -+++ linux-5.15.41/fs/aufs/hnotify.c 2023-05-03 15:06:21.704489977 +0300 ++++ linux-5.15.131/fs/aufs/hnotify.c 2023-09-11 14:32:48.149722539 +0300 @@ -0,0 +1,715 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18054,9 +18055,9 @@ diff -Naur null/fs/aufs/hnotify.c linux-5.15.41/fs/aufs/hnotify.c + if (au_cache[AuCache_HNOTIFY]) + au_hn_destroy_cache(); +} -diff -Naur null/fs/aufs/iinfo.c linux-5.15.41/fs/aufs/iinfo.c +diff -Naur null/fs/aufs/iinfo.c linux-5.15.131/fs/aufs/iinfo.c --- /dev/null -+++ linux-5.15.41/fs/aufs/iinfo.c 2023-05-03 15:06:21.705489965 +0300 ++++ linux-5.15.131/fs/aufs/iinfo.c 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18344,9 +18345,9 @@ diff -Naur null/fs/aufs/iinfo.c linux-5.15.41/fs/aufs/iinfo.c + au_kfree_rcu(iinfo->ii_hinode); + AuRwDestroy(&iinfo->ii_rwsem); +} -diff -Naur null/fs/aufs/inode.c linux-5.15.41/fs/aufs/inode.c +diff -Naur null/fs/aufs/inode.c linux-5.15.131/fs/aufs/inode.c --- /dev/null -+++ linux-5.15.41/fs/aufs/inode.c 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/inode.c 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,531 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18879,9 +18880,9 @@ diff -Naur null/fs/aufs/inode.c linux-5.15.41/fs/aufs/inode.c + mask |= MAY_READ; /* force permission check */ + return au_test_h_perm(h_userns, h_inode, mask); +} -diff -Naur null/fs/aufs/inode.h linux-5.15.41/fs/aufs/inode.h +diff -Naur null/fs/aufs/inode.h linux-5.15.131/fs/aufs/inode.h --- /dev/null -+++ linux-5.15.41/fs/aufs/inode.h 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/inode.h 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,705 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -19588,9 +19589,9 @@ diff -Naur null/fs/aufs/inode.h linux-5.15.41/fs/aufs/inode.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_INODE_H__ */ -diff -Naur null/fs/aufs/ioctl.c linux-5.15.41/fs/aufs/ioctl.c +diff -Naur null/fs/aufs/ioctl.c linux-5.15.131/fs/aufs/ioctl.c --- /dev/null -+++ linux-5.15.41/fs/aufs/ioctl.c 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/ioctl.c 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -19812,9 +19813,9 @@ diff -Naur null/fs/aufs/ioctl.c linux-5.15.41/fs/aufs/ioctl.c + return aufs_ioctl_nondir(file, cmd, (unsigned long)compat_ptr(arg)); +} +#endif -diff -Naur null/fs/aufs/i_op_add.c linux-5.15.41/fs/aufs/i_op_add.c +diff -Naur null/fs/aufs/i_op_add.c linux-5.15.131/fs/aufs/i_op_add.c --- /dev/null -+++ linux-5.15.41/fs/aufs/i_op_add.c 2023-05-03 15:06:21.705489965 +0300 ++++ linux-5.15.131/fs/aufs/i_op_add.c 2023-09-11 14:32:48.149722539 +0300 @@ -0,0 +1,941 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -20757,9 +20758,9 @@ diff -Naur null/fs/aufs/i_op_add.c linux-5.15.41/fs/aufs/i_op_add.c +out: + return err; +} -diff -Naur null/fs/aufs/i_op.c linux-5.15.41/fs/aufs/i_op.c +diff -Naur null/fs/aufs/i_op.c linux-5.15.131/fs/aufs/i_op.c --- /dev/null -+++ linux-5.15.41/fs/aufs/i_op.c 2023-05-03 15:06:21.705489965 +0300 ++++ linux-5.15.131/fs/aufs/i_op.c 2023-09-11 14:32:48.149722539 +0300 @@ -0,0 +1,1512 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22273,9 +22274,9 @@ diff -Naur null/fs/aufs/i_op.c linux-5.15.41/fs/aufs/i_op.c + .update_time = aufs_update_time + } +}; -diff -Naur null/fs/aufs/i_op_del.c linux-5.15.41/fs/aufs/i_op_del.c +diff -Naur null/fs/aufs/i_op_del.c linux-5.15.131/fs/aufs/i_op_del.c --- /dev/null -+++ linux-5.15.41/fs/aufs/i_op_del.c 2023-05-03 15:06:21.705489965 +0300 ++++ linux-5.15.131/fs/aufs/i_op_del.c 2023-09-11 14:32:48.149722539 +0300 @@ -0,0 +1,522 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22799,9 +22800,9 @@ diff -Naur null/fs/aufs/i_op_del.c linux-5.15.41/fs/aufs/i_op_del.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.41/fs/aufs/i_op_ren.c +diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.131/fs/aufs/i_op_ren.c --- /dev/null -+++ linux-5.15.41/fs/aufs/i_op_ren.c 2023-05-03 15:06:21.705489965 +0300 ++++ linux-5.15.131/fs/aufs/i_op_ren.c 2023-09-11 14:32:48.149722539 +0300 @@ -0,0 +1,1257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24060,9 +24061,9 @@ diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.41/fs/aufs/i_op_ren.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/Kconfig linux-5.15.41/fs/aufs/Kconfig +diff -Naur null/fs/aufs/Kconfig linux-5.15.131/fs/aufs/Kconfig --- /dev/null -+++ linux-5.15.41/fs/aufs/Kconfig 2023-05-03 15:06:21.700490027 +0300 ++++ linux-5.15.131/fs/aufs/Kconfig 2023-09-11 14:32:48.145722589 +0300 @@ -0,0 +1,199 @@ +# SPDX-License-Identifier: GPL-2.0 +config AUFS_FS @@ -24263,9 +24264,9 @@ diff -Naur null/fs/aufs/Kconfig linux-5.15.41/fs/aufs/Kconfig + Automatic configuration for internal use. + When aufs supports Magic SysRq, enabled automatically. +endif -diff -Naur null/fs/aufs/lcnt.h linux-5.15.41/fs/aufs/lcnt.h +diff -Naur null/fs/aufs/lcnt.h linux-5.15.131/fs/aufs/lcnt.h --- /dev/null -+++ linux-5.15.41/fs/aufs/lcnt.h 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/lcnt.h 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,186 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24453,9 +24454,9 @@ diff -Naur null/fs/aufs/lcnt.h linux-5.15.41/fs/aufs/lcnt.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_LCNT_H__ */ -diff -Naur null/fs/aufs/loop.c linux-5.15.41/fs/aufs/loop.c +diff -Naur null/fs/aufs/loop.c linux-5.15.131/fs/aufs/loop.c --- /dev/null -+++ linux-5.15.41/fs/aufs/loop.c 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/loop.c 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24605,9 +24606,9 @@ diff -Naur null/fs/aufs/loop.c linux-5.15.41/fs/aufs/loop.c + symbol_put(loop_backing_file); + au_kfree_try_rcu(au_warn_loopback_array); +} -diff -Naur null/fs/aufs/loop.h linux-5.15.41/fs/aufs/loop.h +diff -Naur null/fs/aufs/loop.h linux-5.15.131/fs/aufs/loop.h --- /dev/null -+++ linux-5.15.41/fs/aufs/loop.h 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/loop.h 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24664,9 +24665,9 @@ diff -Naur null/fs/aufs/loop.h linux-5.15.41/fs/aufs/loop.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_LOOP_H__ */ -diff -Naur null/fs/aufs/magic.mk linux-5.15.41/fs/aufs/magic.mk +diff -Naur null/fs/aufs/magic.mk linux-5.15.131/fs/aufs/magic.mk --- /dev/null -+++ linux-5.15.41/fs/aufs/magic.mk 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/magic.mk 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -24699,9 +24700,9 @@ diff -Naur null/fs/aufs/magic.mk linux-5.15.41/fs/aufs/magic.mk +ifdef CONFIG_HFSPLUS_FS +ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b +endif -diff -Naur null/fs/aufs/Makefile linux-5.15.41/fs/aufs/Makefile +diff -Naur null/fs/aufs/Makefile linux-5.15.131/fs/aufs/Makefile --- /dev/null -+++ linux-5.15.41/fs/aufs/Makefile 2023-05-03 15:06:21.700490027 +0300 ++++ linux-5.15.131/fs/aufs/Makefile 2023-09-11 14:32:48.145722589 +0300 @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -24749,9 +24750,9 @@ diff -Naur null/fs/aufs/Makefile linux-5.15.41/fs/aufs/Makefile +aufs-$(CONFIG_AUFS_BR_HFSPLUS) += hfsplus.o +aufs-$(CONFIG_AUFS_DEBUG) += debug.o +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o -diff -Naur null/fs/aufs/module.c linux-5.15.41/fs/aufs/module.c +diff -Naur null/fs/aufs/module.c linux-5.15.131/fs/aufs/module.c --- /dev/null -+++ linux-5.15.41/fs/aufs/module.c 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/module.c 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,273 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25026,9 +25027,9 @@ diff -Naur null/fs/aufs/module.c linux-5.15.41/fs/aufs/module.c + +module_init(aufs_init); +module_exit(aufs_exit); -diff -Naur null/fs/aufs/module.h linux-5.15.41/fs/aufs/module.h +diff -Naur null/fs/aufs/module.h linux-5.15.131/fs/aufs/module.h --- /dev/null -+++ linux-5.15.41/fs/aufs/module.h 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/module.h 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -25196,9 +25197,9 @@ diff -Naur null/fs/aufs/module.h linux-5.15.41/fs/aufs/module.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_MODULE_H__ */ -diff -Naur null/fs/aufs/mvdown.c linux-5.15.41/fs/aufs/mvdown.c +diff -Naur null/fs/aufs/mvdown.c linux-5.15.131/fs/aufs/mvdown.c --- /dev/null -+++ linux-5.15.41/fs/aufs/mvdown.c 2023-05-03 15:06:21.706489952 +0300 ++++ linux-5.15.131/fs/aufs/mvdown.c 2023-09-11 14:32:48.150722527 +0300 @@ -0,0 +1,706 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25906,9 +25907,9 @@ diff -Naur null/fs/aufs/mvdown.c linux-5.15.41/fs/aufs/mvdown.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/opts.c linux-5.15.41/fs/aufs/opts.c +diff -Naur null/fs/aufs/opts.c linux-5.15.131/fs/aufs/opts.c --- /dev/null -+++ linux-5.15.41/fs/aufs/opts.c 2023-05-03 15:06:21.707489940 +0300 ++++ linux-5.15.131/fs/aufs/opts.c 2023-09-11 14:32:48.151722514 +0300 @@ -0,0 +1,1032 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -26942,9 +26943,9 @@ diff -Naur null/fs/aufs/opts.c linux-5.15.41/fs/aufs/opts.c +{ + return au_mntflags(sb) & AuOptMask_UDBA; +} -diff -Naur null/fs/aufs/opts.h linux-5.15.41/fs/aufs/opts.h +diff -Naur null/fs/aufs/opts.h linux-5.15.131/fs/aufs/opts.h --- /dev/null -+++ linux-5.15.41/fs/aufs/opts.h 2023-05-03 15:06:21.707489940 +0300 ++++ linux-5.15.131/fs/aufs/opts.h 2023-09-11 14:32:48.151722514 +0300 @@ -0,0 +1,263 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -27209,9 +27210,9 @@ diff -Naur null/fs/aufs/opts.h linux-5.15.41/fs/aufs/opts.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_OPTS_H__ */ -diff -Naur null/fs/aufs/plink.c linux-5.15.41/fs/aufs/plink.c +diff -Naur null/fs/aufs/plink.c linux-5.15.131/fs/aufs/plink.c --- /dev/null -+++ linux-5.15.41/fs/aufs/plink.c 2023-05-03 15:06:21.707489940 +0300 ++++ linux-5.15.131/fs/aufs/plink.c 2023-09-11 14:32:48.151722514 +0300 @@ -0,0 +1,516 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27729,9 +27730,9 @@ diff -Naur null/fs/aufs/plink.c linux-5.15.41/fs/aufs/plink.c + } + } +} -diff -Naur null/fs/aufs/poll.c linux-5.15.41/fs/aufs/poll.c +diff -Naur null/fs/aufs/poll.c linux-5.15.131/fs/aufs/poll.c --- /dev/null -+++ linux-5.15.41/fs/aufs/poll.c 2023-05-03 15:06:21.707489940 +0300 ++++ linux-5.15.131/fs/aufs/poll.c 2023-09-11 14:32:48.151722514 +0300 @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27784,9 +27785,9 @@ diff -Naur null/fs/aufs/poll.c linux-5.15.41/fs/aufs/poll.c + AuDbg("mask 0x%x\n", mask); + return mask; +} -diff -Naur null/fs/aufs/posix_acl.c linux-5.15.41/fs/aufs/posix_acl.c +diff -Naur null/fs/aufs/posix_acl.c linux-5.15.131/fs/aufs/posix_acl.c --- /dev/null -+++ linux-5.15.41/fs/aufs/posix_acl.c 2023-05-03 15:06:21.707489940 +0300 ++++ linux-5.15.131/fs/aufs/posix_acl.c 2023-09-11 14:32:48.151722514 +0300 @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27899,9 +27900,9 @@ diff -Naur null/fs/aufs/posix_acl.c linux-5.15.41/fs/aufs/posix_acl.c +out: + return err; +} -diff -Naur null/fs/aufs/procfs.c linux-5.15.41/fs/aufs/procfs.c +diff -Naur null/fs/aufs/procfs.c linux-5.15.131/fs/aufs/procfs.c --- /dev/null -+++ linux-5.15.41/fs/aufs/procfs.c 2023-05-03 15:06:21.707489940 +0300 ++++ linux-5.15.131/fs/aufs/procfs.c 2023-09-11 14:32:48.151722514 +0300 @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28073,9 +28074,9 @@ diff -Naur null/fs/aufs/procfs.c linux-5.15.41/fs/aufs/procfs.c +out: + return err; +} -diff -Naur null/fs/aufs/rdu.c linux-5.15.41/fs/aufs/rdu.c +diff -Naur null/fs/aufs/rdu.c linux-5.15.131/fs/aufs/rdu.c --- /dev/null -+++ linux-5.15.41/fs/aufs/rdu.c 2023-05-03 15:06:21.707489940 +0300 ++++ linux-5.15.131/fs/aufs/rdu.c 2023-09-11 14:32:48.151722514 +0300 @@ -0,0 +1,384 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28461,9 +28462,9 @@ diff -Naur null/fs/aufs/rdu.c linux-5.15.41/fs/aufs/rdu.c + return err; +} +#endif -diff -Naur null/fs/aufs/rwsem.h linux-5.15.41/fs/aufs/rwsem.h +diff -Naur null/fs/aufs/rwsem.h linux-5.15.131/fs/aufs/rwsem.h --- /dev/null -+++ linux-5.15.41/fs/aufs/rwsem.h 2023-05-03 15:06:21.707489940 +0300 ++++ linux-5.15.131/fs/aufs/rwsem.h 2023-09-11 14:32:48.152722502 +0300 @@ -0,0 +1,85 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -28550,9 +28551,9 @@ diff -Naur null/fs/aufs/rwsem.h linux-5.15.41/fs/aufs/rwsem.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_RWSEM_H__ */ -diff -Naur null/fs/aufs/sbinfo.c linux-5.15.41/fs/aufs/sbinfo.c +diff -Naur null/fs/aufs/sbinfo.c linux-5.15.131/fs/aufs/sbinfo.c --- /dev/null -+++ linux-5.15.41/fs/aufs/sbinfo.c 2023-05-03 15:06:21.707489940 +0300 ++++ linux-5.15.131/fs/aufs/sbinfo.c 2023-09-11 14:32:48.152722502 +0300 @@ -0,0 +1,316 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28870,9 +28871,9 @@ diff -Naur null/fs/aufs/sbinfo.c linux-5.15.41/fs/aufs/sbinfo.c + di_write_unlock2(d1, d2); + si_read_unlock(d1->d_sb); +} -diff -Naur null/fs/aufs/super.c linux-5.15.41/fs/aufs/super.c +diff -Naur null/fs/aufs/super.c linux-5.15.131/fs/aufs/super.c --- /dev/null -+++ linux-5.15.41/fs/aufs/super.c 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/super.c 2023-09-11 14:32:48.152722502 +0300 @@ -0,0 +1,871 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29745,9 +29746,9 @@ diff -Naur null/fs/aufs/super.c linux-5.15.41/fs/aufs/super.c + /* no need to __module_get() and module_put(). */ + .owner = THIS_MODULE, +}; -diff -Naur null/fs/aufs/super.h linux-5.15.41/fs/aufs/super.h +diff -Naur null/fs/aufs/super.h linux-5.15.131/fs/aufs/super.h --- /dev/null -+++ linux-5.15.41/fs/aufs/super.h 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/super.h 2023-09-11 14:32:48.152722502 +0300 @@ -0,0 +1,592 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -30341,9 +30342,9 @@ diff -Naur null/fs/aufs/super.h linux-5.15.41/fs/aufs/super.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_SUPER_H__ */ -diff -Naur null/fs/aufs/sysaufs.c linux-5.15.41/fs/aufs/sysaufs.c +diff -Naur null/fs/aufs/sysaufs.c linux-5.15.131/fs/aufs/sysaufs.c --- /dev/null -+++ linux-5.15.41/fs/aufs/sysaufs.c 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/sysaufs.c 2023-09-11 14:32:48.152722502 +0300 @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30438,9 +30439,9 @@ diff -Naur null/fs/aufs/sysaufs.c linux-5.15.41/fs/aufs/sysaufs.c +out: + return err; +} -diff -Naur null/fs/aufs/sysaufs.h linux-5.15.41/fs/aufs/sysaufs.h +diff -Naur null/fs/aufs/sysaufs.h linux-5.15.131/fs/aufs/sysaufs.h --- /dev/null -+++ linux-5.15.41/fs/aufs/sysaufs.h 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/sysaufs.h 2023-09-11 14:32:48.152722502 +0300 @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -30544,9 +30545,9 @@ diff -Naur null/fs/aufs/sysaufs.h linux-5.15.41/fs/aufs/sysaufs.h + +#endif /* __KERNEL__ */ +#endif /* __SYSAUFS_H__ */ -diff -Naur null/fs/aufs/sysfs.c linux-5.15.41/fs/aufs/sysfs.c +diff -Naur null/fs/aufs/sysfs.c linux-5.15.131/fs/aufs/sysfs.c --- /dev/null -+++ linux-5.15.41/fs/aufs/sysfs.c 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/sysfs.c 2023-09-11 14:32:48.152722502 +0300 @@ -0,0 +1,374 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30922,9 +30923,9 @@ diff -Naur null/fs/aufs/sysfs.c linux-5.15.41/fs/aufs/sysfs.c + } + } +} -diff -Naur null/fs/aufs/sysrq.c linux-5.15.41/fs/aufs/sysrq.c +diff -Naur null/fs/aufs/sysrq.c linux-5.15.131/fs/aufs/sysrq.c --- /dev/null -+++ linux-5.15.41/fs/aufs/sysrq.c 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/sysrq.c 2023-09-11 14:32:48.152722502 +0300 @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31075,9 +31076,9 @@ diff -Naur null/fs/aufs/sysrq.c linux-5.15.41/fs/aufs/sysrq.c + if (unlikely(err)) + pr_err("err %d (ignored)\n", err); +} -diff -Naur null/fs/aufs/vdir.c linux-5.15.41/fs/aufs/vdir.c +diff -Naur null/fs/aufs/vdir.c linux-5.15.131/fs/aufs/vdir.c --- /dev/null -+++ linux-5.15.41/fs/aufs/vdir.c 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/vdir.c 2023-09-11 14:32:48.153722489 +0300 @@ -0,0 +1,896 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31975,9 +31976,9 @@ diff -Naur null/fs/aufs/vdir.c linux-5.15.41/fs/aufs/vdir.c + /* smp_mb(); */ + return 0; +} -diff -Naur null/fs/aufs/vfsub.c linux-5.15.41/fs/aufs/vfsub.c +diff -Naur null/fs/aufs/vfsub.c linux-5.15.131/fs/aufs/vfsub.c --- /dev/null -+++ linux-5.15.41/fs/aufs/vfsub.c 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/vfsub.c 2023-09-11 14:32:48.153722489 +0300 @@ -0,0 +1,918 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -32897,9 +32898,9 @@ diff -Naur null/fs/aufs/vfsub.c linux-5.15.41/fs/aufs/vfsub.c + + return err; +} -diff -Naur null/fs/aufs/vfsub.h linux-5.15.41/fs/aufs/vfsub.h +diff -Naur null/fs/aufs/vfsub.h linux-5.15.131/fs/aufs/vfsub.h --- /dev/null -+++ linux-5.15.41/fs/aufs/vfsub.h 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/vfsub.h 2023-09-11 14:32:48.153722489 +0300 @@ -0,0 +1,358 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -33259,9 +33260,9 @@ diff -Naur null/fs/aufs/vfsub.h linux-5.15.41/fs/aufs/vfsub.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_VFSUB_H__ */ -diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.41/fs/aufs/wbr_policy.c +diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.131/fs/aufs/wbr_policy.c --- /dev/null -+++ linux-5.15.41/fs/aufs/wbr_policy.c 2023-05-03 15:06:21.708489927 +0300 ++++ linux-5.15.131/fs/aufs/wbr_policy.c 2023-09-11 14:32:48.153722489 +0300 @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -34093,9 +34094,9 @@ diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.41/fs/aufs/wbr_policy.c + .fin = au_wbr_create_fin_mfs + } +}; -diff -Naur null/fs/aufs/whout.c linux-5.15.41/fs/aufs/whout.c +diff -Naur null/fs/aufs/whout.c linux-5.15.131/fs/aufs/whout.c --- /dev/null -+++ linux-5.15.41/fs/aufs/whout.c 2023-05-03 15:06:21.709489915 +0300 ++++ linux-5.15.131/fs/aufs/whout.c 2023-09-11 14:32:48.153722489 +0300 @@ -0,0 +1,1072 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35169,9 +35170,9 @@ diff -Naur null/fs/aufs/whout.c linux-5.15.41/fs/aufs/whout.c + au_whtmp_rmdir_free(args); + } +} -diff -Naur null/fs/aufs/whout.h linux-5.15.41/fs/aufs/whout.h +diff -Naur null/fs/aufs/whout.h linux-5.15.131/fs/aufs/whout.h --- /dev/null -+++ linux-5.15.41/fs/aufs/whout.h 2023-05-03 15:06:21.709489915 +0300 ++++ linux-5.15.131/fs/aufs/whout.h 2023-09-11 14:32:48.153722489 +0300 @@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -35260,9 +35261,9 @@ diff -Naur null/fs/aufs/whout.h linux-5.15.41/fs/aufs/whout.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_WHOUT_H__ */ -diff -Naur null/fs/aufs/wkq.c linux-5.15.41/fs/aufs/wkq.c +diff -Naur null/fs/aufs/wkq.c linux-5.15.131/fs/aufs/wkq.c --- /dev/null -+++ linux-5.15.41/fs/aufs/wkq.c 2023-05-03 15:06:21.709489915 +0300 ++++ linux-5.15.131/fs/aufs/wkq.c 2023-09-11 14:32:48.153722489 +0300 @@ -0,0 +1,372 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35636,9 +35637,9 @@ diff -Naur null/fs/aufs/wkq.c linux-5.15.41/fs/aufs/wkq.c + + return err; +} -diff -Naur null/fs/aufs/wkq.h linux-5.15.41/fs/aufs/wkq.h +diff -Naur null/fs/aufs/wkq.h linux-5.15.131/fs/aufs/wkq.h --- /dev/null -+++ linux-5.15.41/fs/aufs/wkq.h 2023-05-03 15:06:21.709489915 +0300 ++++ linux-5.15.131/fs/aufs/wkq.h 2023-09-11 14:32:48.154722477 +0300 @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -35729,9 +35730,9 @@ diff -Naur null/fs/aufs/wkq.h linux-5.15.41/fs/aufs/wkq.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_WKQ_H__ */ -diff -Naur null/fs/aufs/xattr.c linux-5.15.41/fs/aufs/xattr.c +diff -Naur null/fs/aufs/xattr.c linux-5.15.131/fs/aufs/xattr.c --- /dev/null -+++ linux-5.15.41/fs/aufs/xattr.c 2023-05-03 15:06:21.709489915 +0300 ++++ linux-5.15.131/fs/aufs/xattr.c 2023-09-11 14:32:48.154722477 +0300 @@ -0,0 +1,368 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -36101,9 +36102,9 @@ diff -Naur null/fs/aufs/xattr.c linux-5.15.41/fs/aufs/xattr.c +{ + sb->s_xattr = au_xattr_handlers; +} -diff -Naur null/fs/aufs/xino.c linux-5.15.41/fs/aufs/xino.c +diff -Naur null/fs/aufs/xino.c linux-5.15.131/fs/aufs/xino.c --- /dev/null -+++ linux-5.15.41/fs/aufs/xino.c 2023-05-03 15:06:21.709489915 +0300 ++++ linux-5.15.131/fs/aufs/xino.c 2023-09-11 14:32:48.154722477 +0300 @@ -0,0 +1,1926 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -38031,9 +38032,9 @@ diff -Naur null/fs/aufs/xino.c linux-5.15.41/fs/aufs/xino.c +out: + return err; +} -diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.41/include/uapi/linux/aufs_type.h +diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.131/include/uapi/linux/aufs_type.h --- /dev/null -+++ linux-5.15.41/include/uapi/linux/aufs_type.h 2023-05-03 15:06:21.710489902 +0300 ++++ linux-5.15.131/include/uapi/linux/aufs_type.h 2023-09-11 14:32:48.154722477 +0300 @@ -0,0 +1,452 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* @@ -38077,7 +38078,7 @@ diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.41/include/uapi/linux/ +#include +#endif /* __KERNEL__ */ + -+#define AUFS_VERSION "5.15.41-20230227" ++#define AUFS_VERSION "5.15.41-20230828" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') diff --git a/kernel/kernel/files/patches/linux/patch-5.15.125.xz b/kernel/kernel/files/patches/linux/patch-5.15.125.xz deleted file mode 100644 index c033122a..00000000 Binary files a/kernel/kernel/files/patches/linux/patch-5.15.125.xz and /dev/null differ diff --git a/kernel/kernel/files/patches/linux/patch-5.15.131.xz b/kernel/kernel/files/patches/linux/patch-5.15.131.xz new file mode 100644 index 00000000..c842c842 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-5.15.131.xz differ diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index 7b348733..3095f093 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -33,10 +33,10 @@ - patches/linux/patch-5.15.125.xz + patches/linux/patch-5.15.131.xz - patches/aufs5/aufs5.15.41-20230227.patch + patches/aufs5/aufs5.15.41-20230828.patch patches/aufs5/aufs5-base.patch patches/aufs5/aufs5-loopback.patch patches/aufs5/aufs5-kbuild.patch @@ -156,6 +156,17 @@ + + 2023-09-11 + 5.15.131 + Version bump + security + + systemRestart + + Mustafa Cinasal + muscnsl@gmail.com + 2023-08-09 5.15.125