5.x-rcN 20210308

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

5.x-rcN 20210308
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
5bc48761 · J. R. Okajima · 22a49445 · 5bc48761 · 5bc48761 · 5bc48761
Commit 5bc48761 authored Mar 06, 2021 by J. R. Okajima
--- a/aufs5-base.patch
+++ b/aufs5-base.patch
@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN base patch
 diff --git a/MAINTAINERS b/MAINTAINERS
-index bfc1b86e3e733..cf773a5624338 100644
+index d92f85ca831d3..339cc62f77736 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3017,6 +3017,19 @@ F:	include/linux/audit.h
+@@ -2983,6 +2983,19 @@ F:	include/linux/audit.h
 F:	include/uapi/linux/audit.h
 F:	kernel/audit*
@@ -23,10 +23,10 @@ index bfc1b86e3e733..cf773a5624338 100644
 +F:	include/uapi/linux/aufs_type.h
 +
 AUXILIARY DISPLAY DRIVERS
- M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
+ M:	Miguel Ojeda <ojeda@kernel.org>
 S:	Maintained
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index e5ff328f09175..39d539df0349d 100644
+index a370cde3ddd49..01ca256575fb2 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -761,6 +761,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -55,10 +55,10 @@ index e5ff328f09175..39d539df0349d 100644
 static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 97e81a844a966..a7522ebbca659 100644
+index 7d24ff7eb2068..3caa7ab4b84f1 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1292,7 +1292,7 @@ enum d_walk_ret {
+@@ -1318,7 +1318,7 @@ enum d_walk_ret {
  *
  * The @enter() callbacks are called with d_lock held.
  */
@@ -68,10 +68,10 @@ index 97e81a844a966..a7522ebbca659 100644
 {
 	struct dentry *this_parent;
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 05b36b28f2e87..e747a47a97da4 100644
+index dfc72f15be7fc..d8a12eb63961d 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
 #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
@@ -80,7 +80,7 @@ index 05b36b28f2e87..e747a47a97da4 100644
 {
 	struct inode * inode = file_inode(filp);
 	int error = 0;
-@@ -63,6 +63,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
+@@ -64,6 +64,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
 	if (filp->f_op->check_flags)
 		error = filp->f_op->check_flags(arg);
@@ -90,10 +90,10 @@ index 05b36b28f2e87..e747a47a97da4 100644
 		return error;
 diff --git a/fs/inode.c b/fs/inode.c
-index 6442d97d9a4ab..e4a25c3fa9e55 100644
+index a047ab306f9a8..ba1df0895b69f 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1769,7 +1769,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1772,7 +1772,7 @@ EXPORT_SYMBOL(generic_update_time);
  * This does the actual work of updating an inodes time or version.  Must have
  * had called mnt_want_write() before calling this.
  */
@@ -103,10 +103,10 @@ index 6442d97d9a4ab..e4a25c3fa9e55 100644
 	if (inode->i_op->update_time)
 		return inode->i_op->update_time(inode, time, flags);
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 9d33909d0f9e3..3e16fc64df8b8 100644
+index 56bb5a5fdc0d0..540679d7e0434 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -792,6 +792,12 @@ static inline int check_mnt(struct mount *mnt)
+@@ -807,6 +807,12 @@ static inline int check_mnt(struct mount *mnt)
 	return mnt->mnt_ns == current->nsproxy->mnt_ns;
 }
@@ -120,10 +120,10 @@ index 9d33909d0f9e3..3e16fc64df8b8 100644
  * vfsmount lock must be held for write
  */
 diff --git a/fs/splice.c b/fs/splice.c
-index 866d5c2367b23..55b5356262085 100644
+index 5dbce4dcc1a7d..3e6ba363b7775 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -756,8 +756,8 @@ static int warn_unsupported(struct file *file, const char *op)
+@@ -759,8 +759,8 @@ static int warn_unsupported(struct file *file, const char *op)
 /*
  * Attempt to initiate a splice from pipe to file.
  */
@@ -134,7 +134,7 @@ index 866d5c2367b23..55b5356262085 100644
 {
 	if (unlikely(!out->f_op->splice_write))
 		return warn_unsupported(out, "write");
-@@ -767,9 +767,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -770,9 +770,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 /*
  * Attempt to initiate a splice from a file to a pipe.
  */
@@ -145,8 +145,8 @@ index 866d5c2367b23..55b5356262085 100644
 +		  struct pipe_inode_info *pipe, size_t len,
 +		  unsigned int flags)
 {
+ 	unsigned int p_space;
 	int ret;
 diff --git a/fs/sync.c b/fs/sync.c
 index 1373a610dc784..b7b5a0a0df6ff 100644
 --- a/fs/sync.c
@@ -161,10 +161,10 @@ index 1373a610dc784..b7b5a0a0df6ff 100644
 	if (wait)
 		sync_inodes_sb(sb);
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index fd47deea7c176..91f3fbe5b57ff 100644
+index ec8f3ddf4a6aa..4fa4b24535fde 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1330,6 +1330,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1332,6 +1332,7 @@ extern void fasync_free(struct fasync_struct *);
 /* can be called from interrupts */
 extern void kill_fasync(struct fasync_struct **, int, int);
@@ -172,7 +172,7 @@ index fd47deea7c176..91f3fbe5b57ff 100644
 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 void f_delown(struct file *filp);
-@@ -1841,6 +1842,7 @@ struct file_operations {
+@@ -1909,6 +1910,7 @@ struct file_operations {
 	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);
 	int (*check_flags)(int);
@@ -180,7 +180,7 @@ index fd47deea7c176..91f3fbe5b57ff 100644
 	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_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
-@@ -2326,6 +2328,7 @@ extern int current_umask(void);
+@@ -2428,6 +2430,7 @@ extern int current_umask(void);
 extern void ihold(struct inode * inode);
 extern void iput(struct inode *);
 extern int generic_update_time(struct inode *, struct timespec64 *, int);
@@ -188,7 +188,7 @@ index fd47deea7c176..91f3fbe5b57ff 100644
 /* /sys/fs */
 extern struct kobject *fs_kobj;
-@@ -2562,6 +2565,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2668,6 +2671,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
 }
 void emergency_thaw_all(void);
@@ -197,10 +197,10 @@ index fd47deea7c176..91f3fbe5b57ff 100644
 extern const struct file_operations def_blk_fops;
 extern const struct file_operations def_chr_fops;
 diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index b9e9adec73e8b..e152c49cc3163 100644
+index 7b7ebf2e28ec5..20c46305e057e 100644
 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
-@@ -241,6 +241,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
+@@ -248,6 +248,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
 	return lock->key == key;
 }
@@ -245,7 +245,7 @@ index a55179fd60fc3..8e21c53cf8831 100644
 +			 unsigned int flags);
 #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index bdaf4829098c0..5c3bff75de111 100644
+index c6d0c1dc62532..0f557138af3e9 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -188,7 +188,7 @@ static

--- a/aufs5-kbuild.patch
+++ b/aufs5-kbuild.patch
@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN kbuild patch
 diff --git a/fs/Kconfig b/fs/Kconfig
-index da524c4d7b7e0..50ab89368c2b5 100644
+index 462253ae483a3..f1b652830e2be 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 @@ -288,6 +288,7 @@ source "fs/sysv/Kconfig"
@@ -14,10 +14,10 @@ index da524c4d7b7e0..50ab89368c2b5 100644
 endif # MISC_FILESYSTEMS
 diff --git a/fs/Makefile b/fs/Makefile
-index 999d1a23f036c..0cd76857ca764 100644
+index 3215fe205256d..7218277473b8f 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
+@@ -135,3 +135,4 @@ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
 obj-$(CONFIG_EROFS_FS)		+= erofs/
 obj-$(CONFIG_VBOXSF_FS)		+= vboxsf/
 obj-$(CONFIG_ZONEFS_FS)		+= zonefs/

--- a/aufs5-loopback.patch
+++ b/aufs5-loopback.patch
@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN loopback patch
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 39d539df0349d..4109efe2f6a3a 100644
+index 01ca256575fb2..f5a76bacf6c85 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -646,6 +646,15 @@ static inline void loop_update_dio(struct loop_device *lo)
@@ -67,7 +67,7 @@ index 39d539df0349d..4109efe2f6a3a 100644
 		loop_reread_partitions(lo, bdev);
 	return 0;
 @@ -758,6 +778,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- 	mutex_unlock(&loop_ctl_mutex);
+ 	mutex_unlock(&lo->lo_mutex);
 	if (file)
 		fput(file);
 +	if (virt_file)
@@ -122,7 +122,7 @@ index 39d539df0349d..4109efe2f6a3a 100644
 	gfp_t gfp = lo->old_gfp_mask;
 	struct block_device *bdev = lo->lo_device;
 	int err = 0;
-@@ -1235,6 +1267,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1238,6 +1270,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
 	spin_lock_irq(&lo->lo_lock);
 	lo->lo_backing_file = NULL;
@@ -130,7 +130,7 @@ index 39d539df0349d..4109efe2f6a3a 100644
 	spin_unlock_irq(&lo->lo_lock);
 	loop_release_xfer(lo);
-@@ -1317,6 +1350,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1319,6 +1352,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
 	 */
 	if (filp)
 		fput(filp);
@@ -140,7 +140,7 @@ index 39d539df0349d..4109efe2f6a3a 100644
 }
 diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index af75a5ee40944..1d847cb194ff6 100644
+index a3c04f310672e..161c3c5d1c22b 100644
 --- a/drivers/block/loop.h
 +++ b/drivers/block/loop.h
 @@ -46,7 +46,7 @@ struct loop_device {
@@ -212,7 +212,7 @@ index 94f4f80ae33bf..ca1194354aff4 100644
 #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 589dd01220201..801e0a7faec59 100644
+index d252963a87b53..ecfc5fc96ad8c 100644
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
 @@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {
@@ -228,10 +228,10 @@ index 589dd01220201..801e0a7faec59 100644
 /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 91f3fbe5b57ff..ad1b2e44d538b 100644
+index 4fa4b24535fde..2aec4bc9f5aa1 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1965,6 +1965,10 @@ struct super_operations {
+@@ -2041,6 +2041,10 @@ struct super_operations {
 				  struct shrink_control *);
 	long (*free_cached_objects)(struct super_block *,
 				    struct shrink_control *);

--- a/aufs5-mmap.patch
+++ b/aufs5-mmap.patch
@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN mmap patch
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index b3422cda2a91e..bda8e8ece7208 100644
+index 3851bfcdba56e..d632ddd5f5ee8 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2184,7 +2184,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2183,7 +2183,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
 	rc = -ENOENT;
 	vma = find_exact_vma(mm, vm_start, vm_end);
 	if (vma && vma->vm_file) {
@@ -31,7 +31,7 @@ index 13452b32e2bd5..38acccfef9d49 100644
 		ino = inode->i_ino;
 	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 602e3a52884d8..a36614b84de16 100644
+index 3cec6fbef725e..d83d155870312 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@@ -46,7 +46,7 @@ index 602e3a52884d8..a36614b84de16 100644
 		dev = inode->i_sb->s_dev;
 		ino = inode->i_ino;
 		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1862,7 +1865,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1863,7 +1866,7 @@ static int show_numa_map(struct seq_file *m, void *v)
 	struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
 	struct vm_area_struct *vma = v;
 	struct numa_maps *md = &numa_priv->md;
@@ -72,10 +72,10 @@ index a6d21fc0033c6..02c2de31196e0 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 ecdf8a8cd6aeb..d9b3ec02ecbef 100644
+index 77e64e3eac80b..5e9ae04137eac 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1715,6 +1715,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1726,6 +1726,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
 	unmap_mapping_range(mapping, holebegin, holelen, 0);
 }
@@ -105,7 +105,7 @@ index ecdf8a8cd6aeb..d9b3ec02ecbef 100644
 		void *buf, int len, unsigned int gup_flags);
 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
-index 07d9acb5b19c4..2f395ab624f38 100644
+index 0974ad501a47c..d7c95c625cdbc 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
 @@ -278,6 +278,7 @@ struct vm_region {
@@ -138,7 +138,7 @@ index d66cd1014211b..a2addc21d63fc 100644
 				put_write_access(inode);
 			i_mmap_lock_write(mapping);
 diff --git a/mm/Makefile b/mm/Makefile
-index b6cd2fffa4922..784e2cebe1eac 100644
+index 72227b24a6168..5d03943b08e03 100644
 --- a/mm/Makefile
 +++ b/mm/Makefile
 @@ -52,7 +52,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
@@ -151,10 +151,10 @@ index b6cd2fffa4922..784e2cebe1eac 100644
 # Give 'page_alloc' its own module-parameter namespace
 page-alloc-y := page_alloc.o
 diff --git a/mm/filemap.c b/mm/filemap.c
-index aa0e0fb046700..d883a19f4237e 100644
+index 43700480d897d..be29fc5b9d04b 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -2993,7 +2993,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -3155,7 +3155,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
 	vm_fault_t ret = VM_FAULT_LOCKED;
 	sb_start_pagefault(mapping->host->i_sb);
@@ -164,7 +164,7 @@ index aa0e0fb046700..d883a19f4237e 100644
 	if (page->mapping != mapping) {
 		unlock_page(page);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index dc7206032387c..09b10e20c097c 100644
+index 3f287599a7a30..eb36f1b18f048 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -176,7 +176,7 @@ index dc7206032387c..09b10e20c097c 100644
 	mpol_put(vma_policy(vma));
 	vm_area_free(vma);
 	return next;
-@@ -951,7 +951,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
+@@ -949,7 +949,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
 	if (remove_next) {
 		if (file) {
 			uprobe_munmap(next, next->vm_start, next->vm_end);
@@ -185,7 +185,7 @@ index dc7206032387c..09b10e20c097c 100644
 		}
 		if (next->anon_vma)
 			anon_vma_merge(vma, next);
-@@ -1897,7 +1897,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1895,7 +1895,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	return addr;
 unmap_and_free_vma:
@@ -194,7 +194,7 @@ index dc7206032387c..09b10e20c097c 100644
 	vma->vm_file = NULL;
 	/* Undo any partial mapping done by a device driver. */
-@@ -2757,7 +2757,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2755,7 +2755,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
 		goto out_free_mpol;
 	if (new->vm_file)
@@ -203,7 +203,7 @@ index dc7206032387c..09b10e20c097c 100644
 	if (new->vm_ops && new->vm_ops->open)
 		new->vm_ops->open(new);
-@@ -2776,7 +2776,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2774,7 +2774,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
 	if (new->vm_ops && new->vm_ops->close)
 		new->vm_ops->close(new);
 	if (new->vm_file)
@@ -212,7 +212,7 @@ index dc7206032387c..09b10e20c097c 100644
 	unlink_anon_vmas(new);
  out_free_mpol:
 	mpol_put(vma_policy(new));
-@@ -2969,7 +2969,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2967,7 +2967,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
 	struct vm_area_struct *vma;
 	unsigned long populate = 0;
 	unsigned long ret = -EINVAL;
@@ -221,7 +221,7 @@ index dc7206032387c..09b10e20c097c 100644
 	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
 		     current->comm, current->pid);
-@@ -3044,10 +3044,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -3042,10 +3042,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
 		}
 	}
@@ -250,7 +250,7 @@ index dc7206032387c..09b10e20c097c 100644
 out:
 	mmap_write_unlock(mm);
 	if (populate)
-@@ -3334,7 +3351,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3332,7 +3349,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
 		if (anon_vma_clone(new_vma, vma))
 			goto out_free_mempol;
 		if (new_vma->vm_file)
@@ -260,7 +260,7 @@ index dc7206032387c..09b10e20c097c 100644
 			new_vma->vm_ops->open(new_vma);
 		vma_link(mm, new_vma, prev, rb_link, rb_parent);
 diff --git a/mm/nommu.c b/mm/nommu.c
-index 870fea12823e6..edbc99eee5b6b 100644
+index 5c9ab799c0e63..dd78905704c12 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
 @@ -533,7 +533,7 @@ static void __put_nommu_region(struct vm_region *region)

--- a/aufs5-standalone.patch
+++ b/aufs5-standalone.patch
@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN standalone patch
 diff --git a/fs/dcache.c b/fs/dcache.c
-index a7522ebbca659..d429c984133ca 100644
+index 3caa7ab4b84f1..00e97c9ae7c45 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1397,6 +1397,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1423,6 +1423,7 @@ void d_walk(struct dentry *parent, void *data,
 	seq = 1;
 	goto again;
 }
@@ -13,7 +13,7 @@ index a7522ebbca659..d429c984133ca 100644
 struct check_mount {
 	struct vfsmount *mnt;
-@@ -2942,6 +2943,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2968,6 +2969,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
 	write_sequnlock(&rename_lock);
 }
@@ -22,7 +22,7 @@ index a7522ebbca659..d429c984133ca 100644
 /**
  * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index 5d4d52039105c..adc75877cdee7 100644
+index 18594f11c31fe..ac38c0424d2a3 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -114,6 +114,7 @@ bool path_noexec(const struct path *path)
@@ -34,10 +34,10 @@ index 5d4d52039105c..adc75877cdee7 100644
 #ifdef CONFIG_USELIB
 /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index e747a47a97da4..d6211ff25c9a4 100644
+index d8a12eb63961d..0532996186311 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
+@@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
  out:
 	return error;
 }
@@ -66,22 +66,22 @@ index 45437f8e1003e..786af52904fcf 100644
 void __init files_init(void)
 {
 diff --git a/fs/inode.c b/fs/inode.c
-index e4a25c3fa9e55..497326faa1247 100644
+index ba1df0895b69f..0672530acf7dd 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1775,6 +1775,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
+@@ -1778,6 +1778,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
 		return inode->i_op->update_time(inode, time, flags);
 	return generic_update_time(inode, time, flags);
 }
 +EXPORT_SYMBOL_GPL(update_time);
 /**
-  *	touch_atime	-	update the access time
+  *	atime_needs_update	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 3e16fc64df8b8..eed3453ec40a8 100644
+index 540679d7e0434..74957d5edaa86 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
+@@ -438,6 +438,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
 	mnt_dec_writers(real_mount(mnt));
 	preempt_enable();
 }
@@ -89,7 +89,7 @@ index 3e16fc64df8b8..eed3453ec40a8 100644
 /**
  * mnt_drop_write - give up write access to a mount
-@@ -797,6 +798,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
+@@ -812,6 +813,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
 {
 	return check_mnt(real_mount(mnt));
 }
@@ -97,7 +97,7 @@ index 3e16fc64df8b8..eed3453ec40a8 100644
 /*
  * vfsmount lock must be held for write
-@@ -1967,6 +1969,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1985,6 +1987,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
 	}
 	return 0;
 }
@@ -106,7 +106,7 @@ index 3e16fc64df8b8..eed3453ec40a8 100644
 static void lock_mnt_tree(struct mount *mnt)
 {
 diff --git a/fs/notify/group.c b/fs/notify/group.c
-index a4a4b1c64d32a..86dc2efb1850c 100644
+index ffd723ffe46de..ec6172836b6f6 100644
 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
 @@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
@@ -118,10 +118,10 @@ index a4a4b1c64d32a..86dc2efb1850c 100644
 /*
  * Drop a reference to a group.  Free it if it's through.
 diff --git a/fs/open.c b/fs/open.c
-index 1e06e443a5651..c3bbb8aafcd1a 100644
+index e53af13b5835f..f37da065e6544 100644
 --- a/fs/open.c
 +++ b/fs/open.c
-@@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+@@ -65,6 +65,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,
 	inode_unlock(dentry->d_inode);
 	return ret;
 }
@@ -130,7 +130,7 @@ index 1e06e443a5651..c3bbb8aafcd1a 100644
 long vfs_truncate(const struct path *path, loff_t length)
 {
 diff --git a/fs/read_write.c b/fs/read_write.c
-index 75f764b434184..7582bb3fb634b 100644
+index 9db7adf160d20..8dc93a57a933f 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
 @@ -503,6 +503,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
@@ -150,10 +150,10 @@ index 75f764b434184..7582bb3fb634b 100644
 /* file_ppos returns &file->f_pos or NULL if file is stream */
 static inline loff_t *file_ppos(struct file *file)
 diff --git a/fs/splice.c b/fs/splice.c
-index 55b5356262085..c13ac0fbac318 100644
+index 3e6ba363b7775..7c1be373eb7cd 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -763,6 +763,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 		return warn_unsupported(out, "write");
 	return out->f_op->splice_write(pipe, out, ppos, len, flags);
 }
@@ -161,7 +161,7 @@ index 55b5356262085..c13ac0fbac318 100644
 /*
  * Attempt to initiate a splice from a file to a pipe.
-@@ -787,6 +788,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -795,6 +796,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
 		return warn_unsupported(in, "read");
 	return in->f_op->splice_read(in, ppos, pipe, len, flags);
 }
@@ -182,10 +182,10 @@ index b7b5a0a0df6ff..fa5c7fba7f1ba 100644
 /*
  * Write out and wait upon all dirty data associated with this
 diff --git a/fs/xattr.c b/fs/xattr.c
-index fd57153b1f617..d8e9d0d6853ef 100644
+index b3444e06cded4..7b0f851b63d75 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
-@@ -371,6 +371,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
+@@ -383,6 +383,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
 	*xattr_value = value;
 	return error;
 }
@@ -194,7 +194,7 @@ index fd57153b1f617..d8e9d0d6853ef 100644
 ssize_t
 __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 5c3bff75de111..ff00031462623 100644
+index 0f557138af3e9..ac177ade7d9bd 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -209,6 +209,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -215,10 +215,10 @@ index 9cde961875c0a..ac8c79dc81813 100644
 }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/security.c b/security/security.c
-index 7b09cfbae94f7..3e060cc948262 100644
+index 5ac96b16f8fab..46d334d6ac1f6 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -1094,6 +1094,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -1102,6 +1102,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
 		return 0;
 	return call_int_hook(path_rmdir, 0, dir, dentry);
 }
@@ -226,7 +226,7 @@ index 7b09cfbae94f7..3e060cc948262 100644
 int security_path_unlink(const struct path *dir, struct dentry *dentry)
 {
-@@ -1110,6 +1111,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1118,6 +1119,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
 		return 0;
 	return call_int_hook(path_symlink, 0, dir, dentry, old_name);
 }
@@ -234,7 +234,7 @@ index 7b09cfbae94f7..3e060cc948262 100644
 int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
 		       struct dentry *new_dentry)
-@@ -1118,6 +1120,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1126,6 +1128,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
 		return 0;
 	return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
 }
@@ -242,7 +242,7 @@ index 7b09cfbae94f7..3e060cc948262 100644
 int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
 			 const struct path *new_dir, struct dentry *new_dentry,
-@@ -1145,6 +1148,7 @@ int security_path_truncate(const struct path *path)
+@@ -1153,6 +1156,7 @@ int security_path_truncate(const struct path *path)
 		return 0;
 	return call_int_hook(path_truncate, 0, path);
 }
@@ -250,7 +250,7 @@ index 7b09cfbae94f7..3e060cc948262 100644
 int security_path_chmod(const struct path *path, umode_t mode)
 {
-@@ -1152,6 +1156,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1160,6 +1164,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
 		return 0;
 	return call_int_hook(path_chmod, 0, path, mode);
 }
@@ -258,7 +258,7 @@ index 7b09cfbae94f7..3e060cc948262 100644
 int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
 {
-@@ -1159,6 +1164,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1167,6 +1172,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
 		return 0;
 	return call_int_hook(path_chown, 0, path, uid, gid);
 }
@@ -266,7 +266,7 @@ index 7b09cfbae94f7..3e060cc948262 100644
 int security_path_chroot(const struct path *path)
 {
-@@ -1259,6 +1265,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -1267,6 +1273,7 @@ int security_inode_permission(struct inode *inode, int mask)
 		return 0;
 	return call_int_hook(inode_permission, 0, inode, mask);
 }
@@ -274,7 +274,7 @@ index 7b09cfbae94f7..3e060cc948262 100644
 int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
 {
-@@ -1451,6 +1458,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -1464,6 +1471,7 @@ int security_file_permission(struct file *file, int mask)
 	return fsnotify_perm(file, mask);
 }

--- a/include/uapi/linux/aufs_type.h
+++ b/include/uapi/linux/aufs_type.h
@@ -40,7 +40,7 @@
 #include <limits.h>
 #endif /* __KERNEL__ */
-#define AUFS_VERSION	"5.x-rcN-20210222"
+#define AUFS_VERSION	"5.x-rcN-20210308"
 /* todo? move this to linux-2.6.19/include/magic.h */
 #define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

--- a/lockdep-debug.patch
+++ b/lockdep-debug.patch
@@ -2,11 +2,11 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN lockdep patch
 diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index e152c49cc3163..78d8963ba9a31 100644
+index 20c46305e057e..17362f35d3845 100644
 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index ff00031462623..b76744a37ed28 100644
+index ac177ade7d9bd..d5dacc66ec2ec 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h

--- a/tmpfs-idr.patch
+++ b/tmpfs-idr.patch
@@ -21,7 +21,7 @@ index d82b6f396588..ff9c7acfedc8 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 7c6b6d8f6c39..2990e627cf6c 100644
+index b2db4ed0fbc7..031a61e0920f 100644
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
 @@ -109,7 +109,7 @@ struct shmem_falloc {
@@ -50,7 +50,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 }
 #endif
-@@ -1178,6 +1181,11 @@ static void shmem_evict_inode(struct inode *inode)
+@@ -1152,6 +1155,11 @@ static void shmem_evict_inode(struct inode *inode)
 	simple_xattrs_free(&info->xattrs);
 	WARN_ON(inode->i_blocks);
@@ -62,15 +62,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 	shmem_free_inode(inode->i_sb);
 	clear_inode(inode);
 }
-@@ -2302,7 +2310,6 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
+@@ -2348,6 +2356,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
- 	inode = new_inode(sb);
- 	if (inode) {
-		inode->i_ino = ino;
- 		inode_init_owner(inode, dir, mode);
- 		inode->i_blocks = 0;
- 		inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
-@@ -2346,6 +2353,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
 			break;
 		}
@@ -96,7 +88,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 		lockdep_annotate_inode_mutex_key(inode);
 	} else
 		shmem_free_inode(sb);
-@@ -3334,8 +3360,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
+@@ -3280,8 +3307,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
 static int shmem_match(struct inode *ino, void *vfh)
 {
 	__u32 *fh = vfh;
@@ -106,7 +98,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 	return ino->i_ino == inum && fh[0] == ino->i_generation;
 }
-@@ -3355,14 +3380,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
+@@ -3301,14 +3327,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
 	struct dentry *dentry = NULL;
 	u64 inum;
@@ -124,7 +116,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 	if (inode) {
 		dentry = shmem_find_alias(inode);
 		iput(inode);
-@@ -3374,30 +3396,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
+@@ -3320,30 +3343,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)
 {
@@ -158,7 +150,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 	return 1;
 }
-@@ -3476,7 +3483,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
+@@ -3422,7 +3430,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);
@@ -167,7 +159,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 			goto bad_value;
 		ctx->seen |= SHMEM_SEEN_INODES;
 		break;
-@@ -3586,7 +3593,7 @@ static int shmem_reconfigure(struct fs_context *fc)
+@@ -3532,7 +3540,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);
@@ -176,7 +168,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 	const char *err;
 	spin_lock(&sbinfo->stat_lock);
-@@ -3653,7 +3660,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
+@@ -3599,7 +3607,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())
@@ -185,7 +177,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 	if (sbinfo->mode != (0777 | S_ISVTX))
 		seq_printf(seq, ",mode=%03ho", sbinfo->mode);
 	if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
-@@ -3700,6 +3707,8 @@ static void shmem_put_super(struct super_block *sb)
+@@ -3646,6 +3654,8 @@ static void shmem_put_super(struct super_block *sb)
 {
 	struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
@@ -194,7 +186,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 	free_percpu(sbinfo->ino_batch);
 	percpu_counter_destroy(&sbinfo->used_blocks);
 	mpol_put(sbinfo->mpol);
-@@ -3743,6 +3752,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
+@@ -3689,6 +3699,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
 #else
 	sb->s_flags |= SB_NOUSER;
 #endif
@@ -203,7 +195,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 	sbinfo->max_blocks = ctx->blocks;
 	sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes;
 	if (sb->s_flags & SB_KERNMOUNT) {
-@@ -3860,6 +3871,15 @@ static void shmem_destroy_inodecache(void)
+@@ -3806,6 +3818,15 @@ static void shmem_destroy_inodecache(void)
 	kmem_cache_destroy(shmem_inode_cachep);
 }
@@ -219,7 +211,7 @@ index 7c6b6d8f6c39..2990e627cf6c 100644
 const struct address_space_operations shmem_aops = {
 	.writepage	= shmem_writepage,
 	.set_page_dirty	= __set_page_dirty_no_writeback,
-@@ -4001,6 +4021,7 @@ int __init shmem_init(void)
+@@ -3947,6 +3968,7 @@ int __init shmem_init(void)
 		pr_err("Could not kern_mount tmpfs\n");
 		goto out1;
 	}

--- a/vfs-ino.patch
+++ b/vfs-ino.patch
 SPDX-License-Identifier: GPL-2.0
 diff --git a/fs/inode.c b/fs/inode.c
-index 6442d97d9a4a..6fc78882550e 100644
+index a047ab306f9a..416de919417e 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -893,6 +893,8 @@ unsigned int get_next_ino(void)
+@@ -894,6 +894,8 @@ unsigned int get_next_ino(void)
 	unsigned int *p = &get_cpu_var(last_ino);
 	unsigned int res = *p;
@@ -13,7 +13,7 @@ index 6442d97d9a4a..6fc78882550e 100644
 #ifdef CONFIG_SMP
 	if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
 		static atomic_t shared_last_ino;
-@@ -905,7 +907,7 @@ unsigned int get_next_ino(void)
+@@ -906,7 +908,7 @@ unsigned int get_next_ino(void)
 	res++;
 	/* get_next_ino should not provide a 0 inode number */
 	if (unlikely(!res))