5.x-rcN 20200127

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

aufs5-base.patch

@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 4017e6b760be..1ca1b5218744 100644
+index cf6ccca6e61c..c3b9b0d405fd 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -2877,6 +2877,19 @@ F:	include/linux/audit.h
@@ -298,7 +298,7 @@ index 74b4911ac16d..19789fbea567 100644
 +			 unsigned int flags);
  #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 32282e7112d3..9d1b34c71e3c 100644
+index 32406ef0d6a2..e52169c2086b 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -153,7 +153,7 @@ static

aufs5-loopback.patch

@@ -153,7 +153,7 @@ index af75a5ee4094..1d847cb194ff 100644
  	void		*key_data; 
  
 diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 240509add504..ae374ce4ded7 100644
+index 6fb4a4ed8cc7..ba9a959f2db2 100644
 --- a/fs/aufs/f_op.c
 +++ b/fs/aufs/f_op.c
 @@ -359,7 +359,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
@@ -166,7 +166,7 @@ index 240509add504..ae374ce4ded7 100644
  		if (file->f_mapping != h_file->f_mapping) {
  			file->f_mapping = h_file->f_mapping;
 diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
-index 9ba35a878ecd..4ed0ff03d5ab 100644
+index a8b63acc6204..9d97c3af5686 100644
 --- a/fs/aufs/loop.c
 +++ b/fs/aufs/loop.c
 @@ -133,3 +133,19 @@ void au_loopback_fin(void)
@@ -190,7 +190,7 @@ index 9ba35a878ecd..4ed0ff03d5ab 100644
 +	return f;
 +}
 diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index f31e40aff267..e13fb1a0717a 100644
+index 94f4f80ae33b..ca1194354aff 100644
 --- a/fs/aufs/loop.h
 +++ b/fs/aufs/loop.h
 @@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
@@ -212,7 +212,7 @@ index f31e40aff267..e13fb1a0717a 100644
  
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 95df083a5888..2db407f441fe 100644
+index 589dd0122020..801e0a7faec5 100644
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
 @@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {

aufs5-mmap.patch

@@ -72,7 +72,7 @@ index 7907e6419e57..d17209cf52bc 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 80a9162b406c..b62eb5096595 100644
+index cfaa8feecfe8..b66c4c536ac5 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -1495,6 +1495,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -306,7 +306,7 @@ index bd2b4e5ef144..acdab5253263 100644
  
 diff --git a/mm/prfile.c b/mm/prfile.c
 new file mode 100644
-index 000000000000..024cdcfae1b1
+index 000000000000..00d51187c325
 --- /dev/null
 +++ b/mm/prfile.c
 @@ -0,0 +1,86 @@
@@ -318,7 +318,7 @@ index 000000000000..024cdcfae1b1
 + *
 + * See Documentation/filesystems/aufs/design/06mmap.txt
 + *
-+ * Copyright (c) 2014-2019 Junjro R. Okajima
++ * Copyright (c) 2014-2020 Junjro R. Okajima
 + * Copyright (c) 2014 Ian Campbell
 + */
 +

aufs5-standalone.patch

@@ -210,7 +210,7 @@ index 90dd78f0eb27..40b01dd1b14a 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 9d1b34c71e3c..bfa1670007fe 100644
+index e52169c2086b..d9bc5cbe9078 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -174,6 +174,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)

include/uapi/linux/aufs_type.h

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

lockdep-debug.patch

@@ -15,7 +15,7 @@ index 4f4677020360..1aef2c1047a3 100644
  #include <linux/types.h>
  
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index bfa1670007fe..cfab08627d58 100644
+index d9bc5cbe9078..30cdce225406 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

proc_mounts.patch

 SPDX-License-Identifier: GPL-2.0
+
 diff --git a/fs/mount.h b/fs/mount.h
 index 711a4093e475..a5703d5c7205 100644
 --- a/fs/mount.h

tmpfs-idr.patch

 SPDX-License-Identifier: GPL-2.0
+
 diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
 index de8e4b71e3ba..ae8c9fcaea91 100644
 --- a/include/linux/shmem_fs.h
@@ -20,7 +21,7 @@ index de8e4b71e3ba..ae8c9fcaea91 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 165fa6332993..bdfe59273826 100644
+index 8793e8cc1a48..ae68925ff71a 100644
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
 @@ -110,7 +110,7 @@ struct shmem_falloc {
@@ -61,7 +62,7 @@ index 165fa6332993..bdfe59273826 100644
  	shmem_free_inode(inode->i_sb);
  	clear_inode(inode);
  }
-@@ -2241,13 +2249,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
+@@ -2242,13 +2250,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
  	struct inode *inode;
  	struct shmem_inode_info *info;
  	struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
@@ -76,7 +77,7 @@ index 165fa6332993..bdfe59273826 100644
  		inode_init_owner(inode, dir, mode);
  		inode->i_blocks = 0;
  		inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
-@@ -2291,6 +2299,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
+@@ -2292,6 +2300,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
  			break;
  		}
  
@@ -102,7 +103,7 @@ index 165fa6332993..bdfe59273826 100644
  		lockdep_annotate_inode_mutex_key(inode);
  	} else
  		shmem_free_inode(sb);
-@@ -3296,8 +3323,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
+@@ -3297,8 +3324,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
  static int shmem_match(struct inode *ino, void *vfh)
  {
  	__u32 *fh = vfh;
@@ -112,7 +113,7 @@ index 165fa6332993..bdfe59273826 100644
  	return ino->i_ino == inum && fh[0] == ino->i_generation;
  }
  
-@@ -3317,14 +3343,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
+@@ -3318,14 +3344,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
  	struct dentry *dentry = NULL;
  	u64 inum;
  
@@ -130,7 +131,7 @@ index 165fa6332993..bdfe59273826 100644
  	if (inode) {
  		dentry = shmem_find_alias(inode);
  		iput(inode);
-@@ -3336,30 +3359,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
+@@ -3337,30 +3360,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)
  {
@@ -164,7 +165,7 @@ index 165fa6332993..bdfe59273826 100644
  	return 1;
  }
  
-@@ -3440,7 +3448,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
+@@ -3441,7 +3449,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);
@@ -173,7 +174,7 @@ index 165fa6332993..bdfe59273826 100644
  			goto bad_value;
  		ctx->seen |= SHMEM_SEEN_INODES;
  		break;
-@@ -3538,7 +3546,7 @@ static int shmem_reconfigure(struct fs_context *fc)
+@@ -3539,7 +3547,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);
@@ -182,7 +183,7 @@ index 165fa6332993..bdfe59273826 100644
  	const char *err;
  
  	spin_lock(&sbinfo->stat_lock);
-@@ -3597,7 +3605,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
+@@ -3598,7 +3606,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())
@@ -191,7 +192,7 @@ index 165fa6332993..bdfe59273826 100644
  	if (sbinfo->mode != (0777 | S_ISVTX))
  		seq_printf(seq, ",mode=%03ho", sbinfo->mode);
  	if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
-@@ -3621,6 +3629,8 @@ static void shmem_put_super(struct super_block *sb)
+@@ -3622,6 +3630,8 @@ static void shmem_put_super(struct super_block *sb)
  {
  	struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
  
@@ -200,7 +201,7 @@ index 165fa6332993..bdfe59273826 100644
  	percpu_counter_destroy(&sbinfo->used_blocks);
  	mpol_put(sbinfo->mpol);
  	kfree(sbinfo);
-@@ -3661,6 +3671,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
@@ -209,7 +210,7 @@ index 165fa6332993..bdfe59273826 100644
  	sbinfo->max_blocks = ctx->blocks;
  	sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes;
  	sbinfo->uid = ctx->uid;
-@@ -3772,6 +3784,15 @@ static void shmem_destroy_inodecache(void)
+@@ -3773,6 +3785,15 @@ static void shmem_destroy_inodecache(void)
  	kmem_cache_destroy(shmem_inode_cachep);
  }
  
@@ -225,7 +226,7 @@ index 165fa6332993..bdfe59273826 100644
  static const struct address_space_operations shmem_aops = {
  	.writepage	= shmem_writepage,
  	.set_page_dirty	= __set_page_dirty_no_writeback,
-@@ -3912,6 +3933,7 @@ int __init shmem_init(void)
+@@ -3913,6 +3934,7 @@ int __init shmem_init(void)
  		pr_err("Could not kern_mount tmpfs\n");
  		goto out1;
  	}

vfs-ino.patch

 SPDX-License-Identifier: GPL-2.0
+
 diff --git a/fs/inode.c b/fs/inode.c
 index 96d62d97694e..9f873b4380a4 100644
 --- a/fs/inode.c