Re-diffed fs-aufs.patch for the kernel 5.2.5+

fs-aufs.patch

@@ -38039,7 +38039,7 @@ index c435398f2c81..3fc74e471924 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index 89a500bb897a..1a722915ed77 100644
+index 39902cc9eb6f..ed8f4957a4a6 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -110,6 +110,7 @@ bool path_noexec(const struct path *path)
@@ -38246,7 +38246,7 @@ index 99ddd126f6f0..2154d69a2c7a 100644
  /*
   * Destroy all marks in destroy_list, waits for SRCU period to finish before
 diff --git a/fs/open.c b/fs/open.c
-index b5b80469b93d..eb818f6b9519 100644
+index a59abe3c669a..78809163ba03 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,
@@ -38258,11 +38258,11 @@ index b5b80469b93d..eb818f6b9519 100644
  long vfs_truncate(const struct path *path, loff_t length)
  {
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 255f6754c70d..2c009be14898 100644
+index e781af70d10d..97aee11aee79 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2014,7 +2014,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
- 	down_read(&mm->mmap_sem);
+@@ -2038,7 +2038,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) {
 -		*path = vma->vm_file->f_path;
@@ -38287,10 +38287,10 @@ index 14c2badb8fd9..65afe5287e43 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 01d4eb0e6bd1..fedfaa012768 100644
+index 7f84d1477b5b..3d9ee997b3d0 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
-@@ -305,7 +305,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)
  	const char *name = NULL;
  
  	if (file) {
@@ -38302,7 +38302,7 @@ index 01d4eb0e6bd1..fedfaa012768 100644
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1761,7 +1764,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1774,7 +1777,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;
@@ -38312,7 +38312,7 @@ index 01d4eb0e6bd1..fedfaa012768 100644
  	struct mm_walk walk = {
  		.hugetlb_entry = gather_hugetlb_stats,
 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 36bf0f2e102e..8df6cbc58756 100644
+index 7907e6419e57..d17209cf52bc 100644
 --- a/fs/proc/task_nommu.c
 +++ b/fs/proc/task_nommu.c
 @@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
@@ -38453,7 +38453,7 @@ index 90dd78f0eb27..40b01dd1b14a 100644
  ssize_t
  __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index f7fdfe93e25d..28593b894e7b 100644
+index 79fec8a8413f..363bd32c0466 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -1333,6 +1333,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -38523,10 +38523,10 @@ index 6e2377e6c1d6..5a945d18a72a 100644
  
  #define lockdep_assert_held(l)			do { (void)(l); } while (0)
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index dd0b5f4e1e45..22030c24191e 100644
+index 0a6dae2f2b84..dd74bb1d1f51 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1553,6 +1553,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1558,6 +1558,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
  	unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  
@@ -39064,7 +39064,7 @@ index 000000000000..4e16fdc205d6
 +
 +#endif /* __AUFS_TYPE_H__ */
 diff --git a/kernel/fork.c b/kernel/fork.c
-index fe83343da24b..1ef95aa1dc6e 100644
+index d3f006ed2f9d..e4478e2f1c08 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -553,7 +553,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -39077,7 +39077,7 @@ index fe83343da24b..1ef95aa1dc6e 100644
  				atomic_dec(&inode->i_writecount);
  			i_mmap_lock_write(mapping);
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index c47788fa85f9..67dccde036a2 100644
+index dbc936ccf149..4fc8dc30cec0 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -152,7 +152,7 @@ static
@@ -39121,10 +39121,10 @@ index ac5e5ba78874..5decb22d13a0 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 6dd9a2274c80..ede6d4892a9c 100644
+index 861e26ee4c72..7ac5b439794c 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -2701,7 +2701,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -2723,7 +2723,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
  	vm_fault_t ret = VM_FAULT_LOCKED;
  
  	sb_start_pagefault(inode->i_sb);
@@ -39231,7 +39231,7 @@ index 7e8c3e8ae75f..d8a903f61262 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 d8c02fbe03b5..22dae8b7216a 100644
+index b2823519f8cd..d7e4abcaca3e 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
 @@ -640,7 +640,7 @@ static void __put_nommu_region(struct vm_region *region)