diff --git a/kernel/tools/perf/files/patches/aufs5/aufs5-base.patch b/kernel/tools/perf/files/patches/aufs5/aufs5-base.patch index 42ebd27110..b37e855f41 100644 --- a/kernel/tools/perf/files/patches/aufs5/aufs5-base.patch +++ b/kernel/tools/perf/files/patches/aufs5/aufs5-base.patch @@ -1,5 +1,5 @@ SPDX-License-Identifier: GPL-2.0 -aufs5.15.36 base patch +aufs5.15.41 base patch diff --git a/MAINTAINERS b/MAINTAINERS index c8103e57a70b..e1b9eaca78fd 100644 diff --git a/kernel/tools/perf/files/patches/aufs5/aufs5-kbuild.patch b/kernel/tools/perf/files/patches/aufs5/aufs5-kbuild.patch index 79c3f92c55..aa8869f06c 100644 --- a/kernel/tools/perf/files/patches/aufs5/aufs5-kbuild.patch +++ b/kernel/tools/perf/files/patches/aufs5/aufs5-kbuild.patch @@ -1,5 +1,5 @@ SPDX-License-Identifier: GPL-2.0 -aufs5.15.36 kbuild patch +aufs5.15.41 kbuild patch diff --git a/fs/Kconfig b/fs/Kconfig index a6313a969bc5..aca4b89d41a1 100644 diff --git a/kernel/tools/perf/files/patches/aufs5/aufs5-loopback.patch b/kernel/tools/perf/files/patches/aufs5/aufs5-loopback.patch index 1011fb54a4..753437f378 100644 --- a/kernel/tools/perf/files/patches/aufs5/aufs5-loopback.patch +++ b/kernel/tools/perf/files/patches/aufs5/aufs5-loopback.patch @@ -1,5 +1,5 @@ SPDX-License-Identifier: GPL-2.0 -aufs5.15.36 loopback patch +aufs5.15.41 loopback patch diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 7a9e40b97831..5ed06240cc9c 100644 diff --git a/kernel/tools/perf/files/patches/aufs5/aufs5-mmap.patch b/kernel/tools/perf/files/patches/aufs5/aufs5-mmap.patch index a8b2040c77..05ee1b401b 100644 --- a/kernel/tools/perf/files/patches/aufs5/aufs5-mmap.patch +++ b/kernel/tools/perf/files/patches/aufs5/aufs5-mmap.patch @@ -1,5 +1,5 @@ SPDX-License-Identifier: GPL-2.0 -aufs5.15.36 mmap patch +aufs5.15.41 mmap patch diff --git a/fs/proc/base.c b/fs/proc/base.c index 1f394095eb88..93f2479ef319 100644 @@ -72,7 +72,7 @@ index a6d21fc0033c..02c2de31196e 100644 ino = inode->i_ino; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; diff --git a/include/linux/mm.h b/include/linux/mm.h -index 90c2d7f3c7a8..ab1b20fa5837 100644 +index 04345ff97f8c..4ab9bb75c894 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1813,6 +1813,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -166,7 +166,7 @@ index fc60a40ce954..d45773672730 100644 obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o +obj-$(CONFIG_AUFS_FS:m=y) += prfile.o diff --git a/mm/filemap.c b/mm/filemap.c -index 1293c3409e42..42b012b99f4e 100644 +index 00e391e75880..d8b52d814319 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3353,7 +3353,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) diff --git a/kernel/tools/perf/files/patches/aufs5/aufs5-standalone.patch b/kernel/tools/perf/files/patches/aufs5/aufs5-standalone.patch index 63d24760ff..54fcb65bd3 100644 --- a/kernel/tools/perf/files/patches/aufs5/aufs5-standalone.patch +++ b/kernel/tools/perf/files/patches/aufs5/aufs5-standalone.patch @@ -1,5 +1,5 @@ SPDX-License-Identifier: GPL-2.0 -aufs5.15.36 standalone patch +aufs5.15.41 standalone patch diff --git a/fs/dcache.c b/fs/dcache.c index bc5095b734f5..9508bd57a3bc 100644 @@ -45,15 +45,16 @@ index 02382fa9bd34..3418c60b9014 100644 static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, int force) -diff -Nurp a/fs/file_table.c b/fs/file_table.c ---- a/fs/file_table.c 2022-03-20 22:14:17.000000000 +0200 -+++ b/fs/file_table.c 2022-04-08 20:24:23.624148779 +0300 -@@ -198,6 +198,7 @@ over: +diff --git a/fs/file_table.c b/fs/file_table.c +index e8c9016703ad..5e7a880830fb 100644 +--- a/fs/file_table.c ++++ b/fs/file_table.c +@@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred) } return ERR_PTR(-ENFILE); } +EXPORT_SYMBOL_GPL(alloc_empty_file); - + /* * Variant of alloc_empty_file() that doesn't check and modify nr_files. diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/kernel/tools/perf/files/patches/aufs5/aufs5.15.36-20220509.patch b/kernel/tools/perf/files/patches/aufs5/aufs5.15.41-20220530.patch similarity index 98% rename from kernel/tools/perf/files/patches/aufs5/aufs5.15.36-20220509.patch rename to kernel/tools/perf/files/patches/aufs5/aufs5.15.41-20220530.patch index 034b926d94..4b3bd5f39d 100644 --- a/kernel/tools/perf/files/patches/aufs5/aufs5.15.36-20220509.patch +++ b/kernel/tools/perf/files/patches/aufs5/aufs5.15.41-20220530.patch @@ -1,6 +1,6 @@ -diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.36/Documentation/ABI/testing/debugfs-aufs +diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.41/Documentation/ABI/testing/debugfs-aufs --- /dev/null -+++ linux-5.15.36/Documentation/ABI/testing/debugfs-aufs 2022-05-10 16:51:39.862744220 +0300 ++++ linux-5.15.41/Documentation/ABI/testing/debugfs-aufs 2022-05-31 16:59:51.182880353 +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.36/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.36/Documentation/ABI/testing/sysfs-aufs +diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-5.15.41/Documentation/ABI/testing/sysfs-aufs --- /dev/null -+++ linux-5.15.36/Documentation/ABI/testing/sysfs-aufs 2022-05-10 16:51:39.863744220 +0300 ++++ linux-5.15.41/Documentation/ABI/testing/sysfs-aufs 2022-05-31 16:59:51.182880353 +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.36/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.36/Documentation/filesystems/aufs/design/01intro.txt +diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/01intro.txt 2022-05-10 16:51:39.863744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt 2022-05-31 16:59:51.183880353 +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.36/ +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.36/Documentation/filesystems/aufs/design/02struct.txt +diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/02struct.txt 2022-05-10 16:51:39.863744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt 2022-05-31 16:59:51.183880353 +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.36 +- etc. + +For this purpose, use "aumvdown" command in aufs-util.git. -diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5.15.36/Documentation/filesystems/aufs/design/03atomic_open.txt +diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/03atomic_open.txt 2022-05-10 16:51:39.863744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt 2022-05-31 16:59:51.183880353 +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.36/Documentation/filesystems/aufs/design/03lookup.txt +diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/03lookup.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt 2022-05-31 16:59:51.183880353 +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.36 + 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.36/Documentation/filesystems/aufs/design/04branch.txt +diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/04branch.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt 2022-05-31 16:59:51.183880353 +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.36 + - 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.36/Documentation/filesystems/aufs/design/05wbr_policy.txt +diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/05wbr_policy.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt 2022-05-31 16:59:51.183880353 +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.36/Documentation/filesystems/aufs/design/06dirren.dot +diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/06dirren.dot 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot 2022-05-31 16:59:51.184880353 +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.36 + +aufs_lookup -> whinfo [label="load/remove"]; +} -diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.36/Documentation/filesystems/aufs/design/06dirren.txt +diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/06dirren.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt 2022-05-31 16:59:51.184880353 +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.36 +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.36/Documentation/filesystems/aufs/design/06fhsm.txt +diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/06fhsm.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt 2022-05-31 16:59:51.184880353 +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.36/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.36/Documentation/filesystems/aufs/design/06mmap.txt +diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/06mmap.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt 2022-05-31 16:59:51.184880353 +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.36/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.36/Documentation/filesystems/aufs/design/06xattr.txt +diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/06xattr.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt 2022-05-31 16:59:51.184880353 +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.36/ +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.36/Documentation/filesystems/aufs/design/07export.txt +diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/07export.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt 2022-05-31 16:59:51.184880353 +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.36 + 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.36/Documentation/filesystems/aufs/design/08shwh.txt +diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/08shwh.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt 2022-05-31 16:59:51.184880353 +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.36/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.36/Documentation/filesystems/aufs/design/10dynop.txt +diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/design/10dynop.txt 2022-05-10 16:51:39.864744220 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt 2022-05-31 16:59:51.184880353 +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.36/ +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.36/Documentation/filesystems/aufs/README +diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentation/filesystems/aufs/README --- /dev/null -+++ linux-5.15.36/Documentation/filesystems/aufs/README 2022-05-10 16:51:39.863744220 +0300 -@@ -0,0 +1,396 @@ ++++ linux-5.15.41/Documentation/filesystems/aufs/README 2022-05-31 16:59:51.183880353 +0300 +@@ -0,0 +1,397 @@ + +Aufs5 -- advanced multi layered unification filesystem version 5.x +http://aufs.sf.net @@ -1874,6 +1874,7 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.36/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). + +Thank you very much. +Donations are always, including future donations, very important and @@ -1891,9 +1892,9 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.36/Documentatio +# Local variables: ; +# mode: text; +# End: ; -diff -Naur null/fs/aufs/aufs.h linux-5.15.36/fs/aufs/aufs.h +diff -Naur null/fs/aufs/aufs.h linux-5.15.41/fs/aufs/aufs.h --- /dev/null -+++ linux-5.15.36/fs/aufs/aufs.h 2022-05-10 16:51:39.866744220 +0300 ++++ linux-5.15.41/fs/aufs/aufs.h 2022-05-31 16:59:51.186880353 +0300 @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -1957,9 +1958,9 @@ diff -Naur null/fs/aufs/aufs.h linux-5.15.36/fs/aufs/aufs.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_H__ */ -diff -Naur null/fs/aufs/branch.c linux-5.15.36/fs/aufs/branch.c +diff -Naur null/fs/aufs/branch.c linux-5.15.41/fs/aufs/branch.c --- /dev/null -+++ linux-5.15.36/fs/aufs/branch.c 2022-05-10 16:51:39.866744220 +0300 ++++ linux-5.15.41/fs/aufs/branch.c 2022-05-31 16:59:51.186880353 +0300 @@ -0,0 +1,1427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -3388,9 +3389,9 @@ diff -Naur null/fs/aufs/branch.c linux-5.15.36/fs/aufs/branch.c + + return err; +} -diff -Naur null/fs/aufs/branch.h linux-5.15.36/fs/aufs/branch.h +diff -Naur null/fs/aufs/branch.h linux-5.15.41/fs/aufs/branch.h --- /dev/null -+++ linux-5.15.36/fs/aufs/branch.h 2022-05-10 16:51:39.866744220 +0300 ++++ linux-5.15.41/fs/aufs/branch.h 2022-05-31 16:59:51.186880353 +0300 @@ -0,0 +1,375 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -3767,9 +3768,9 @@ diff -Naur null/fs/aufs/branch.h linux-5.15.36/fs/aufs/branch.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_BRANCH_H__ */ -diff -Naur null/fs/aufs/conf.mk linux-5.15.36/fs/aufs/conf.mk +diff -Naur null/fs/aufs/conf.mk linux-5.15.41/fs/aufs/conf.mk --- /dev/null -+++ linux-5.15.36/fs/aufs/conf.mk 2022-05-10 16:51:39.867744220 +0300 ++++ linux-5.15.41/fs/aufs/conf.mk 2022-05-31 16:59:51.186880353 +0300 @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -3811,9 +3812,9 @@ diff -Naur null/fs/aufs/conf.mk linux-5.15.36/fs/aufs/conf.mk +${obj}/sysfs.o: ${AuConfName} + +-include ${srctree}/${src}/conf_priv.mk -diff -Naur null/fs/aufs/cpup.c linux-5.15.36/fs/aufs/cpup.c +diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c --- /dev/null -+++ linux-5.15.36/fs/aufs/cpup.c 2022-05-10 16:51:39.867744220 +0300 ++++ linux-5.15.41/fs/aufs/cpup.c 2022-05-31 16:59:51.187880353 +0300 @@ -0,0 +1,1459 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5274,9 +5275,9 @@ diff -Naur null/fs/aufs/cpup.c linux-5.15.36/fs/aufs/cpup.c + dput(parent); + return err; +} -diff -Naur null/fs/aufs/cpup.h linux-5.15.36/fs/aufs/cpup.h +diff -Naur null/fs/aufs/cpup.h linux-5.15.41/fs/aufs/cpup.h --- /dev/null -+++ linux-5.15.36/fs/aufs/cpup.h 2022-05-10 16:51:39.867744220 +0300 ++++ linux-5.15.41/fs/aufs/cpup.h 2022-05-31 16:59:51.187880353 +0300 @@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5378,9 +5379,9 @@ diff -Naur null/fs/aufs/cpup.h linux-5.15.36/fs/aufs/cpup.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_CPUP_H__ */ -diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.36/fs/aufs/dbgaufs.c +diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.41/fs/aufs/dbgaufs.c --- /dev/null -+++ linux-5.15.36/fs/aufs/dbgaufs.c 2022-05-10 16:51:39.867744220 +0300 ++++ linux-5.15.41/fs/aufs/dbgaufs.c 2022-05-31 16:59:51.187880353 +0300 @@ -0,0 +1,526 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5908,9 +5909,9 @@ diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.36/fs/aufs/dbgaufs.c + err = 0; + return err; +} -diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.36/fs/aufs/dbgaufs.h +diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.41/fs/aufs/dbgaufs.h --- /dev/null -+++ linux-5.15.36/fs/aufs/dbgaufs.h 2022-05-10 16:51:39.867744220 +0300 ++++ linux-5.15.41/fs/aufs/dbgaufs.h 2022-05-31 16:59:51.187880353 +0300 @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5965,9 +5966,9 @@ diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.36/fs/aufs/dbgaufs.h + +#endif /* __KERNEL__ */ +#endif /* __DBGAUFS_H__ */ -diff -Naur null/fs/aufs/dcsub.c linux-5.15.36/fs/aufs/dcsub.c +diff -Naur null/fs/aufs/dcsub.c linux-5.15.41/fs/aufs/dcsub.c --- /dev/null -+++ linux-5.15.36/fs/aufs/dcsub.c 2022-05-10 16:51:39.867744220 +0300 ++++ linux-5.15.41/fs/aufs/dcsub.c 2022-05-31 16:59:51.187880353 +0300 @@ -0,0 +1,225 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6194,9 +6195,9 @@ diff -Naur null/fs/aufs/dcsub.c linux-5.15.36/fs/aufs/dcsub.c + + return path_is_under(path + 0, path + 1); +} -diff -Naur null/fs/aufs/dcsub.h linux-5.15.36/fs/aufs/dcsub.h +diff -Naur null/fs/aufs/dcsub.h linux-5.15.41/fs/aufs/dcsub.h --- /dev/null -+++ linux-5.15.36/fs/aufs/dcsub.h 2022-05-10 16:51:39.867744220 +0300 ++++ linux-5.15.41/fs/aufs/dcsub.h 2022-05-31 16:59:51.187880353 +0300 @@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -6335,9 +6336,9 @@ diff -Naur null/fs/aufs/dcsub.h linux-5.15.36/fs/aufs/dcsub.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DCSUB_H__ */ -diff -Naur null/fs/aufs/debug.c linux-5.15.36/fs/aufs/debug.c +diff -Naur null/fs/aufs/debug.c linux-5.15.41/fs/aufs/debug.c --- /dev/null -+++ linux-5.15.36/fs/aufs/debug.c 2022-05-10 16:51:39.868744219 +0300 ++++ linux-5.15.41/fs/aufs/debug.c 2022-05-31 16:59:51.187880353 +0300 @@ -0,0 +1,444 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6783,9 +6784,9 @@ diff -Naur null/fs/aufs/debug.c linux-5.15.36/fs/aufs/debug.c + + return 0; +} -diff -Naur null/fs/aufs/debug.h linux-5.15.36/fs/aufs/debug.h +diff -Naur null/fs/aufs/debug.h linux-5.15.41/fs/aufs/debug.h --- /dev/null -+++ linux-5.15.36/fs/aufs/debug.h 2022-05-10 16:51:39.868744219 +0300 ++++ linux-5.15.41/fs/aufs/debug.h 2022-05-31 16:59:51.187880353 +0300 @@ -0,0 +1,226 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -7013,9 +7014,9 @@ diff -Naur null/fs/aufs/debug.h linux-5.15.36/fs/aufs/debug.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DEBUG_H__ */ -diff -Naur null/fs/aufs/dentry.c linux-5.15.36/fs/aufs/dentry.c +diff -Naur null/fs/aufs/dentry.c linux-5.15.41/fs/aufs/dentry.c --- /dev/null -+++ linux-5.15.36/fs/aufs/dentry.c 2022-05-10 16:51:39.868744219 +0300 ++++ linux-5.15.41/fs/aufs/dentry.c 2022-05-31 16:59:51.188880353 +0300 @@ -0,0 +1,1168 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -8185,9 +8186,9 @@ diff -Naur null/fs/aufs/dentry.c linux-5.15.36/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.36/fs/aufs/dentry.h +diff -Naur null/fs/aufs/dentry.h linux-5.15.41/fs/aufs/dentry.h --- /dev/null -+++ linux-5.15.36/fs/aufs/dentry.h 2022-05-10 16:51:39.868744219 +0300 ++++ linux-5.15.41/fs/aufs/dentry.h 2022-05-31 16:59:51.188880353 +0300 @@ -0,0 +1,269 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -8458,9 +8459,9 @@ diff -Naur null/fs/aufs/dentry.h linux-5.15.36/fs/aufs/dentry.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DENTRY_H__ */ -diff -Naur null/fs/aufs/dinfo.c linux-5.15.36/fs/aufs/dinfo.c +diff -Naur null/fs/aufs/dinfo.c linux-5.15.41/fs/aufs/dinfo.c --- /dev/null -+++ linux-5.15.36/fs/aufs/dinfo.c 2022-05-10 16:51:39.869744219 +0300 ++++ linux-5.15.41/fs/aufs/dinfo.c 2022-05-31 16:59:51.188880353 +0300 @@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9016,9 +9017,9 @@ diff -Naur null/fs/aufs/dinfo.c linux-5.15.36/fs/aufs/dinfo.c + return bindex; + return -1; +} -diff -Naur null/fs/aufs/dir.c linux-5.15.36/fs/aufs/dir.c +diff -Naur null/fs/aufs/dir.c linux-5.15.41/fs/aufs/dir.c --- /dev/null -+++ linux-5.15.36/fs/aufs/dir.c 2022-05-10 16:51:39.869744219 +0300 ++++ linux-5.15.41/fs/aufs/dir.c 2022-05-31 16:59:51.188880353 +0300 @@ -0,0 +1,765 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9785,9 +9786,9 @@ diff -Naur null/fs/aufs/dir.c linux-5.15.36/fs/aufs/dir.c + .flush = aufs_flush_dir, + .fsync = aufs_fsync_dir +}; -diff -Naur null/fs/aufs/dir.h linux-5.15.36/fs/aufs/dir.h +diff -Naur null/fs/aufs/dir.h linux-5.15.41/fs/aufs/dir.h --- /dev/null -+++ linux-5.15.36/fs/aufs/dir.h 2022-05-10 16:51:39.869744219 +0300 ++++ linux-5.15.41/fs/aufs/dir.h 2022-05-31 16:59:51.189880353 +0300 @@ -0,0 +1,134 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -9923,9 +9924,9 @@ diff -Naur null/fs/aufs/dir.h linux-5.15.36/fs/aufs/dir.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DIR_H__ */ -diff -Naur null/fs/aufs/dirren.c linux-5.15.36/fs/aufs/dirren.c +diff -Naur null/fs/aufs/dirren.c linux-5.15.41/fs/aufs/dirren.c --- /dev/null -+++ linux-5.15.36/fs/aufs/dirren.c 2022-05-10 16:51:39.869744219 +0300 ++++ linux-5.15.41/fs/aufs/dirren.c 2022-05-31 16:59:51.189880353 +0300 @@ -0,0 +1,1315 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11242,9 +11243,9 @@ diff -Naur null/fs/aufs/dirren.c linux-5.15.36/fs/aufs/dirren.c +out: + return err; +} -diff -Naur null/fs/aufs/dirren.h linux-5.15.36/fs/aufs/dirren.h +diff -Naur null/fs/aufs/dirren.h linux-5.15.41/fs/aufs/dirren.h --- /dev/null -+++ linux-5.15.36/fs/aufs/dirren.h 2022-05-10 16:51:39.869744219 +0300 ++++ linux-5.15.41/fs/aufs/dirren.h 2022-05-31 16:59:51.189880353 +0300 @@ -0,0 +1,140 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11386,9 +11387,9 @@ diff -Naur null/fs/aufs/dirren.h linux-5.15.36/fs/aufs/dirren.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DIRREN_H__ */ -diff -Naur null/fs/aufs/dynop.c linux-5.15.36/fs/aufs/dynop.c +diff -Naur null/fs/aufs/dynop.c linux-5.15.41/fs/aufs/dynop.c --- /dev/null -+++ linux-5.15.36/fs/aufs/dynop.c 2022-05-10 16:51:39.869744219 +0300 ++++ linux-5.15.41/fs/aufs/dynop.c 2022-05-31 16:59:51.189880353 +0300 @@ -0,0 +1,368 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11758,9 +11759,9 @@ diff -Naur null/fs/aufs/dynop.c linux-5.15.36/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.36/fs/aufs/dynop.h +diff -Naur null/fs/aufs/dynop.h linux-5.15.41/fs/aufs/dynop.h --- /dev/null -+++ linux-5.15.36/fs/aufs/dynop.h 2022-05-10 16:51:39.870744219 +0300 ++++ linux-5.15.41/fs/aufs/dynop.h 2022-05-31 16:59:51.189880353 +0300 @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11839,9 +11840,9 @@ diff -Naur null/fs/aufs/dynop.h linux-5.15.36/fs/aufs/dynop.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_DYNOP_H__ */ -diff -Naur null/fs/aufs/export.c linux-5.15.36/fs/aufs/export.c +diff -Naur null/fs/aufs/export.c linux-5.15.41/fs/aufs/export.c --- /dev/null -+++ linux-5.15.36/fs/aufs/export.c 2022-05-10 16:51:39.870744219 +0300 ++++ linux-5.15.41/fs/aufs/export.c 2022-05-31 16:59:51.189880353 +0300 @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -12673,9 +12674,9 @@ diff -Naur null/fs/aufs/export.c linux-5.15.36/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.36/fs/aufs/fhsm.c +diff -Naur null/fs/aufs/fhsm.c linux-5.15.41/fs/aufs/fhsm.c --- /dev/null -+++ linux-5.15.36/fs/aufs/fhsm.c 2022-05-10 16:51:39.870744219 +0300 ++++ linux-5.15.41/fs/aufs/fhsm.c 2022-05-31 16:59:51.190880353 +0300 @@ -0,0 +1,427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13104,9 +13105,9 @@ diff -Naur null/fs/aufs/fhsm.c linux-5.15.36/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.36/fs/aufs/file.c +diff -Naur null/fs/aufs/file.c linux-5.15.41/fs/aufs/file.c --- /dev/null -+++ linux-5.15.36/fs/aufs/file.c 2022-05-10 16:51:39.870744219 +0300 ++++ linux-5.15.41/fs/aufs/file.c 2022-05-31 16:59:51.190880353 +0300 @@ -0,0 +1,863 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13971,9 +13972,9 @@ diff -Naur null/fs/aufs/file.c linux-5.15.36/fs/aufs/file.c + .swap_deactivate = aufs_swap_deactivate +#endif /* CONFIG_AUFS_DEBUG */ +}; -diff -Naur null/fs/aufs/file.h linux-5.15.36/fs/aufs/file.h +diff -Naur null/fs/aufs/file.h linux-5.15.41/fs/aufs/file.h --- /dev/null -+++ linux-5.15.36/fs/aufs/file.h 2022-05-10 16:51:39.871744219 +0300 ++++ linux-5.15.41/fs/aufs/file.h 2022-05-31 16:59:51.190880353 +0300 @@ -0,0 +1,342 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -14317,9 +14318,9 @@ diff -Naur null/fs/aufs/file.h linux-5.15.36/fs/aufs/file.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_FILE_H__ */ -diff -Naur null/fs/aufs/finfo.c linux-5.15.36/fs/aufs/finfo.c +diff -Naur null/fs/aufs/finfo.c linux-5.15.41/fs/aufs/finfo.c --- /dev/null -+++ linux-5.15.36/fs/aufs/finfo.c 2022-05-10 16:51:39.871744219 +0300 ++++ linux-5.15.41/fs/aufs/finfo.c 2022-05-31 16:59:51.190880353 +0300 @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -14470,9 +14471,9 @@ diff -Naur null/fs/aufs/finfo.c linux-5.15.36/fs/aufs/finfo.c +out: + return err; +} -diff -Naur null/fs/aufs/f_op.c linux-5.15.36/fs/aufs/f_op.c +diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c --- /dev/null -+++ linux-5.15.36/fs/aufs/f_op.c 2022-05-10 16:51:39.870744219 +0300 ++++ linux-5.15.41/fs/aufs/f_op.c 2022-05-31 16:59:51.190880353 +0300 @@ -0,0 +1,771 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -15245,9 +15246,9 @@ diff -Naur null/fs/aufs/f_op.c linux-5.15.36/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.36/fs/aufs/fsctx.c +diff -Naur null/fs/aufs/fsctx.c linux-5.15.41/fs/aufs/fsctx.c --- /dev/null -+++ linux-5.15.36/fs/aufs/fsctx.c 2022-05-10 16:51:39.871744219 +0300 ++++ linux-5.15.41/fs/aufs/fsctx.c 2022-05-31 16:59:51.191880353 +0300 @@ -0,0 +1,1242 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -16491,9 +16492,9 @@ diff -Naur null/fs/aufs/fsctx.c linux-5.15.36/fs/aufs/fsctx.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/fstype.h linux-5.15.36/fs/aufs/fstype.h +diff -Naur null/fs/aufs/fstype.h linux-5.15.41/fs/aufs/fstype.h --- /dev/null -+++ linux-5.15.36/fs/aufs/fstype.h 2022-05-10 16:51:39.871744219 +0300 ++++ linux-5.15.41/fs/aufs/fstype.h 2022-05-31 16:59:51.191880353 +0300 @@ -0,0 +1,401 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -16896,9 +16897,9 @@ diff -Naur null/fs/aufs/fstype.h linux-5.15.36/fs/aufs/fstype.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_FSTYPE_H__ */ -diff -Naur null/fs/aufs/hbl.h linux-5.15.36/fs/aufs/hbl.h +diff -Naur null/fs/aufs/hbl.h linux-5.15.41/fs/aufs/hbl.h --- /dev/null -+++ linux-5.15.36/fs/aufs/hbl.h 2022-05-10 16:51:39.871744219 +0300 ++++ linux-5.15.41/fs/aufs/hbl.h 2022-05-31 16:59:51.191880353 +0300 @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -16965,9 +16966,9 @@ diff -Naur null/fs/aufs/hbl.h linux-5.15.36/fs/aufs/hbl.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_HBL_H__ */ -diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.36/fs/aufs/hfsnotify.c +diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.41/fs/aufs/hfsnotify.c --- /dev/null -+++ linux-5.15.36/fs/aufs/hfsnotify.c 2022-05-10 16:51:39.871744219 +0300 ++++ linux-5.15.41/fs/aufs/hfsnotify.c 2022-05-31 16:59:51.191880353 +0300 @@ -0,0 +1,288 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17257,9 +17258,9 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.36/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.36/fs/aufs/hfsplus.c +diff -Naur null/fs/aufs/hfsplus.c linux-5.15.41/fs/aufs/hfsplus.c --- /dev/null -+++ linux-5.15.36/fs/aufs/hfsplus.c 2022-05-10 16:51:39.872744219 +0300 ++++ linux-5.15.41/fs/aufs/hfsplus.c 2022-05-31 16:59:51.191880353 +0300 @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17321,9 +17322,9 @@ diff -Naur null/fs/aufs/hfsplus.c linux-5.15.36/fs/aufs/hfsplus.c + au_lcnt_dec(&br->br_nfiles); + } +} -diff -Naur null/fs/aufs/hnotify.c linux-5.15.36/fs/aufs/hnotify.c +diff -Naur null/fs/aufs/hnotify.c linux-5.15.41/fs/aufs/hnotify.c --- /dev/null -+++ linux-5.15.36/fs/aufs/hnotify.c 2022-05-10 16:51:39.872744219 +0300 ++++ linux-5.15.41/fs/aufs/hnotify.c 2022-05-31 16:59:51.191880353 +0300 @@ -0,0 +1,715 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18040,9 +18041,9 @@ diff -Naur null/fs/aufs/hnotify.c linux-5.15.36/fs/aufs/hnotify.c + if (au_cache[AuCache_HNOTIFY]) + au_hn_destroy_cache(); +} -diff -Naur null/fs/aufs/iinfo.c linux-5.15.36/fs/aufs/iinfo.c +diff -Naur null/fs/aufs/iinfo.c linux-5.15.41/fs/aufs/iinfo.c --- /dev/null -+++ linux-5.15.36/fs/aufs/iinfo.c 2022-05-10 16:51:39.873744219 +0300 ++++ linux-5.15.41/fs/aufs/iinfo.c 2022-05-31 16:59:51.193880353 +0300 @@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18330,9 +18331,9 @@ diff -Naur null/fs/aufs/iinfo.c linux-5.15.36/fs/aufs/iinfo.c + au_kfree_rcu(iinfo->ii_hinode); + AuRwDestroy(&iinfo->ii_rwsem); +} -diff -Naur null/fs/aufs/inode.c linux-5.15.36/fs/aufs/inode.c +diff -Naur null/fs/aufs/inode.c linux-5.15.41/fs/aufs/inode.c --- /dev/null -+++ linux-5.15.36/fs/aufs/inode.c 2022-05-10 16:51:39.873744219 +0300 ++++ linux-5.15.41/fs/aufs/inode.c 2022-05-31 16:59:51.193880353 +0300 @@ -0,0 +1,531 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18865,9 +18866,9 @@ diff -Naur null/fs/aufs/inode.c linux-5.15.36/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.36/fs/aufs/inode.h +diff -Naur null/fs/aufs/inode.h linux-5.15.41/fs/aufs/inode.h --- /dev/null -+++ linux-5.15.36/fs/aufs/inode.h 2022-05-10 16:51:39.873744219 +0300 ++++ linux-5.15.41/fs/aufs/inode.h 2022-05-31 16:59:51.193880353 +0300 @@ -0,0 +1,705 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -19574,9 +19575,9 @@ diff -Naur null/fs/aufs/inode.h linux-5.15.36/fs/aufs/inode.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_INODE_H__ */ -diff -Naur null/fs/aufs/ioctl.c linux-5.15.36/fs/aufs/ioctl.c +diff -Naur null/fs/aufs/ioctl.c linux-5.15.41/fs/aufs/ioctl.c --- /dev/null -+++ linux-5.15.36/fs/aufs/ioctl.c 2022-05-10 16:51:39.874744219 +0300 ++++ linux-5.15.41/fs/aufs/ioctl.c 2022-05-31 16:59:51.193880353 +0300 @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -19798,9 +19799,9 @@ diff -Naur null/fs/aufs/ioctl.c linux-5.15.36/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.36/fs/aufs/i_op_add.c +diff -Naur null/fs/aufs/i_op_add.c linux-5.15.41/fs/aufs/i_op_add.c --- /dev/null -+++ linux-5.15.36/fs/aufs/i_op_add.c 2022-05-10 16:51:39.872744219 +0300 ++++ linux-5.15.41/fs/aufs/i_op_add.c 2022-05-31 16:59:51.192880353 +0300 @@ -0,0 +1,941 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -20743,9 +20744,9 @@ diff -Naur null/fs/aufs/i_op_add.c linux-5.15.36/fs/aufs/i_op_add.c +out: + return err; +} -diff -Naur null/fs/aufs/i_op.c linux-5.15.36/fs/aufs/i_op.c +diff -Naur null/fs/aufs/i_op.c linux-5.15.41/fs/aufs/i_op.c --- /dev/null -+++ linux-5.15.36/fs/aufs/i_op.c 2022-05-10 16:51:39.872744219 +0300 ++++ linux-5.15.41/fs/aufs/i_op.c 2022-05-31 16:59:51.192880353 +0300 @@ -0,0 +1,1512 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22259,9 +22260,9 @@ diff -Naur null/fs/aufs/i_op.c linux-5.15.36/fs/aufs/i_op.c + .update_time = aufs_update_time + } +}; -diff -Naur null/fs/aufs/i_op_del.c linux-5.15.36/fs/aufs/i_op_del.c +diff -Naur null/fs/aufs/i_op_del.c linux-5.15.41/fs/aufs/i_op_del.c --- /dev/null -+++ linux-5.15.36/fs/aufs/i_op_del.c 2022-05-10 16:51:39.873744219 +0300 ++++ linux-5.15.41/fs/aufs/i_op_del.c 2022-05-31 16:59:51.192880353 +0300 @@ -0,0 +1,522 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22785,9 +22786,9 @@ diff -Naur null/fs/aufs/i_op_del.c linux-5.15.36/fs/aufs/i_op_del.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.36/fs/aufs/i_op_ren.c +diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.41/fs/aufs/i_op_ren.c --- /dev/null -+++ linux-5.15.36/fs/aufs/i_op_ren.c 2022-05-10 16:51:39.873744219 +0300 ++++ linux-5.15.41/fs/aufs/i_op_ren.c 2022-05-31 16:59:51.193880353 +0300 @@ -0,0 +1,1257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24046,9 +24047,9 @@ diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.36/fs/aufs/i_op_ren.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/Kconfig linux-5.15.36/fs/aufs/Kconfig +diff -Naur null/fs/aufs/Kconfig linux-5.15.41/fs/aufs/Kconfig --- /dev/null -+++ linux-5.15.36/fs/aufs/Kconfig 2022-05-10 16:51:39.866744220 +0300 ++++ linux-5.15.41/fs/aufs/Kconfig 2022-05-31 16:59:51.186880353 +0300 @@ -0,0 +1,199 @@ +# SPDX-License-Identifier: GPL-2.0 +config AUFS_FS @@ -24249,9 +24250,9 @@ diff -Naur null/fs/aufs/Kconfig linux-5.15.36/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.36/fs/aufs/lcnt.h +diff -Naur null/fs/aufs/lcnt.h linux-5.15.41/fs/aufs/lcnt.h --- /dev/null -+++ linux-5.15.36/fs/aufs/lcnt.h 2022-05-10 16:51:39.874744219 +0300 ++++ linux-5.15.41/fs/aufs/lcnt.h 2022-05-31 16:59:51.193880353 +0300 @@ -0,0 +1,186 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24439,9 +24440,9 @@ diff -Naur null/fs/aufs/lcnt.h linux-5.15.36/fs/aufs/lcnt.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_LCNT_H__ */ -diff -Naur null/fs/aufs/loop.c linux-5.15.36/fs/aufs/loop.c +diff -Naur null/fs/aufs/loop.c linux-5.15.41/fs/aufs/loop.c --- /dev/null -+++ linux-5.15.36/fs/aufs/loop.c 2022-05-10 16:51:39.874744219 +0300 ++++ linux-5.15.41/fs/aufs/loop.c 2022-05-31 16:59:51.193880353 +0300 @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24591,9 +24592,9 @@ diff -Naur null/fs/aufs/loop.c linux-5.15.36/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.36/fs/aufs/loop.h +diff -Naur null/fs/aufs/loop.h linux-5.15.41/fs/aufs/loop.h --- /dev/null -+++ linux-5.15.36/fs/aufs/loop.h 2022-05-10 16:51:39.874744219 +0300 ++++ linux-5.15.41/fs/aufs/loop.h 2022-05-31 16:59:51.193880353 +0300 @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24650,9 +24651,9 @@ diff -Naur null/fs/aufs/loop.h linux-5.15.36/fs/aufs/loop.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_LOOP_H__ */ -diff -Naur null/fs/aufs/magic.mk linux-5.15.36/fs/aufs/magic.mk +diff -Naur null/fs/aufs/magic.mk linux-5.15.41/fs/aufs/magic.mk --- /dev/null -+++ linux-5.15.36/fs/aufs/magic.mk 2022-05-10 16:51:39.874744219 +0300 ++++ linux-5.15.41/fs/aufs/magic.mk 2022-05-31 16:59:51.194880352 +0300 @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -24685,9 +24686,9 @@ diff -Naur null/fs/aufs/magic.mk linux-5.15.36/fs/aufs/magic.mk +ifdef CONFIG_HFSPLUS_FS +ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b +endif -diff -Naur null/fs/aufs/Makefile linux-5.15.36/fs/aufs/Makefile +diff -Naur null/fs/aufs/Makefile linux-5.15.41/fs/aufs/Makefile --- /dev/null -+++ linux-5.15.36/fs/aufs/Makefile 2022-05-10 16:51:39.866744220 +0300 ++++ linux-5.15.41/fs/aufs/Makefile 2022-05-31 16:59:51.186880353 +0300 @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -24735,9 +24736,9 @@ diff -Naur null/fs/aufs/Makefile linux-5.15.36/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.36/fs/aufs/module.c +diff -Naur null/fs/aufs/module.c linux-5.15.41/fs/aufs/module.c --- /dev/null -+++ linux-5.15.36/fs/aufs/module.c 2022-05-10 16:51:39.874744219 +0300 ++++ linux-5.15.41/fs/aufs/module.c 2022-05-31 16:59:51.194880352 +0300 @@ -0,0 +1,273 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25012,9 +25013,9 @@ diff -Naur null/fs/aufs/module.c linux-5.15.36/fs/aufs/module.c + +module_init(aufs_init); +module_exit(aufs_exit); -diff -Naur null/fs/aufs/module.h linux-5.15.36/fs/aufs/module.h +diff -Naur null/fs/aufs/module.h linux-5.15.41/fs/aufs/module.h --- /dev/null -+++ linux-5.15.36/fs/aufs/module.h 2022-05-10 16:51:39.874744219 +0300 ++++ linux-5.15.41/fs/aufs/module.h 2022-05-31 16:59:51.194880352 +0300 @@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -25182,9 +25183,9 @@ diff -Naur null/fs/aufs/module.h linux-5.15.36/fs/aufs/module.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_MODULE_H__ */ -diff -Naur null/fs/aufs/mvdown.c linux-5.15.36/fs/aufs/mvdown.c +diff -Naur null/fs/aufs/mvdown.c linux-5.15.41/fs/aufs/mvdown.c --- /dev/null -+++ linux-5.15.36/fs/aufs/mvdown.c 2022-05-10 16:51:39.874744219 +0300 ++++ linux-5.15.41/fs/aufs/mvdown.c 2022-05-31 16:59:51.194880352 +0300 @@ -0,0 +1,706 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25892,9 +25893,9 @@ diff -Naur null/fs/aufs/mvdown.c linux-5.15.36/fs/aufs/mvdown.c + AuTraceErr(err); + return err; +} -diff -Naur null/fs/aufs/opts.c linux-5.15.36/fs/aufs/opts.c +diff -Naur null/fs/aufs/opts.c linux-5.15.41/fs/aufs/opts.c --- /dev/null -+++ linux-5.15.36/fs/aufs/opts.c 2022-05-10 16:51:39.875744219 +0300 ++++ linux-5.15.41/fs/aufs/opts.c 2022-05-31 16:59:51.194880352 +0300 @@ -0,0 +1,1032 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -26928,9 +26929,9 @@ diff -Naur null/fs/aufs/opts.c linux-5.15.36/fs/aufs/opts.c +{ + return au_mntflags(sb) & AuOptMask_UDBA; +} -diff -Naur null/fs/aufs/opts.h linux-5.15.36/fs/aufs/opts.h +diff -Naur null/fs/aufs/opts.h linux-5.15.41/fs/aufs/opts.h --- /dev/null -+++ linux-5.15.36/fs/aufs/opts.h 2022-05-10 16:51:39.875744219 +0300 ++++ linux-5.15.41/fs/aufs/opts.h 2022-05-31 16:59:51.195880352 +0300 @@ -0,0 +1,263 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -27195,9 +27196,9 @@ diff -Naur null/fs/aufs/opts.h linux-5.15.36/fs/aufs/opts.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_OPTS_H__ */ -diff -Naur null/fs/aufs/plink.c linux-5.15.36/fs/aufs/plink.c +diff -Naur null/fs/aufs/plink.c linux-5.15.41/fs/aufs/plink.c --- /dev/null -+++ linux-5.15.36/fs/aufs/plink.c 2022-05-10 16:51:39.875744219 +0300 ++++ linux-5.15.41/fs/aufs/plink.c 2022-05-31 16:59:51.195880352 +0300 @@ -0,0 +1,516 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27715,9 +27716,9 @@ diff -Naur null/fs/aufs/plink.c linux-5.15.36/fs/aufs/plink.c + } + } +} -diff -Naur null/fs/aufs/poll.c linux-5.15.36/fs/aufs/poll.c +diff -Naur null/fs/aufs/poll.c linux-5.15.41/fs/aufs/poll.c --- /dev/null -+++ linux-5.15.36/fs/aufs/poll.c 2022-05-10 16:51:39.875744219 +0300 ++++ linux-5.15.41/fs/aufs/poll.c 2022-05-31 16:59:51.195880352 +0300 @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27770,9 +27771,9 @@ diff -Naur null/fs/aufs/poll.c linux-5.15.36/fs/aufs/poll.c + AuDbg("mask 0x%x\n", mask); + return mask; +} -diff -Naur null/fs/aufs/posix_acl.c linux-5.15.36/fs/aufs/posix_acl.c +diff -Naur null/fs/aufs/posix_acl.c linux-5.15.41/fs/aufs/posix_acl.c --- /dev/null -+++ linux-5.15.36/fs/aufs/posix_acl.c 2022-05-10 16:51:39.875744219 +0300 ++++ linux-5.15.41/fs/aufs/posix_acl.c 2022-05-31 16:59:51.195880352 +0300 @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27885,9 +27886,9 @@ diff -Naur null/fs/aufs/posix_acl.c linux-5.15.36/fs/aufs/posix_acl.c +out: + return err; +} -diff -Naur null/fs/aufs/procfs.c linux-5.15.36/fs/aufs/procfs.c +diff -Naur null/fs/aufs/procfs.c linux-5.15.41/fs/aufs/procfs.c --- /dev/null -+++ linux-5.15.36/fs/aufs/procfs.c 2022-05-10 16:51:39.875744219 +0300 ++++ linux-5.15.41/fs/aufs/procfs.c 2022-05-31 16:59:51.195880352 +0300 @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28059,9 +28060,9 @@ diff -Naur null/fs/aufs/procfs.c linux-5.15.36/fs/aufs/procfs.c +out: + return err; +} -diff -Naur null/fs/aufs/rdu.c linux-5.15.36/fs/aufs/rdu.c +diff -Naur null/fs/aufs/rdu.c linux-5.15.41/fs/aufs/rdu.c --- /dev/null -+++ linux-5.15.36/fs/aufs/rdu.c 2022-05-10 16:51:39.876744219 +0300 ++++ linux-5.15.41/fs/aufs/rdu.c 2022-05-31 16:59:51.195880352 +0300 @@ -0,0 +1,384 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28447,9 +28448,9 @@ diff -Naur null/fs/aufs/rdu.c linux-5.15.36/fs/aufs/rdu.c + return err; +} +#endif -diff -Naur null/fs/aufs/rwsem.h linux-5.15.36/fs/aufs/rwsem.h +diff -Naur null/fs/aufs/rwsem.h linux-5.15.41/fs/aufs/rwsem.h --- /dev/null -+++ linux-5.15.36/fs/aufs/rwsem.h 2022-05-10 16:51:39.876744219 +0300 ++++ linux-5.15.41/fs/aufs/rwsem.h 2022-05-31 16:59:51.195880352 +0300 @@ -0,0 +1,85 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -28536,9 +28537,9 @@ diff -Naur null/fs/aufs/rwsem.h linux-5.15.36/fs/aufs/rwsem.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_RWSEM_H__ */ -diff -Naur null/fs/aufs/sbinfo.c linux-5.15.36/fs/aufs/sbinfo.c +diff -Naur null/fs/aufs/sbinfo.c linux-5.15.41/fs/aufs/sbinfo.c --- /dev/null -+++ linux-5.15.36/fs/aufs/sbinfo.c 2022-05-10 16:51:39.876744219 +0300 ++++ linux-5.15.41/fs/aufs/sbinfo.c 2022-05-31 16:59:51.195880352 +0300 @@ -0,0 +1,316 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28856,9 +28857,9 @@ diff -Naur null/fs/aufs/sbinfo.c linux-5.15.36/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.36/fs/aufs/super.c +diff -Naur null/fs/aufs/super.c linux-5.15.41/fs/aufs/super.c --- /dev/null -+++ linux-5.15.36/fs/aufs/super.c 2022-05-10 16:51:39.876744219 +0300 ++++ linux-5.15.41/fs/aufs/super.c 2022-05-31 16:59:51.196880352 +0300 @@ -0,0 +1,871 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29731,9 +29732,9 @@ diff -Naur null/fs/aufs/super.c linux-5.15.36/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.36/fs/aufs/super.h +diff -Naur null/fs/aufs/super.h linux-5.15.41/fs/aufs/super.h --- /dev/null -+++ linux-5.15.36/fs/aufs/super.h 2022-05-10 16:51:39.876744219 +0300 ++++ linux-5.15.41/fs/aufs/super.h 2022-05-31 16:59:51.196880352 +0300 @@ -0,0 +1,592 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -30327,9 +30328,9 @@ diff -Naur null/fs/aufs/super.h linux-5.15.36/fs/aufs/super.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_SUPER_H__ */ -diff -Naur null/fs/aufs/sysaufs.c linux-5.15.36/fs/aufs/sysaufs.c +diff -Naur null/fs/aufs/sysaufs.c linux-5.15.41/fs/aufs/sysaufs.c --- /dev/null -+++ linux-5.15.36/fs/aufs/sysaufs.c 2022-05-10 16:51:39.876744219 +0300 ++++ linux-5.15.41/fs/aufs/sysaufs.c 2022-05-31 16:59:51.196880352 +0300 @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30424,9 +30425,9 @@ diff -Naur null/fs/aufs/sysaufs.c linux-5.15.36/fs/aufs/sysaufs.c +out: + return err; +} -diff -Naur null/fs/aufs/sysaufs.h linux-5.15.36/fs/aufs/sysaufs.h +diff -Naur null/fs/aufs/sysaufs.h linux-5.15.41/fs/aufs/sysaufs.h --- /dev/null -+++ linux-5.15.36/fs/aufs/sysaufs.h 2022-05-10 16:51:39.876744219 +0300 ++++ linux-5.15.41/fs/aufs/sysaufs.h 2022-05-31 16:59:51.196880352 +0300 @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -30530,9 +30531,9 @@ diff -Naur null/fs/aufs/sysaufs.h linux-5.15.36/fs/aufs/sysaufs.h + +#endif /* __KERNEL__ */ +#endif /* __SYSAUFS_H__ */ -diff -Naur null/fs/aufs/sysfs.c linux-5.15.36/fs/aufs/sysfs.c +diff -Naur null/fs/aufs/sysfs.c linux-5.15.41/fs/aufs/sysfs.c --- /dev/null -+++ linux-5.15.36/fs/aufs/sysfs.c 2022-05-10 16:51:39.876744219 +0300 ++++ linux-5.15.41/fs/aufs/sysfs.c 2022-05-31 16:59:51.196880352 +0300 @@ -0,0 +1,374 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30908,9 +30909,9 @@ diff -Naur null/fs/aufs/sysfs.c linux-5.15.36/fs/aufs/sysfs.c + } + } +} -diff -Naur null/fs/aufs/sysrq.c linux-5.15.36/fs/aufs/sysrq.c +diff -Naur null/fs/aufs/sysrq.c linux-5.15.41/fs/aufs/sysrq.c --- /dev/null -+++ linux-5.15.36/fs/aufs/sysrq.c 2022-05-10 16:51:39.877744219 +0300 ++++ linux-5.15.41/fs/aufs/sysrq.c 2022-05-31 16:59:51.196880352 +0300 @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31061,9 +31062,9 @@ diff -Naur null/fs/aufs/sysrq.c linux-5.15.36/fs/aufs/sysrq.c + if (unlikely(err)) + pr_err("err %d (ignored)\n", err); +} -diff -Naur null/fs/aufs/vdir.c linux-5.15.36/fs/aufs/vdir.c +diff -Naur null/fs/aufs/vdir.c linux-5.15.41/fs/aufs/vdir.c --- /dev/null -+++ linux-5.15.36/fs/aufs/vdir.c 2022-05-10 16:51:39.877744219 +0300 ++++ linux-5.15.41/fs/aufs/vdir.c 2022-05-31 16:59:51.197880352 +0300 @@ -0,0 +1,896 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31961,9 +31962,9 @@ diff -Naur null/fs/aufs/vdir.c linux-5.15.36/fs/aufs/vdir.c + /* smp_mb(); */ + return 0; +} -diff -Naur null/fs/aufs/vfsub.c linux-5.15.36/fs/aufs/vfsub.c +diff -Naur null/fs/aufs/vfsub.c linux-5.15.41/fs/aufs/vfsub.c --- /dev/null -+++ linux-5.15.36/fs/aufs/vfsub.c 2022-05-10 16:51:39.877744219 +0300 ++++ linux-5.15.41/fs/aufs/vfsub.c 2022-05-31 16:59:51.197880352 +0300 @@ -0,0 +1,918 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -32883,9 +32884,9 @@ diff -Naur null/fs/aufs/vfsub.c linux-5.15.36/fs/aufs/vfsub.c + + return err; +} -diff -Naur null/fs/aufs/vfsub.h linux-5.15.36/fs/aufs/vfsub.h +diff -Naur null/fs/aufs/vfsub.h linux-5.15.41/fs/aufs/vfsub.h --- /dev/null -+++ linux-5.15.36/fs/aufs/vfsub.h 2022-05-10 16:51:39.877744219 +0300 ++++ linux-5.15.41/fs/aufs/vfsub.h 2022-05-31 16:59:51.197880352 +0300 @@ -0,0 +1,358 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -33245,9 +33246,9 @@ diff -Naur null/fs/aufs/vfsub.h linux-5.15.36/fs/aufs/vfsub.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_VFSUB_H__ */ -diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.36/fs/aufs/wbr_policy.c +diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.41/fs/aufs/wbr_policy.c --- /dev/null -+++ linux-5.15.36/fs/aufs/wbr_policy.c 2022-05-10 16:51:39.877744219 +0300 ++++ linux-5.15.41/fs/aufs/wbr_policy.c 2022-05-31 16:59:51.197880352 +0300 @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -34079,9 +34080,9 @@ diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.36/fs/aufs/wbr_policy.c + .fin = au_wbr_create_fin_mfs + } +}; -diff -Naur null/fs/aufs/whout.c linux-5.15.36/fs/aufs/whout.c +diff -Naur null/fs/aufs/whout.c linux-5.15.41/fs/aufs/whout.c --- /dev/null -+++ linux-5.15.36/fs/aufs/whout.c 2022-05-10 16:51:39.878744219 +0300 ++++ linux-5.15.41/fs/aufs/whout.c 2022-05-31 16:59:51.197880352 +0300 @@ -0,0 +1,1072 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35155,9 +35156,9 @@ diff -Naur null/fs/aufs/whout.c linux-5.15.36/fs/aufs/whout.c + au_whtmp_rmdir_free(args); + } +} -diff -Naur null/fs/aufs/whout.h linux-5.15.36/fs/aufs/whout.h +diff -Naur null/fs/aufs/whout.h linux-5.15.41/fs/aufs/whout.h --- /dev/null -+++ linux-5.15.36/fs/aufs/whout.h 2022-05-10 16:51:39.878744219 +0300 ++++ linux-5.15.41/fs/aufs/whout.h 2022-05-31 16:59:51.198880352 +0300 @@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -35246,9 +35247,9 @@ diff -Naur null/fs/aufs/whout.h linux-5.15.36/fs/aufs/whout.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_WHOUT_H__ */ -diff -Naur null/fs/aufs/wkq.c linux-5.15.36/fs/aufs/wkq.c +diff -Naur null/fs/aufs/wkq.c linux-5.15.41/fs/aufs/wkq.c --- /dev/null -+++ linux-5.15.36/fs/aufs/wkq.c 2022-05-10 16:51:39.878744219 +0300 ++++ linux-5.15.41/fs/aufs/wkq.c 2022-05-31 16:59:51.198880352 +0300 @@ -0,0 +1,372 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35622,9 +35623,9 @@ diff -Naur null/fs/aufs/wkq.c linux-5.15.36/fs/aufs/wkq.c + + return err; +} -diff -Naur null/fs/aufs/wkq.h linux-5.15.36/fs/aufs/wkq.h +diff -Naur null/fs/aufs/wkq.h linux-5.15.41/fs/aufs/wkq.h --- /dev/null -+++ linux-5.15.36/fs/aufs/wkq.h 2022-05-10 16:51:39.878744219 +0300 ++++ linux-5.15.41/fs/aufs/wkq.h 2022-05-31 16:59:51.198880352 +0300 @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -35715,9 +35716,9 @@ diff -Naur null/fs/aufs/wkq.h linux-5.15.36/fs/aufs/wkq.h + +#endif /* __KERNEL__ */ +#endif /* __AUFS_WKQ_H__ */ -diff -Naur null/fs/aufs/xattr.c linux-5.15.36/fs/aufs/xattr.c +diff -Naur null/fs/aufs/xattr.c linux-5.15.41/fs/aufs/xattr.c --- /dev/null -+++ linux-5.15.36/fs/aufs/xattr.c 2022-05-10 16:51:39.878744219 +0300 ++++ linux-5.15.41/fs/aufs/xattr.c 2022-05-31 16:59:51.198880352 +0300 @@ -0,0 +1,368 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -36087,9 +36088,9 @@ diff -Naur null/fs/aufs/xattr.c linux-5.15.36/fs/aufs/xattr.c +{ + sb->s_xattr = au_xattr_handlers; +} -diff -Naur null/fs/aufs/xino.c linux-5.15.36/fs/aufs/xino.c +diff -Naur null/fs/aufs/xino.c linux-5.15.41/fs/aufs/xino.c --- /dev/null -+++ linux-5.15.36/fs/aufs/xino.c 2022-05-10 16:51:39.879744219 +0300 ++++ linux-5.15.41/fs/aufs/xino.c 2022-05-31 16:59:51.199880352 +0300 @@ -0,0 +1,1926 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -38017,9 +38018,9 @@ diff -Naur null/fs/aufs/xino.c linux-5.15.36/fs/aufs/xino.c +out: + return err; +} -diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.36/include/uapi/linux/aufs_type.h +diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.41/include/uapi/linux/aufs_type.h --- /dev/null -+++ linux-5.15.36/include/uapi/linux/aufs_type.h 2022-05-10 16:51:39.879744219 +0300 ++++ linux-5.15.41/include/uapi/linux/aufs_type.h 2022-05-31 16:59:51.199880352 +0300 @@ -0,0 +1,452 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* @@ -38063,7 +38064,7 @@ diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.36/include/uapi/linux/ +#include +#endif /* __KERNEL__ */ + -+#define AUFS_VERSION "5.15.36-20220509" ++#define AUFS_VERSION "5.15.41-20220530" + +/* 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/tools/perf/files/patches/aufs5/tmpfs-idr.patch b/kernel/tools/perf/files/patches/aufs5/tmpfs-idr.patch index be89bbeeaa..f4313145bf 100644 --- a/kernel/tools/perf/files/patches/aufs5/tmpfs-idr.patch +++ b/kernel/tools/perf/files/patches/aufs5/tmpfs-idr.patch @@ -21,7 +21,7 @@ index 166158b6e917..0e9606171432 100644 umode_t mode; /* Mount mode for root directory */ unsigned char huge; /* Whether to try for hugepages */ diff --git a/mm/shmem.c b/mm/shmem.c -index 1609a8daba26..b3e5f52a5aa2 100644 +index 342d1bc72867..460e4c54483f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -108,7 +108,7 @@ struct shmem_falloc { @@ -88,7 +88,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 lockdep_annotate_inode_mutex_key(inode); } else shmem_free_inode(sb); -@@ -3250,8 +3277,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) +@@ -3252,8 +3279,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) static int shmem_match(struct inode *ino, void *vfh) { __u32 *fh = vfh; @@ -98,7 +98,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 return ino->i_ino == inum && fh[0] == ino->i_generation; } -@@ -3271,14 +3297,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, +@@ -3273,14 +3299,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, struct dentry *dentry = NULL; u64 inum; @@ -116,7 +116,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 if (inode) { dentry = shmem_find_alias(inode); iput(inode); -@@ -3290,30 +3313,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, +@@ -3292,30 +3315,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len, struct inode *parent) { @@ -150,7 +150,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 return 1; } -@@ -3392,7 +3400,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) +@@ -3394,7 +3402,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) break; case Opt_nr_inodes: ctx->inodes = memparse(param->string, &rest); @@ -159,7 +159,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 goto bad_value; ctx->seen |= SHMEM_SEEN_INODES; break; -@@ -3502,7 +3510,7 @@ static int shmem_reconfigure(struct fs_context *fc) +@@ -3504,7 +3512,7 @@ static int shmem_reconfigure(struct fs_context *fc) { struct shmem_options *ctx = fc->fs_private; struct shmem_sb_info *sbinfo = SHMEM_SB(fc->root->d_sb); @@ -168,7 +168,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 struct mempolicy *mpol = NULL; const char *err; -@@ -3571,7 +3579,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) +@@ -3573,7 +3581,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) seq_printf(seq, ",size=%luk", sbinfo->max_blocks << (PAGE_SHIFT - 10)); if (sbinfo->max_inodes != shmem_default_max_inodes()) @@ -177,7 +177,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 if (sbinfo->mode != (0777 | S_ISVTX)) seq_printf(seq, ",mode=%03ho", sbinfo->mode); if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID)) -@@ -3618,6 +3626,8 @@ static void shmem_put_super(struct super_block *sb) +@@ -3620,6 +3628,8 @@ static void shmem_put_super(struct super_block *sb) { struct shmem_sb_info *sbinfo = SHMEM_SB(sb); @@ -186,7 +186,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 free_percpu(sbinfo->ino_batch); percpu_counter_destroy(&sbinfo->used_blocks); mpol_put(sbinfo->mpol); -@@ -3660,6 +3670,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -3662,6 +3672,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) #else sb->s_flags |= SB_NOUSER; #endif @@ -195,7 +195,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 sbinfo->max_blocks = ctx->blocks; sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes; if (sb->s_flags & SB_KERNMOUNT) { -@@ -3777,6 +3789,15 @@ static void shmem_destroy_inodecache(void) +@@ -3779,6 +3791,15 @@ static void shmem_destroy_inodecache(void) kmem_cache_destroy(shmem_inode_cachep); } @@ -211,7 +211,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644 const struct address_space_operations shmem_aops = { .writepage = shmem_writepage, .set_page_dirty = __set_page_dirty_no_writeback, -@@ -3918,6 +3939,7 @@ int __init shmem_init(void) +@@ -3920,6 +3941,7 @@ int __init shmem_init(void) pr_err("Could not kern_mount tmpfs\n"); goto out1; } diff --git a/kernel/tools/perf/files/patches/linux/patch-5.15.50.xz b/kernel/tools/perf/files/patches/linux/patch-5.15.50.xz new file mode 100644 index 0000000000..e980ff3461 Binary files /dev/null and b/kernel/tools/perf/files/patches/linux/patch-5.15.50.xz differ diff --git a/kernel/tools/perf/pspec.xml b/kernel/tools/perf/pspec.xml index c87eda874a..1496b2f0de 100644 --- a/kernel/tools/perf/pspec.xml +++ b/kernel/tools/perf/pspec.xml @@ -43,10 +43,10 @@ - patches/linux/patch-5.15.41.xz + patches/linux/patch-5.15.50.xz - patches/aufs5/aufs5.15.36-20220509.patch + patches/aufs5/aufs5.15.41-20220530.patch patches/aufs5/aufs5-base.patch patches/aufs5/aufs5-kbuild.patch patches/aufs5/aufs5-loopback.patch @@ -136,6 +136,13 @@ + + 2022-06-25 + 5.15.50 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-05-21 5.15.41