Djam/kernel-5.15
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-5.15.git synced 2025-02-24 02:52:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to version 5.3.1

Browse source
This commit is contained in:
Evgenii Shatokhin 2019-09-24 11:56:44 +03:00
parent 17e88f1815
commit 4ca3b2aeb5
6 changed files with 1762 additions and 1129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.abf.yml
View file

@ -1,3 +1,3 @@
sources: sources:
linux-5.2.tar.xz: 872edeb5080f3f6a8154fa54a79fe868ed19f6dd linux-5.3.tar.xz: 988855d1fee4eb12495a5b3602e2f3471623ec3e
patch-5.2.14.xz: 08b39baaa2d8368b2b4cbb392458d166f1ce9ea3 patch-5.3.1.xz: bd8e57aee3e886edb8bc892956d6d55842451a97

30
disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
View file

@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index b1152cd20359..0beac65f7adf 100644 index 2b600604e4b7..c8ac7b9cf35b 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1108,8 +1108,7 @@ include/config/kernel.release: FORCE @@ -1120,8 +1120,7 @@ include/config/kernel.release: FORCE
# Carefully list dependencies so we do not try to build scripts twice # Carefully list dependencies so we do not try to build scripts twice
# in parallel # in parallel
PHONY += scripts PHONY += scripts
@ -12,7 +12,7 @@ index b1152cd20359..0beac65f7adf 100644
# Things we need to do before we recursively start building the kernel # Things we need to do before we recursively start building the kernel
# or the modules are listed in "prepare". # or the modules are listed in "prepare".
@@ -1145,7 +1144,7 @@ prepare0: archprepare @@ -1154,7 +1153,7 @@ prepare0: archprepare
$(Q)$(MAKE) $(build)=. $(Q)$(MAKE) $(build)=.
# All the preparing.. # All the preparing..
@ -21,23 +21,23 @@ index b1152cd20359..0beac65f7adf 100644
# Support for using generic headers in asm-generic # Support for using generic headers in asm-generic
asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
@@ -1389,13 +1388,8 @@ CLEAN_DIRS += $(MODVERDIR) include/ksym @@ -1409,13 +1408,8 @@ CLEAN_DIRS += include/ksym
CLEAN_FILES += modules.builtin.modinfo CLEAN_FILES += modules.builtin.modinfo
# Directories & files removed with 'make mrproper' # Directories & files removed with 'make mrproper'
-MRPROPER_DIRS += include/config usr/include include/generated \ -MRPROPER_DIRS += include/config include/generated \
- arch/$(SRCARCH)/include/generated .tmp_objdiff - arch/$(SRCARCH)/include/generated .tmp_objdiff
-MRPROPER_FILES += .config .config.old .version \ -MRPROPER_FILES += .config .config.old .version \
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ - Module.symvers \
- signing_key.pem signing_key.priv signing_key.x509 \ - signing_key.pem signing_key.priv signing_key.x509 \
- x509.genkey extra_certificates signing_key.x509.keyid \ - x509.genkey extra_certificates signing_key.x509.keyid \
- signing_key.x509.signer vmlinux-gdb.py - signing_key.x509.signer vmlinux-gdb.py
+MRPROPER_DIRS += "" +MRPROPER_DIRS += ""
+MRPROPER_FILES += "" +MRPROPER_FILES += ""
# clean - Delete most, but leave enough to build external modules # Directories & files removed with 'make distclean'
# DISTCLEAN_DIRS +=
@@ -1417,13 +1411,10 @@ clean: archclean vmlinuxclean @@ -1441,13 +1435,10 @@ clean: archclean vmlinuxclean
# #
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
@ -54,10 +54,10 @@ index b1152cd20359..0beac65f7adf 100644
$(call cmd,rmfiles) $(call cmd,rmfiles)
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 3f327e21f60e..b849a171efbb 100644 index 7656e1137b6b..ebb4d0caacab 100644
--- a/scripts/kconfig/Makefile --- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile
@@ -20,19 +20,14 @@ endif @@ -24,19 +24,14 @@ endif
unexport CONFIG_ unexport CONFIG_
xconfig: $(obj)/qconf xconfig: $(obj)/qconf
@ -77,7 +77,7 @@ index 3f327e21f60e..b849a171efbb 100644
build_menuconfig: $(obj)/mconf build_menuconfig: $(obj)/mconf
@@ -48,11 +43,9 @@ localyesconfig localmodconfig: $(obj)/conf @@ -52,11 +47,9 @@ localyesconfig localmodconfig: $(obj)/conf
cmp -s .tmp.config .config || \ cmp -s .tmp.config .config || \
(mv -f .config .config.old.1; \ (mv -f .config .config.old.1; \
mv -f .tmp.config .config; \ mv -f .tmp.config .config; \
@ -89,7 +89,7 @@ index 3f327e21f60e..b849a171efbb 100644
fi fi
$(Q)rm -f .tmp.config $(Q)rm -f .tmp.config
@@ -66,26 +59,14 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \ @@ -70,24 +63,14 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
PHONY += $(simple-targets) PHONY += $(simple-targets)
$(simple-targets): $(obj)/conf $(simple-targets): $(obj)/conf
@ -101,9 +101,7 @@ index 3f327e21f60e..b849a171efbb 100644
- $< $(silent) --$@=defconfig $(Kconfig) - $< $(silent) --$@=defconfig $(Kconfig)
defconfig: $(obj)/conf defconfig: $(obj)/conf
-ifeq ($(KBUILD_DEFCONFIG),) -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
- $< $(silent) --defconfig $(Kconfig)
-else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
- @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" - @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) - $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
-else -else

168
fs-aufs.patch
View file

@ -1929,10 +1929,10 @@ index 000000000000..13e8583f2b91
+Currently this approach is applied to address_space_operations for +Currently this approach is applied to address_space_operations for
+regular files only. +regular files only.
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index 677ef41cb012..c2a7491ddc68 100644 index a50e97a63bc8..bd7c76319a85 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2769,6 +2769,19 @@ F: include/linux/audit.h @@ -2822,6 +2822,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h F: include/uapi/linux/audit.h
F: kernel/audit* F: kernel/audit*
@ -1953,10 +1953,10 @@ index 677ef41cb012..c2a7491ddc68 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com> M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index f11b7dc16e9d..1b723737592b 100644 index ab7ca5989097..80d06084b043 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -746,6 +746,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error; return error;
} }
@ -1994,7 +1994,7 @@ index bfb1c6095c7a..bddba5bb307e 100644
endif # MISC_FILESYSTEMS endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile diff --git a/fs/Makefile b/fs/Makefile
index c9aea23aba56..57c6f47b0185 100644 index d60089fd689b..924c16a40b00 100644
--- a/fs/Makefile --- a/fs/Makefile
+++ b/fs/Makefile +++ b/fs/Makefile
@@ -130,3 +130,4 @@ obj-$(CONFIG_F2FS_FS) += f2fs/ @@ -130,3 +130,4 @@ obj-$(CONFIG_F2FS_FS) += f2fs/
@ -2329,10 +2329,10 @@ index 000000000000..a62a85211b88
+#endif /* __AUFS_H__ */ +#endif /* __AUFS_H__ */
diff --git a/fs/aufs/branch.c b/fs/aufs/branch.c diff --git a/fs/aufs/branch.c b/fs/aufs/branch.c
new file mode 100644 new file mode 100644
index 000000000000..fb388a049940 index 000000000000..608bf76f8f21
--- /dev/null --- /dev/null
+++ b/fs/aufs/branch.c +++ b/fs/aufs/branch.c
@@ -0,0 +1,1423 @@ @@ -0,0 +1,1428 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -3553,6 +3553,7 @@ index 000000000000..fb388a049940
+ unsigned char verbose, writer; + unsigned char verbose, writer;
+ struct file *file, *hf, **array; + struct file *file, *hf, **array;
+ struct au_hfile *hfile; + struct au_hfile *hfile;
+ struct inode *h_inode;
+ +
+ mnt_flags = au_mntflags(sb); + mnt_flags = au_mntflags(sb);
+ verbose = !!au_opt_test(mnt_flags, VERBOSE); + verbose = !!au_opt_test(mnt_flags, VERBOSE);
@ -3623,8 +3624,12 @@ index 000000000000..fb388a049940
+ hf->f_mode &= ~(FMODE_WRITE | FMODE_WRITER); + hf->f_mode &= ~(FMODE_WRITE | FMODE_WRITER);
+ spin_unlock(&hf->f_lock); + spin_unlock(&hf->f_lock);
+ if (writer) { + if (writer) {
+ put_write_access(file_inode(hf)); + h_inode = file_inode(hf);
+ put_write_access(h_inode);
+ __mnt_drop_write(hf->f_path.mnt); + __mnt_drop_write(hf->f_path.mnt);
+ if ((hf->f_mode & (FMODE_READ | FMODE_WRITE))
+ == FMODE_READ)
+ i_readcount_inc(h_inode);
+ } + }
+ } + }
+ +
@ -17256,10 +17261,10 @@ index 000000000000..2e7c2cdb8202
+} +}
diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c
new file mode 100644 new file mode 100644
index 000000000000..4f5001ebd0f4 index 000000000000..ef1e08c7ca10
--- /dev/null --- /dev/null
+++ b/fs/aufs/i_op.c +++ b/fs/aufs/i_op.c
@@ -0,0 +1,1507 @@ @@ -0,0 +1,1505 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -17902,9 +17907,7 @@ index 000000000000..4f5001ebd0f4
+ +
+static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task) +static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task)
+{ +{
+#if !defined(CONFIG_RWSEM_GENERIC_SPINLOCK) && defined(CONFIG_RWSEM_SPIN_ON_OWNER) + atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, (long)task);
+ p->hdir->hi_inode->i_rwsem.owner = task;
+#endif
+} +}
+ +
+void au_pin_hdir_acquire_nest(struct au_pin *p) +void au_pin_hdir_acquire_nest(struct au_pin *p)
@ -24850,10 +24853,10 @@ index 000000000000..cbac849ead31
+} +}
diff --git a/fs/aufs/opts.c b/fs/aufs/opts.c diff --git a/fs/aufs/opts.c b/fs/aufs/opts.c
new file mode 100644 new file mode 100644
index 000000000000..c92ca14574ff index 000000000000..77e17d7b3bdf
--- /dev/null --- /dev/null
+++ b/fs/aufs/opts.c +++ b/fs/aufs/opts.c
@@ -0,0 +1,1877 @@ @@ -0,0 +1,1880 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -26242,6 +26245,7 @@ index 000000000000..c92ca14574ff
+ case Opt_wsum: + case Opt_wsum:
+ au_opt_clr(sbinfo->si_mntflags, SUM); + au_opt_clr(sbinfo->si_mntflags, SUM);
+ au_opt_set(sbinfo->si_mntflags, SUM_W); + au_opt_set(sbinfo->si_mntflags, SUM_W);
+ break;
+ case Opt_nosum: + case Opt_nosum:
+ au_opt_clr(sbinfo->si_mntflags, SUM); + au_opt_clr(sbinfo->si_mntflags, SUM);
+ au_opt_clr(sbinfo->si_mntflags, SUM_W); + au_opt_clr(sbinfo->si_mntflags, SUM_W);
@ -26367,8 +26371,10 @@ index 000000000000..c92ca14574ff
+ if (opt->add.bindex < 0) + if (opt->add.bindex < 0)
+ opt->add.bindex = 0; + opt->add.bindex = 0;
+ goto add; + goto add;
+ /* Always goto add, not fallthrough */
+ case Opt_prepend: + case Opt_prepend:
+ opt->add.bindex = 0; + opt->add.bindex = 0;
+ /* fallthrough */
+ add: /* indented label */ + add: /* indented label */
+ case Opt_add: + case Opt_add:
+ err = au_br_add(sb, &opt->add, + err = au_br_add(sb, &opt->add,
@ -38010,10 +38016,10 @@ index 000000000000..35ea33469d36
+ return err; + return err;
+} +}
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index c435398f2c81..3fc74e471924 100644 index e88cf0554e65..00d7e6a08026 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -1247,7 +1247,7 @@ enum d_walk_ret { @@ -1264,7 +1264,7 @@ enum d_walk_ret {
* *
* The @enter() callbacks are called with d_lock held. * The @enter() callbacks are called with d_lock held.
*/ */
@ -38022,7 +38028,7 @@ index c435398f2c81..3fc74e471924 100644
enum d_walk_ret (*enter)(void *, struct dentry *)) enum d_walk_ret (*enter)(void *, struct dentry *))
{ {
struct dentry *this_parent; struct dentry *this_parent;
@@ -1352,6 +1352,7 @@ static void d_walk(struct dentry *parent, void *data, @@ -1369,6 +1369,7 @@ static void d_walk(struct dentry *parent, void *data,
seq = 1; seq = 1;
goto again; goto again;
} }
@ -38030,7 +38036,7 @@ index c435398f2c81..3fc74e471924 100644
struct check_mount { struct check_mount {
struct vfsmount *mnt; struct vfsmount *mnt;
@@ -2850,6 +2851,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2) @@ -2914,6 +2915,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock); write_sequnlock(&rename_lock);
} }
@ -38039,7 +38045,7 @@ index c435398f2c81..3fc74e471924 100644
/** /**
* d_ancestor - search for an ancestor * d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c diff --git a/fs/exec.c b/fs/exec.c
index 39902cc9eb6f..ed8f4957a4a6 100644 index f7f6a140856a..1a740f3c42ba 100644
--- a/fs/exec.c --- a/fs/exec.c
+++ b/fs/exec.c +++ b/fs/exec.c
@@ -110,6 +110,7 @@ bool path_noexec(const struct path *path) @@ -110,6 +110,7 @@ bool path_noexec(const struct path *path)
@ -38109,7 +38115,7 @@ index b07b53f24ff5..34b9bbf4c556 100644
void __init files_init(void) void __init files_init(void)
{ {
diff --git a/fs/inode.c b/fs/inode.c diff --git a/fs/inode.c b/fs/inode.c
index 2bf21e2c90fc..c8f1c0d3c34d 100644 index 0f1e3b563c47..7432b8a81c53 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -882,6 +882,8 @@ unsigned int get_next_ino(void) @@ -882,6 +882,8 @@ unsigned int get_next_ino(void)
@ -38148,10 +38154,10 @@ index 2bf21e2c90fc..c8f1c0d3c34d 100644
/** /**
* touch_atime - update the access time * touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index 6fbc9126367a..6cb11bd6ff9a 100644 index d28d30b13043..2b64af58b643 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -436,6 +436,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
mnt_dec_writers(real_mount(mnt)); mnt_dec_writers(real_mount(mnt));
preempt_enable(); preempt_enable();
} }
@ -38159,7 +38165,7 @@ index 6fbc9126367a..6cb11bd6ff9a 100644
/** /**
* mnt_drop_write - give up write access to a mount * mnt_drop_write - give up write access to a mount
@@ -770,6 +771,13 @@ static inline int check_mnt(struct mount *mnt) @@ -776,6 +777,13 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns; return mnt->mnt_ns == current->nsproxy->mnt_ns;
} }
@ -38173,7 +38179,7 @@ index 6fbc9126367a..6cb11bd6ff9a 100644
/* /*
* vfsmount lock must be held for write * vfsmount lock must be held for write
*/ */
@@ -1902,6 +1910,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, @@ -1894,6 +1902,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
} }
return 0; return 0;
} }
@ -38258,10 +38264,10 @@ index a59abe3c669a..78809163ba03 100644
long vfs_truncate(const struct path *path, loff_t length) long vfs_truncate(const struct path *path, loff_t length)
{ {
diff --git a/fs/proc/base.c b/fs/proc/base.c diff --git a/fs/proc/base.c b/fs/proc/base.c
index e781af70d10d..97aee11aee79 100644 index ebea9501afb8..dc7edc5f7267 100644
--- a/fs/proc/base.c --- a/fs/proc/base.c
+++ b/fs/proc/base.c +++ b/fs/proc/base.c
@@ -2038,7 +2038,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) @@ -2037,7 +2037,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
rc = -ENOENT; rc = -ENOENT;
vma = find_exact_vma(mm, vm_start, vm_end); vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) { if (vma && vma->vm_file) {
@ -38287,7 +38293,7 @@ index 14c2badb8fd9..65afe5287e43 100644
ino = inode->i_ino; ino = inode->i_ino;
} }
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 7f84d1477b5b..3d9ee997b3d0 100644 index 731642e0f5a0..e8d6259de65b 100644
--- a/fs/proc/task_mmu.c --- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c
@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) @@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@ -38302,7 +38308,7 @@ index 7f84d1477b5b..3d9ee997b3d0 100644
dev = inode->i_sb->s_dev; dev = inode->i_sb->s_dev;
ino = inode->i_ino; ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1774,7 +1777,7 @@ static int show_numa_map(struct seq_file *m, void *v) @@ -1807,7 +1810,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps; struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v; struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md; struct numa_maps *md = &numa_priv->md;
@ -38328,7 +38334,7 @@ index 7907e6419e57..d17209cf52bc 100644
ino = inode->i_ino; ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/fs/read_write.c b/fs/read_write.c diff --git a/fs/read_write.c b/fs/read_write.c
index c543d965e288..9da238d64ea4 100644 index 5bbf587f5bc1..5b2dbddb0efe 100644
--- a/fs/read_write.c --- a/fs/read_write.c
+++ b/fs/read_write.c +++ b/fs/read_write.c
@@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) @@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
@ -38379,7 +38385,7 @@ index c543d965e288..9da238d64ea4 100644
/* file_ppos returns &file->f_pos or NULL if file is stream */ /* file_ppos returns &file->f_pos or NULL if file is stream */
static inline loff_t *file_ppos(struct file *file) static inline loff_t *file_ppos(struct file *file)
diff --git a/fs/splice.c b/fs/splice.c diff --git a/fs/splice.c b/fs/splice.c
index 14cb602d9a2f..4fe4afa7f6b1 100644 index 98412721f056..0a1f7498c22b 100644
--- a/fs/splice.c --- a/fs/splice.c
+++ b/fs/splice.c +++ b/fs/splice.c
@@ -834,8 +834,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); @@ -834,8 +834,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
@ -38453,10 +38459,10 @@ index 90dd78f0eb27..40b01dd1b14a 100644
ssize_t ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index 79fec8a8413f..363bd32c0466 100644 index 997a530ff4e9..3dbec51c2037 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1333,6 +1333,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1331,6 +1331,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */ /* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int); extern void kill_fasync(struct fasync_struct **, int, int);
@ -38464,7 +38470,7 @@ index 79fec8a8413f..363bd32c0466 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force); extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp); extern void f_delown(struct file *filp);
@@ -1812,6 +1813,7 @@ struct file_operations { @@ -1810,6 +1811,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int); int (*check_flags)(int);
@ -38472,7 +38478,7 @@ index 79fec8a8413f..363bd32c0466 100644
int (*flock) (struct file *, int, struct file_lock *); int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -1882,6 +1884,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, @@ -1880,6 +1882,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer, struct iovec *fast_pointer,
struct iovec **ret_pointer); struct iovec **ret_pointer);
@ -38485,7 +38491,7 @@ index 79fec8a8413f..363bd32c0466 100644
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
@@ -2315,6 +2323,7 @@ extern int current_umask(void); @@ -2298,6 +2306,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode); extern void ihold(struct inode * inode);
extern void iput(struct inode *); extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int); extern int generic_update_time(struct inode *, struct timespec64 *, int);
@ -38493,7 +38499,7 @@ index 79fec8a8413f..363bd32c0466 100644
/* /sys/fs */ /* /sys/fs */
extern struct kobject *fs_kobj; extern struct kobject *fs_kobj;
@@ -2603,6 +2612,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) @@ -2586,6 +2595,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false; return false;
} }
#endif #endif
@ -38502,10 +38508,10 @@ index 79fec8a8413f..363bd32c0466 100644
extern const struct file_operations def_blk_fops; extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops; extern const struct file_operations def_chr_fops;
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 6e2377e6c1d6..5a945d18a72a 100644 index 0b0d7259276d..12d18e180348 100644
--- a/include/linux/lockdep.h --- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h +++ b/include/linux/lockdep.h
@@ -325,6 +325,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, @@ -334,6 +334,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key; return lock->key == key;
} }
@ -38514,7 +38520,7 @@ index 6e2377e6c1d6..5a945d18a72a 100644
/* /*
* Acquire a lock. * Acquire a lock.
* *
@@ -463,6 +465,7 @@ struct lockdep_map { }; @@ -476,6 +478,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0) #define lockdep_depth(tsk) (0)
@ -38523,10 +38529,10 @@ index 6e2377e6c1d6..5a945d18a72a 100644
#define lockdep_assert_held(l) do { (void)(l); } while (0) #define lockdep_assert_held(l) do { (void)(l); } while (0)
diff --git a/include/linux/mm.h b/include/linux/mm.h diff --git a/include/linux/mm.h b/include/linux/mm.h
index 0a6dae2f2b84..dd74bb1d1f51 100644 index 0334ca97c584..3bdae823daee 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1558,6 +1558,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -1538,6 +1538,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0); unmap_mapping_range(mapping, holebegin, holelen, 0);
} }
@ -38556,10 +38562,10 @@ index 0a6dae2f2b84..dd74bb1d1f51 100644
void *buf, int len, unsigned int gup_flags); void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 8ec38b11b361..d3f5492a2611 100644 index 6a7a1083b6fb..461db8843e32 100644
--- a/include/linux/mm_types.h --- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h +++ b/include/linux/mm_types.h
@@ -253,6 +253,7 @@ struct vm_region { @@ -262,6 +262,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */ unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */ unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */ struct file *vm_file; /* the backing file or NULL */
@ -38567,14 +38573,14 @@ index 8ec38b11b361..d3f5492a2611 100644
int vm_usage; /* region usage count (access under nommu_region_sem) */ int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for bool vm_icache_flushed : 1; /* true if the icache has been flushed for
@@ -327,6 +328,7 @@ struct vm_area_struct { @@ -336,6 +337,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */ units */
struct file * vm_file; /* File we map to (can be NULL). */ struct file * vm_file; /* File we map to (can be NULL). */
+ struct file *vm_prfile; /* shadow of vm_file */ + struct file *vm_prfile; /* shadow of vm_file */
void * vm_private_data; /* was vm_pte (shared mem) */ void * vm_private_data; /* was vm_pte (shared mem) */
atomic_long_t swap_readahead_info; #ifdef CONFIG_SWAP
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
index 35942084cd40..24f5fd1a789d 100644 index 35942084cd40..24f5fd1a789d 100644
--- a/include/linux/mnt_namespace.h --- a/include/linux/mnt_namespace.h
@ -38611,11 +38617,11 @@ index 74b4911ac16d..19789fbea567 100644
#endif #endif
diff --git a/include/uapi/linux/aufs_type.h b/include/uapi/linux/aufs_type.h diff --git a/include/uapi/linux/aufs_type.h b/include/uapi/linux/aufs_type.h
new file mode 100644 new file mode 100644
index 000000000000..4e16fdc205d6 index 000000000000..f5c1150463a1
--- /dev/null --- /dev/null
+++ b/include/uapi/linux/aufs_type.h +++ b/include/uapi/linux/aufs_type.h
@@ -0,0 +1,448 @@ @@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
+ * + *
@ -38657,7 +38663,7 @@ index 000000000000..4e16fdc205d6
+ +
+#include <linux/limits.h> +#include <linux/limits.h>
+ +
+#define AUFS_VERSION "5.2-20190715" +#define AUFS_VERSION "5.3-20190923"
+ +
+/* todo? move this to linux-2.6.19/include/magic.h */ +/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@ -38871,7 +38877,11 @@ index 000000000000..4e16fdc205d6
+ +
+/* borrowed from linux/include/linux/kernel.h */ +/* borrowed from linux/include/linux/kernel.h */
+#ifndef ALIGN +#ifndef ALIGN
+#ifdef _GNU_SOURCE
+#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) +#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1)
+#else
+#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
+#endif
+#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask)) +#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask))
+#endif +#endif
+ +
@ -39064,7 +39074,7 @@ index 000000000000..4e16fdc205d6
+ +
+#endif /* __AUFS_TYPE_H__ */ +#endif /* __AUFS_TYPE_H__ */
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index d3f006ed2f9d..e4478e2f1c08 100644 index 541fd805fb88..3208fcf3b3c9 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -553,7 +553,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -553,7 +553,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@ -39077,21 +39087,21 @@ index d3f006ed2f9d..e4478e2f1c08 100644
atomic_dec(&inode->i_writecount); atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping); i_mmap_lock_write(mapping);
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index dbc936ccf149..4fc8dc30cec0 100644 index 4861cf8e274b..739d1c8a81f5 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -152,7 +152,7 @@ static @@ -153,7 +153,7 @@ static
#endif
struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
-static inline struct lock_class *hlock_class(struct held_lock *hlock) -static inline struct lock_class *hlock_class(struct held_lock *hlock)
+inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) +inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
{ {
if (!hlock->class_idx) { unsigned int class_idx = hlock->class_idx;
/*
@@ -163,6 +163,8 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) @@ -174,6 +174,8 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
} */
return lock_classes + hlock->class_idx - 1; return lock_classes + class_idx;
} }
+EXPORT_SYMBOL_GPL(lockdep_hlock_class); +EXPORT_SYMBOL_GPL(lockdep_hlock_class);
+#define hlock_class(hlock) lockdep_hlock_class(hlock) +#define hlock_class(hlock) lockdep_hlock_class(hlock)
@ -39108,23 +39118,23 @@ index 0fef395662a6..83fb1ecfc33d 100644
} }
+EXPORT_SYMBOL_GPL(task_work_run); +EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/mm/Makefile b/mm/Makefile diff --git a/mm/Makefile b/mm/Makefile
index ac5e5ba78874..5decb22d13a0 100644 index d0b295c3b764..6156cd3d1ab0 100644
--- a/mm/Makefile --- a/mm/Makefile
+++ b/mm/Makefile +++ b/mm/Makefile
@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ @@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
mm_init.o mmu_context.o percpu.o slab_common.o \ mm_init.o mmu_context.o percpu.o slab_common.o \
compaction.o vmacache.o \ compaction.o vmacache.o \
interval_tree.o list_lru.o workingset.o \ interval_tree.o list_lru.o workingset.o \
- debug.o $(mmu-y) - debug.o gup.o $(mmu-y)
+ prfile.o debug.o $(mmu-y) + prfile.o debug.o gup.o $(mmu-y)
# Give 'page_alloc' its own module-parameter namespace # Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c diff --git a/mm/filemap.c b/mm/filemap.c
index 861e26ee4c72..7ac5b439794c 100644 index d0cf700bf201..5cac93e7bf67 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -2723,7 +2723,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) @@ -2721,7 +2721,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED; vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb); sb_start_pagefault(inode->i_sb);
@ -39231,10 +39241,10 @@ index 7e8c3e8ae75f..d8a903f61262 100644
new_vma->vm_ops->open(new_vma); new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent); vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c diff --git a/mm/nommu.c b/mm/nommu.c
index b2823519f8cd..d7e4abcaca3e 100644 index fed1b6e9c89b..0d43b248ed54 100644
--- a/mm/nommu.c --- a/mm/nommu.c
+++ b/mm/nommu.c +++ b/mm/nommu.c
@@ -640,7 +640,7 @@ static void __put_nommu_region(struct vm_region *region) @@ -552,7 +552,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem); up_write(&nommu_region_sem);
if (region->vm_file) if (region->vm_file)
@ -39243,7 +39253,7 @@ index b2823519f8cd..d7e4abcaca3e 100644
/* IO memory and memory shared directly out of the pagecache /* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */ * from ramfs/tmpfs mustn't be released here */
@@ -778,7 +778,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) @@ -690,7 +690,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close) if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma); vma->vm_ops->close(vma);
if (vma->vm_file) if (vma->vm_file)
@ -39252,7 +39262,7 @@ index b2823519f8cd..d7e4abcaca3e 100644
put_nommu_region(vma->vm_region); put_nommu_region(vma->vm_region);
vm_area_free(vma); vm_area_free(vma);
} }
@@ -1301,7 +1301,7 @@ unsigned long do_mmap(struct file *file, @@ -1213,7 +1213,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free; goto error_just_free;
} }
} }
@ -39261,7 +39271,7 @@ index b2823519f8cd..d7e4abcaca3e 100644
kmem_cache_free(vm_region_jar, region); kmem_cache_free(vm_region_jar, region);
region = pregion; region = pregion;
result = start; result = start;
@@ -1376,10 +1376,10 @@ unsigned long do_mmap(struct file *file, @@ -1290,10 +1290,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem); up_write(&nommu_region_sem);
error: error:
if (region->vm_file) if (region->vm_file)
@ -39367,7 +39377,7 @@ index 000000000000..024cdcfae1b1
+} +}
+#endif /* !CONFIG_MMU */ +#endif /* !CONFIG_MMU */
diff --git a/security/device_cgroup.c b/security/device_cgroup.c diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index dc28914fa72e..c2ddfea2b280 100644 index 725674f3276d..83f6494c52a2 100644
--- a/security/device_cgroup.c --- a/security/device_cgroup.c
+++ b/security/device_cgroup.c +++ b/security/device_cgroup.c
@@ -824,3 +824,4 @@ int __devcgroup_check_permission(short type, u32 major, u32 minor, @@ -824,3 +824,4 @@ int __devcgroup_check_permission(short type, u32 major, u32 minor,
@ -39376,10 +39386,10 @@ index dc28914fa72e..c2ddfea2b280 100644
} }
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission); +EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c diff --git a/security/security.c b/security/security.c
index f493db0bf62a..96f118be469f 100644 index 250ee2d76406..2765042d4846 100644
--- a/security/security.c --- a/security/security.c
+++ b/security/security.c +++ b/security/security.c
@@ -993,6 +993,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) @@ -996,6 +996,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0; return 0;
return call_int_hook(path_rmdir, 0, dir, dentry); return call_int_hook(path_rmdir, 0, dir, dentry);
} }
@ -39387,7 +39397,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry) int security_path_unlink(const struct path *dir, struct dentry *dentry)
{ {
@@ -1009,6 +1010,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, @@ -1012,6 +1013,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return 0; return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name); return call_int_hook(path_symlink, 0, dir, dentry, old_name);
} }
@ -39395,7 +39405,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir, int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry) struct dentry *new_dentry)
@@ -1017,6 +1019,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, @@ -1020,6 +1022,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
return 0; return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry); return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
} }
@ -39403,7 +39413,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry, const struct path *new_dir, struct dentry *new_dentry,
@@ -1044,6 +1047,7 @@ int security_path_truncate(const struct path *path) @@ -1047,6 +1050,7 @@ int security_path_truncate(const struct path *path)
return 0; return 0;
return call_int_hook(path_truncate, 0, path); return call_int_hook(path_truncate, 0, path);
} }
@ -39411,7 +39421,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_chmod(const struct path *path, umode_t mode) int security_path_chmod(const struct path *path, umode_t mode)
{ {
@@ -1051,6 +1055,7 @@ int security_path_chmod(const struct path *path, umode_t mode) @@ -1054,6 +1058,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0; return 0;
return call_int_hook(path_chmod, 0, path, mode); return call_int_hook(path_chmod, 0, path, mode);
} }
@ -39419,7 +39429,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{ {
@@ -1058,6 +1063,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) @@ -1061,6 +1066,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
return 0; return 0;
return call_int_hook(path_chown, 0, path, uid, gid); return call_int_hook(path_chown, 0, path, uid, gid);
} }
@ -39427,7 +39437,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_chroot(const struct path *path) int security_path_chroot(const struct path *path)
{ {
@@ -1158,6 +1164,7 @@ int security_inode_permission(struct inode *inode, int mask) @@ -1161,6 +1167,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0; return 0;
return call_int_hook(inode_permission, 0, inode, mask); return call_int_hook(inode_permission, 0, inode, mask);
} }
@ -39435,7 +39445,7 @@ index f493db0bf62a..96f118be469f 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr) int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{ {
@@ -1335,6 +1342,7 @@ int security_file_permission(struct file *file, int mask) @@ -1338,6 +1345,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask); return fsnotify_perm(file, mask);
} }

1477
kernel-i586.config
View file

File diff suppressed because it is too large Load diff

1206
kernel-x86_64.config
View file

File diff suppressed because it is too large Load diff

6
kernel.spec
View file

@ -1,7 +1,7 @@
%define kernelversion 5 %define kernelversion 5
%define patchlevel 2 %define patchlevel 3
# sublevel is used for stable-based kernels # sublevel is used for stable-based kernels
%define sublevel 14 %define sublevel 1
# Release number. Increase this before a rebuild. # Release number. Increase this before a rebuild.
%define rpmrel 1 %define rpmrel 1
@ -201,6 +201,8 @@ BuildRequires: flex
BuildRequires: bzip2 BuildRequires: bzip2
BuildRequires: rsync
%ifarch x86_64 %ifarch x86_64
BuildRequires: numa-devel BuildRequires: numa-devel
%endif %endif