[packages/kernel] - fetch 4.12

arekm arekm at pld-linux.org
Sat Jul 29 12:29:08 CEST 2017


commit 1c60b727338bd05e415668bde455f1029ff88814
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Jul 29 12:28:59 2017 +0200

    - fetch 4.12

 kernel-apparmor.patch    |    2 +-
 kernel-aufs4.patch       | 1057 ++++++++++++++++++++--------------------------
 kernel-small_fixes.patch |   34 --
 kernel.spec              |   12 +-
 4 files changed, 460 insertions(+), 645 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 814cb33b..efa5a587 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
-%define		basever		4.11
-%define		postver		.12
+%define		rel		0.1
+%define		basever		4.12
+%define		postver		.4
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -122,10 +122,10 @@ Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5:	251a5deee0fa6daf3f356b1bbda9eab8
+# Source0-md5:	fc454157e2d024d401a60905d6481c6b
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	20d4c52dd76a41a4c67e6ffbd17e560a
+# Patch0-md5:	8b701bde9ab905f36c9917a6afdfb3e5
 %endif
 Source1:	kernel.sysconfig
 
@@ -199,7 +199,7 @@ Patch101:	kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs4-standalone.git
 # cd aufs4-standalone
-# git checkout -b aufs4.9 origin/aufs4.9
+# git checkout -b aufs4.12 origin/aufs4.12
 # cat aufs4-kbuild.patch aufs4-base.patch aufs4-mmap.patch aufs4-standalone.patch > ~/rpm/packages/kernel/kernel-aufs4.patch
 # rm -rf linux && mkdir linux
 # cp -a Documentation fs include linux
diff --git a/kernel-apparmor.patch b/kernel-apparmor.patch
index ff789d3b..539e655a 100644
--- a/kernel-apparmor.patch
+++ b/kernel-apparmor.patch
@@ -326,7 +326,7 @@ index 709eacd23909..e3017129a404 100644
 +	return aa_revalidate_sk(OP_SHUTDOWN, sk);
 +}
 +
- static struct security_hook_list apparmor_hooks[] = {
+ static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = {
  	LSM_HOOK_INIT(ptrace_access_check, apparmor_ptrace_access_check),
  	LSM_HOOK_INIT(ptrace_traceme, apparmor_ptrace_traceme),
 @@ -616,6 +715,19 @@ static struct security_hook_list apparmor_hooks[] = {
diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch
index 3d47d24a..8b5e8f8c 100644
--- a/kernel-aufs4.patch
+++ b/kernel-aufs4.patch
@@ -1,10 +1,10 @@
 aufs4.x-rcN kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
-index 83eab52..31f16c4 100644
+index b0e42b6..7fa4b68 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -248,6 +248,7 @@ source "fs/pstore/Kconfig"
+@@ -249,6 +249,7 @@ source "fs/pstore/Kconfig"
  source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
  source "fs/exofs/Kconfig"
@@ -21,25 +21,13 @@ index 7bbaca9..a026491 100644
  obj-$(CONFIG_PSTORE)		+= pstore/
  obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
 +obj-$(CONFIG_AUFS_FS)           += aufs/
-diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
-index dd9820b..d0435d9 100644
---- a/include/uapi/linux/Kbuild
-+++ b/include/uapi/linux/Kbuild
-@@ -59,6 +59,7 @@ header-y += atmsvc.h
- header-y += atm_tcp.h
- header-y += atm_zatm.h
- header-y += audit.h
-+header-y += aufs_type.h
- header-y += auto_fs4.h
- header-y += auto_fs.h
- header-y += auxvec.h
 aufs4.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 1b0a87f..76fd7cc 100644
+index 09b5ab6..6640ab1 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2319,6 +2319,19 @@ F:	include/linux/audit.h
+@@ -2348,6 +2348,19 @@ F:	include/linux/audit.h
  F:	include/uapi/linux/audit.h
  F:	kernel/audit*
  
@@ -60,10 +48,10 @@ index 1b0a87f..76fd7cc 100644
  M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis at gmail.com>
  W:	http://miguelojeda.es/auxdisplay.htm
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 0ecb646..cf39138 100644
+index ebbd0c3..6b8a6a4c 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -701,6 +701,24 @@ static inline int is_loop_device(struct file *file)
+@@ -700,6 +700,24 @@ static inline int is_loop_device(struct file *file)
  	return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
  }
  
@@ -89,7 +77,7 @@ index 0ecb646..cf39138 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 95d71ed..8ca5f09 100644
+index a9f995f..3458af5 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1164,7 +1164,7 @@ enum d_walk_ret {
@@ -102,10 +90,10 @@ index 95d71ed..8ca5f09 100644
  		   void (*finish)(void *))
  {
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index be8fbe2..f5f4f94 100644
+index f4e7267..d39404c 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -30,7 +30,7 @@
+@@ -31,7 +31,7 @@
  
  #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
  
@@ -114,7 +102,7 @@ index be8fbe2..f5f4f94 100644
  {
  	struct inode * inode = file_inode(filp);
  	int error = 0;
-@@ -61,6 +61,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
+@@ -62,6 +62,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);
@@ -124,10 +112,10 @@ index be8fbe2..f5f4f94 100644
  		return error;
  
 diff --git a/fs/inode.c b/fs/inode.c
-index 88110fd..9a9ba3a 100644
+index db59147..69cbe9c 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1642,7 +1642,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1640,7 +1640,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.
   */
@@ -137,7 +125,7 @@ index 88110fd..9a9ba3a 100644
  	int (*update_time)(struct inode *, struct timespec *, int);
  
 diff --git a/fs/read_write.c b/fs/read_write.c
-index c4f88af..ac71b96 100644
+index 19d4d88..05033f7 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
 @@ -513,6 +513,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
@@ -170,10 +158,10 @@ index c4f88af..ac71b96 100644
  {
  	mm_segment_t old_fs;
 diff --git a/fs/splice.c b/fs/splice.c
-index 006ba50..46c87af 100644
+index 540c4a4..4a0bc62 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -859,8 +859,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -853,8 +853,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -184,7 +172,7 @@ index 006ba50..46c87af 100644
  {
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
  				loff_t *, size_t, unsigned int);
-@@ -876,9 +876,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -870,9 +870,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.
   */
@@ -223,10 +211,10 @@ index 61eb82c..e700888 100644
  static inline void fput_light(struct file *file, int fput_needed)
  {
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 7251f7b..3668627 100644
+index 803e5a9..22d2910 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1246,6 +1246,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1248,6 +1248,7 @@ extern void fasync_free(struct fasync_struct *);
  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  
@@ -234,7 +222,7 @@ index 7251f7b..3668627 100644
  extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
  extern void f_setown(struct file *filp, unsigned long arg, int force);
  extern void f_delown(struct file *filp);
-@@ -1673,6 +1674,7 @@ struct file_operations {
+@@ -1674,6 +1675,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);
@@ -242,7 +230,7 @@ index 7251f7b..3668627 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);
-@@ -1749,6 +1751,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -1750,6 +1752,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
  			      struct iovec *fast_pointer,
  			      struct iovec **ret_pointer);
  
@@ -255,7 +243,7 @@ index 7251f7b..3668627 100644
  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_read(struct file *, char __user *, size_t, loff_t *);
-@@ -2127,6 +2135,7 @@ extern int current_umask(void);
+@@ -2131,6 +2139,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 timespec *, int);
@@ -263,7 +251,7 @@ index 7251f7b..3668627 100644
  
  /* /sys/fs */
  extern struct kobject *fs_kobj;
-@@ -2407,6 +2416,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2411,6 +2420,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
  	return false;
  }
  #endif
@@ -272,10 +260,10 @@ index 7251f7b..3668627 100644
  extern const struct file_operations def_blk_fops;
  extern const struct file_operations def_chr_fops;
 diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 00a2116..1f0a4a2 100644
+index db42746..12f3a5a 100644
 --- a/include/linux/splice.h
 +++ b/include/linux/splice.h
-@@ -86,4 +86,10 @@ extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
+@@ -86,4 +86,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
  
  extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
  extern const struct pipe_buf_operations default_pipe_buf_ops;
@@ -289,10 +277,10 @@ index 00a2116..1f0a4a2 100644
 aufs4.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index c87b6b9..6b71643 100644
+index f1e1927..7b5af0c 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -1946,7 +1946,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -1943,7 +1943,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
  	down_read(&mm->mmap_sem);
  	vma = find_exact_vma(mm, vm_start, vm_end);
  	if (vma && vma->vm_file) {
@@ -318,7 +306,7 @@ index 7563437..7c0dc0f 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index f08bd31..e1b9a37 100644
+index 520802d..61a037d 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -292,7 +292,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
@@ -333,7 +321,7 @@ index f08bd31..e1b9a37 100644
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1629,7 +1632,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1638,7 +1641,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
  	struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
  	struct vm_area_struct *vma = v;
  	struct numa_maps *md = &numa_priv->md;
@@ -359,10 +347,10 @@ index 23266694..58e59b6 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 00a8fa7..a90742b 100644
+index 6f543a4..696494b 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1294,6 +1294,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1306,6 +1306,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
  }
  #endif
  
@@ -392,7 +380,7 @@ index 00a8fa7..a90742b 100644
  		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 f60f45f..38c5f76 100644
+index 45cdb27..1a40012 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
 @@ -259,6 +259,7 @@ struct vm_region {
@@ -412,10 +400,10 @@ index f60f45f..38c5f76 100644
  
  #ifndef CONFIG_MMU
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 6c463c80..24ae37c 100644
+index e53770d..cdf7516 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -641,7 +641,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -665,7 +665,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
  			struct inode *inode = file_inode(file);
  			struct address_space *mapping = file->f_mapping;
  
@@ -438,10 +426,10 @@ index 026f6a8..723da17 100644
  obj-y += init-mm.o
  
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 1694623..68cd758 100644
+index 6f1be57..69a8d94 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -2406,7 +2406,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -2408,7 +2408,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
  	int ret = VM_FAULT_LOCKED;
  
  	sb_start_pagefault(inode->i_sb);
@@ -451,7 +439,7 @@ index 1694623..68cd758 100644
  	if (page->mapping != inode->i_mapping) {
  		unlock_page(page);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index bfbe885..8bd32f9 100644
+index a5e3dcd..a5d908c 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -170,7 +170,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -463,7 +451,7 @@ index bfbe885..8bd32f9 100644
  	mpol_put(vma_policy(vma));
  	kmem_cache_free(vm_area_cachep, vma);
  	return next;
-@@ -881,7 +881,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
+@@ -895,7 +895,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);
@@ -472,7 +460,7 @@ index bfbe885..8bd32f9 100644
  		}
  		if (next->anon_vma)
  			anon_vma_merge(vma, next);
-@@ -1731,8 +1731,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1745,8 +1745,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  	return addr;
  
  unmap_and_free_vma:
@@ -482,7 +470,7 @@ index bfbe885..8bd32f9 100644
  
  	/* Undo any partial mapping done by a device driver. */
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2537,7 +2537,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2571,7 +2571,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  		goto out_free_mpol;
  
  	if (new->vm_file)
@@ -491,7 +479,7 @@ index bfbe885..8bd32f9 100644
  
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
-@@ -2556,7 +2556,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2590,7 +2590,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)
@@ -500,7 +488,7 @@ index bfbe885..8bd32f9 100644
  	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
-@@ -2710,7 +2710,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2744,7 +2744,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;
@@ -509,7 +497,7 @@ index bfbe885..8bd32f9 100644
  
  	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
  		     current->comm, current->pid);
-@@ -2785,10 +2785,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2819,10 +2819,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  		}
  	}
  
@@ -538,7 +526,7 @@ index bfbe885..8bd32f9 100644
  out:
  	up_write(&mm->mmap_sem);
  	if (populate)
-@@ -3079,7 +3096,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3113,7 +3130,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)
@@ -548,10 +536,10 @@ index bfbe885..8bd32f9 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 2d131b9..5dc9a19 100644
+index fc184f5..637ea81 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -637,7 +637,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -641,7 +641,7 @@ static void __put_nommu_region(struct vm_region *region)
  		up_write(&nommu_region_sem);
  
  		if (region->vm_file)
@@ -560,7 +548,7 @@ index 2d131b9..5dc9a19 100644
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -795,7 +795,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -799,7 +799,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
@@ -569,7 +557,7 @@ index 2d131b9..5dc9a19 100644
  	put_nommu_region(vma->vm_region);
  	kmem_cache_free(vm_area_cachep, vma);
  }
-@@ -1322,7 +1322,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1326,7 +1326,7 @@ unsigned long do_mmap(struct file *file,
  					goto error_just_free;
  				}
  			}
@@ -578,7 +566,7 @@ index 2d131b9..5dc9a19 100644
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1397,10 +1397,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1401,10 +1401,10 @@ unsigned long do_mmap(struct file *file,
  	up_write(&nommu_region_sem);
  error:
  	if (region->vm_file)
@@ -593,18 +581,18 @@ index 2d131b9..5dc9a19 100644
  
 diff --git a/mm/prfile.c b/mm/prfile.c
 new file mode 100644
-index 0000000..b323b8a
+index 0000000..1ef053b
 --- /dev/null
 +++ b/mm/prfile.c
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,85 @@
 +/*
-+ * Mainly for aufs which mmap(2) diffrent file and wants to print different path
-+ * in /proc/PID/maps.
++ * Mainly for aufs which mmap(2) different file and wants to print different
++ * path in /proc/PID/maps.
 + * Call these functions via macros defined in linux/mm.h.
 + *
 + * See Documentation/filesystems/aufs/design/06mmap.txt
 + *
-+ * Copyright (c) 2014 Junjro R. Okajima
++ * Copyright (c) 2014-2017 Junjro R. Okajima
 + * Copyright (c) 2014 Ian Campbell
 + */
 +
@@ -618,8 +606,7 @@ index 0000000..b323b8a
 +{
 +#ifdef PRFILE_TRACE
 +	if (pr)
-+		pr_info("%s:%d: %s, %s\n", func, line, func2,
-+			f ? (char *)f->f_path.dentry->d_name.name : "(null)");
++		pr_info("%s:%d: %s, %pD2\n", func, line, func2, f);
 +#endif
 +}
 +
@@ -686,7 +673,7 @@ index 0000000..b323b8a
 aufs4.x-rcN standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 8ca5f09..b1ff5be 100644
+index 3458af5..5fd25bb 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1272,6 +1272,7 @@ void d_walk(struct dentry *parent, void *data,
@@ -697,7 +684,7 @@ index 8ca5f09..b1ff5be 100644
  
  struct check_mount {
  	struct vfsmount *mnt;
-@@ -2864,6 +2865,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2862,6 +2863,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
  
  	write_sequnlock(&rename_lock);
  }
@@ -706,7 +693,7 @@ index 8ca5f09..b1ff5be 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index 65145a3..8d35776 100644
+index 9041990..31f14c6 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
@@ -718,10 +705,10 @@ index 65145a3..8d35776 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index f5f4f94..c671660 100644
+index d39404c..ac1dc66 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -83,6 +83,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
+@@ -84,6 +84,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
   out:
  	return error;
  }
@@ -766,10 +753,10 @@ index 954d510..4fb5b10 100644
  void __init files_init(void)
  { 
 diff --git a/fs/inode.c b/fs/inode.c
-index 9a9ba3a..a3a18d8 100644
+index 69cbe9c..764566d 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1651,6 +1651,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
+@@ -1649,6 +1649,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
  
  	return update_time(inode, time, flags);
  }
@@ -778,10 +765,10 @@ index 9a9ba3a..a3a18d8 100644
  /**
   *	touch_atime	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index cc1375ef..9b4c67c 100644
+index 5a44384..cc6f6fb 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -465,6 +465,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
+@@ -462,6 +462,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
  	mnt_dec_writers(real_mount(mnt));
  	preempt_enable();
  }
@@ -789,7 +776,7 @@ index cc1375ef..9b4c67c 100644
  
  /**
   * mnt_drop_write - give up write access to a mount
-@@ -1884,6 +1885,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1881,6 +1882,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -798,7 +785,7 @@ index cc1375ef..9b4c67c 100644
  static void cleanup_group_ids(struct mount *mnt, struct mount *end)
  {
 diff --git a/fs/notify/group.c b/fs/notify/group.c
-index fbe3cbe..bdfc61e 100644
+index 3235753..14a2d48 100644
 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
 @@ -22,6 +22,7 @@
@@ -809,7 +796,7 @@ index fbe3cbe..bdfc61e 100644
  
  #include <linux/fsnotify_backend.h>
  #include "fsnotify.h"
-@@ -100,6 +101,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
+@@ -109,6 +110,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
  {
  	atomic_inc(&group->refcnt);
  }
@@ -817,7 +804,7 @@ index fbe3cbe..bdfc61e 100644
  
  /*
   * Drop a reference to a group.  Free it if it's through.
-@@ -109,6 +111,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+@@ -118,6 +120,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
  	if (atomic_dec_and_test(&group->refcnt))
  		fsnotify_final_destroy_group(group);
  }
@@ -825,7 +812,7 @@ index fbe3cbe..bdfc61e 100644
  
  /*
   * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -137,6 +140,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+@@ -147,6 +150,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
  
  	return group;
  }
@@ -834,43 +821,43 @@ index fbe3cbe..bdfc61e 100644
  int fsnotify_fasync(int fd, struct file *file, int on)
  {
 diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 6043306..fdb50e4 100644
+index 9991f88..117042c 100644
 --- a/fs/notify/mark.c
 +++ b/fs/notify/mark.c
-@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
- 		mark->free_mark(mark);
- 	}
+@@ -118,6 +118,7 @@ static bool fsnotify_get_mark_safe(struct fsnotify_mark *mark)
+ {
+ 	return atomic_inc_not_zero(&mark->refcnt);
  }
 +EXPORT_SYMBOL_GPL(fsnotify_put_mark);
  
- /* Calculate mask of events for a list of marks */
- u32 fsnotify_recalc_mask(struct hlist_head *head)
-@@ -230,6 +231,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
+ static void __fsnotify_recalc_mask(struct fsnotify_mark_connector *conn)
+ {
+@@ -395,6 +396,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
  	mutex_unlock(&group->mark_mutex);
  	fsnotify_free_mark(mark);
  }
 +EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
  
- void fsnotify_destroy_marks(struct hlist_head *head, spinlock_t *lock)
- {
-@@ -415,6 +417,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark,
- 
+ /*
+  * Sorting function for lists of fsnotify marks.
+@@ -607,6 +609,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark, struct inode *inode,
+ 	fsnotify_put_mark(mark);
  	return ret;
  }
 +EXPORT_SYMBOL_GPL(fsnotify_add_mark);
  
- int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
- 		      struct inode *inode, struct vfsmount *mnt, int allow_dups)
-@@ -521,6 +524,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
- 	atomic_set(&mark->refcnt, 1);
- 	mark->free_mark = free_mark;
+ int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
+ 		      struct vfsmount *mnt, int allow_dups)
+@@ -742,6 +745,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+ 	fsnotify_get_group(group);
+ 	mark->group = group;
  }
 +EXPORT_SYMBOL_GPL(fsnotify_init_mark);
  
  /*
   * Destroy all marks in destroy_list, waits for SRCU period to finish before
 diff --git a/fs/open.c b/fs/open.c
-index 949cef2..9a892fb8 100644
+index cd0c5be..491442a 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@@ -881,7 +868,7 @@ index 949cef2..9a892fb8 100644
  
  long vfs_truncate(const struct path *path, loff_t length)
  {
-@@ -693,6 +694,7 @@ int open_check_o_direct(struct file *f)
+@@ -691,6 +692,7 @@ int open_check_o_direct(struct file *f)
  	}
  	return 0;
  }
@@ -890,7 +877,7 @@ index 949cef2..9a892fb8 100644
  static int do_dentry_open(struct file *f,
  			  struct inode *inode,
 diff --git a/fs/read_write.c b/fs/read_write.c
-index ac71b96..b69e687 100644
+index 05033f7..ce062e8 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
 @@ -523,6 +523,7 @@ vfs_readf_t vfs_readf(struct file *file)
@@ -910,10 +897,10 @@ index ac71b96..b69e687 100644
  ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
  {
 diff --git a/fs/splice.c b/fs/splice.c
-index 46c87af..0efa652 100644
+index 4a0bc62..21d7893 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -872,6 +872,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -866,6 +866,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -921,7 +908,7 @@ index 46c87af..0efa652 100644
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -901,6 +902,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -895,6 +896,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -942,7 +929,7 @@ index abf6a5d..c86fe9c 100644
  /*
   * Write out and wait upon all dirty data associated with this
 diff --git a/fs/xattr.c b/fs/xattr.c
-index 7e3317c..88910fe 100644
+index 464c94b..0234d49 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
 @@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
@@ -963,7 +950,7 @@ index d513051..e056d54 100644
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/commoncap.c b/security/commoncap.c
-index 78b3783..c8b3e88 100644
+index 7abebd7..c079ce4 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
 @@ -1062,12 +1062,14 @@ int cap_mmap_addr(unsigned long addr)
@@ -1002,10 +989,10 @@ index 03c1652..f88c84b 100644
  int devcgroup_inode_mknod(int mode, dev_t dev)
  {
 diff --git a/security/security.c b/security/security.c
-index d0e07f2..5e323b0 100644
+index b9fea39..afa97dd 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -481,6 +481,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -492,6 +492,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
  		return 0;
  	return call_int_hook(path_rmdir, 0, dir, dentry);
  }
@@ -1013,7 +1000,7 @@ index d0e07f2..5e323b0 100644
  
  int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {
-@@ -497,6 +498,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -508,6 +509,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);
  }
@@ -1021,7 +1008,7 @@ index d0e07f2..5e323b0 100644
  
  int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -505,6 +507,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -516,6 +518,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);
  }
@@ -1029,7 +1016,7 @@ index d0e07f2..5e323b0 100644
  
  int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
  			 const struct path *new_dir, struct dentry *new_dentry,
-@@ -532,6 +535,7 @@ int security_path_truncate(const struct path *path)
+@@ -543,6 +546,7 @@ int security_path_truncate(const struct path *path)
  		return 0;
  	return call_int_hook(path_truncate, 0, path);
  }
@@ -1037,7 +1024,7 @@ index d0e07f2..5e323b0 100644
  
  int security_path_chmod(const struct path *path, umode_t mode)
  {
-@@ -539,6 +543,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -550,6 +554,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
  		return 0;
  	return call_int_hook(path_chmod, 0, path, mode);
  }
@@ -1045,7 +1032,7 @@ index d0e07f2..5e323b0 100644
  
  int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {
-@@ -546,6 +551,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -557,6 +562,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);
  }
@@ -1053,7 +1040,7 @@ index d0e07f2..5e323b0 100644
  
  int security_path_chroot(const struct path *path)
  {
-@@ -631,6 +637,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -642,6 +648,7 @@ int security_inode_readlink(struct dentry *dentry)
  		return 0;
  	return call_int_hook(inode_readlink, 0, dentry);
  }
@@ -1061,7 +1048,7 @@ index d0e07f2..5e323b0 100644
  
  int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
  			       bool rcu)
-@@ -646,6 +653,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -657,6 +664,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return call_int_hook(inode_permission, 0, inode, mask);
  }
@@ -1069,7 +1056,7 @@ index d0e07f2..5e323b0 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -817,6 +825,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -828,6 +836,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -1077,7 +1064,7 @@ index d0e07f2..5e323b0 100644
  
  int security_file_alloc(struct file *file)
  {
-@@ -876,6 +885,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
+@@ -887,6 +896,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }
@@ -1087,7 +1074,7 @@ index d0e07f2..5e323b0 100644
  {
 diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs
 --- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/debugfs-aufs	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/ABI/testing/debugfs-aufs	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,50 @@
 +What:		/debug/aufs/si_<id>/
 +Date:		March 2009
@@ -1141,7 +1128,7 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Document
 +		will be empty. About XINO files, see the aufs manual.
 diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
 --- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/ABI/testing/sysfs-aufs	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,31 @@
 +What:		/sys/fs/aufs/si_<id>/
 +Date:		March 2009
@@ -1176,8 +1163,8 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentat
 +		will be empty. About XINO files, see the aufs manual.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt	2017-05-06 22:16:52.774886674 +0200
-@@ -0,0 +1,170 @@
++++ linux/Documentation/filesystems/aufs/design/01intro.txt	2017-07-29 12:14:25.893041746 +0200
+@@ -0,0 +1,171 @@
 +
 +# Copyright (C) 2005-2017 Junjiro R. Okajima
 +# 
@@ -1203,6 +1190,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt lin
 +3. abbrev. for "auf das" in German which means "on the" in English.
 +   Ex. "Butter aufs Brot"(G) means "butter onto bread"(E).
 +   But "Filesystem aufs Filesystem" is hard to understand.
++4. abbrev. for "African Urban Fashion Show".
 +
 +AUFS is a filesystem with features:
 +- multi layered stackable unification filesystem, the member directory
@@ -1350,7 +1338,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt lin
 +about it. But currently I have implemented it in kernel space.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/02struct.txt	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,258 @@
 +
 +# Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -1612,7 +1600,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt li
 +For this purpose, use "aumvdown" command in aufs-util.git.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt linux/Documentation/filesystems/aufs/design/03atomic_open.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,85 @@
 +
 +# Copyright (C) 2015-2017 Junjiro R. Okajima
@@ -1701,7 +1689,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.t
 +       be implemented in aufs, but not all I am afraid.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,113 @@
 +
 +# Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -1818,7 +1806,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt li
 +   by over-mounting something (or another method).
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/04branch.txt	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,74 @@
 +
 +# Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -1896,7 +1884,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt li
 +    same named entry on the upper branch.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,64 @@
 +
 +# Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -1964,7 +1952,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.tx
 +  copyup policy.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linux/Documentation/filesystems/aufs/design/06fhsm.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06fhsm.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,120 @@
 +
 +# Copyright (C) 2011-2017 Junjiro R. Okajima
@@ -2088,7 +2076,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linu
 +should restore the original file state after an error happens.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,72 @@
 +
 +# Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -2164,7 +2152,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linu
 +I have to give up this "looks-smater" approach.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt linux/Documentation/filesystems/aufs/design/06xattr.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06xattr.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,96 @@
 +
 +# Copyright (C) 2014-2017 Junjiro R. Okajima
@@ -2264,7 +2252,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt lin
 +now, aufs implements the branch attributes to ignore the error.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/07export.txt	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,58 @@
 +
 +# Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -2326,7 +2314,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt li
 +  lookup_one_len(), vfs_getattr(), encode_fh() and others.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,52 @@
 +
 +# Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -2382,7 +2370,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linu
 +initramfs will use it to replace the old one at the next boot.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,47 @@
 +
 +# Copyright (C) 2010-2017 Junjiro R. Okajima
@@ -2433,7 +2421,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt lin
 +regular files only.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
 --- /usr/share/empty/Documentation/filesystems/aufs/README	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/README	2017-05-06 22:16:52.774886674 +0200
++++ linux/Documentation/filesystems/aufs/README	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,393 @@
 +
 +Aufs4 -- advanced multi layered unification filesystem version 4.x
@@ -2830,7 +2818,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta
 +# End: ;
 diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
 --- /usr/share/empty/fs/aufs/aufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h	2017-05-06 22:16:52.774886674 +0200
++++ linux/fs/aufs/aufs.h	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -2893,8 +2881,8 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
 +#endif /* __AUFS_H__ */
 diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 --- /usr/share/empty/fs/aufs/branch.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c	2017-05-06 22:16:52.774886674 +0200
-@@ -0,0 +1,1423 @@
++++ linux/fs/aufs/branch.c	2017-07-29 12:14:25.896375188 +0200
+@@ -0,0 +1,1422 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -2935,7 +2923,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		fput(br->br_xino.xi_file);
 +	for (i = br->br_xino.xi_nondir.total - 1; i >= 0; i--)
 +		AuDebugOn(br->br_xino.xi_nondir.array[i]);
-+	au_delayed_kfree(br->br_xino.xi_nondir.array);
++	kfree(br->br_xino.xi_nondir.array);
 +
 +	AuDebugOn(au_br_count(br));
 +	au_br_count_fin(br);
@@ -2950,7 +2938,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +
 +	if (br->br_fhsm) {
 +		au_br_fhsm_fin(br->br_fhsm);
-+		au_delayed_kfree(br->br_fhsm);
++		kfree(br->br_fhsm);
 +	}
 +
 +	key = br->br_dykey;
@@ -2964,9 +2952,8 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	lockdep_off();
 +	path_put(&br->br_path);
 +	lockdep_on();
-+	if (wbr)
-+		au_delayed_kfree(wbr);
-+	au_delayed_kfree(br);
++	kfree(wbr);
++	kfree(br);
 +}
 +
 +/*
@@ -3064,20 +3051,20 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		err = au_di_realloc(au_di(root), new_nbranch, /*may_shrink*/0);
 +	if (!err) {
 +		inode = d_inode(root);
-+		err = au_hinode_realloc(au_ii(inode), new_nbranch, /*may_shrink*/0);
++		err = au_hinode_realloc(au_ii(inode), new_nbranch,
++					/*may_shrink*/0);
 +	}
 +	if (!err)
 +		return add_branch; /* success */
 +
 +out_wbr:
-+	if (add_branch->br_wbr)
-+		au_delayed_kfree(add_branch->br_wbr);
++	kfree(add_branch->br_wbr);
 +out_hnotify:
 +	au_hnotify_fin_br(add_branch);
 +out_xinondir:
-+	au_delayed_kfree(add_branch->br_xino.xi_nondir.array);
++	kfree(add_branch->br_xino.xi_nondir.array);
 +out_br:
-+	au_delayed_kfree(add_branch);
++	kfree(add_branch);
 +out:
 +	return ERR_PTR(err);
 +}
@@ -3243,7 +3230,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	br->br_perm = old_perm;
 +
 +	if (!err && wbr && !au_br_writable(new_perm)) {
-+		au_delayed_kfree(wbr);
++		kfree(wbr);
 +		br->br_wbr = NULL;
 +	}
 +
@@ -4270,7 +4257,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		if (br->br_wbr) {
 +			err = au_wbr_init(br, sb, mod->perm);
 +			if (unlikely(err)) {
-+				au_delayed_kfree(br->br_wbr);
++				kfree(br->br_wbr);
 +				br->br_wbr = NULL;
 +			}
 +		}
@@ -4282,7 +4269,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		if (!au_br_fhsm(mod->perm)) {
 +			/* fhsm --> non-fhsm */
 +			au_br_fhsm_fin(br->br_fhsm);
-+			au_delayed_kfree(br->br_fhsm);
++			kfree(br->br_fhsm);
 +			br->br_fhsm = NULL;
 +		}
 +	} else if (au_br_fhsm(mod->perm))
@@ -4295,7 +4282,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +
 +out_bf:
 +	if (bf)
-+		au_delayed_kfree(bf);
++		kfree(bf);
 +out:
 +	AuTraceErr(err);
 +	return err;
@@ -4320,7 +4307,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +}
 diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
 --- /usr/share/empty/fs/aufs/branch.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.h	2017-05-06 22:16:52.774886674 +0200
++++ linux/fs/aufs/branch.h	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,321 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -4645,7 +4632,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
 +#endif /* __AUFS_BRANCH_H__ */
 diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
 --- /usr/share/empty/fs/aufs/conf.mk	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/conf.mk	2017-05-06 22:16:52.774886674 +0200
++++ linux/fs/aufs/conf.mk	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,38 @@
 +
 +AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
@@ -4687,8 +4674,8 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
 +-include ${srctree}/${src}/conf_priv.mk
 diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 --- /usr/share/empty/fs/aufs/cpup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c	2017-05-06 22:16:52.774886674 +0200
-@@ -0,0 +1,1407 @@
++++ linux/fs/aufs/cpup.c	2017-07-29 12:14:25.899708630 +0200
+@@ -0,0 +1,1442 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -5048,14 +5035,67 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +	dst->f_pos = 0;
 +	err = au_do_copy_file(dst, src, len, buf, blksize);
 +	if (do_kfree)
-+		au_delayed_kfree(buf);
++		kfree(buf);
 +	else
-+		au_delayed_free_page((unsigned long)buf);
++		free_page((unsigned long)buf);
 +
 +out:
 +	return err;
 +}
 +
++static int au_do_copy(struct file *dst, struct file *src, loff_t len)
++{
++	int err;
++	struct super_block *h_src_sb;
++	struct inode *h_src_inode;
++
++	h_src_inode = file_inode(src);
++	h_src_sb = h_src_inode->i_sb;
++
++	/* XFS acquires inode_lock */
++	if (!au_test_xfs(h_src_sb))
++		err = au_copy_file(dst, src, len);
++	else {
++		inode_unlock(h_src_inode);
++		err = au_copy_file(dst, src, len);
++		inode_lock(h_src_inode);
++	}
++
++	return err;
++}
++
++static int au_clone_or_copy(struct file *dst, struct file *src, loff_t len)
++{
++	int err;
++	struct super_block *h_src_sb;
++	struct inode *h_src_inode;
++
++	h_src_inode = file_inode(src);
++	h_src_sb = h_src_inode->i_sb;
++	if (h_src_sb != file_inode(dst)->i_sb
++	    || !dst->f_op->clone_file_range) {
++		err = au_do_copy(dst, src, len);
++		goto out;
++	}
++
++	if (!au_test_nfs(h_src_sb)) {
++		inode_unlock(h_src_inode);
++		err = vfsub_clone_file_range(src, dst, len);
++		inode_lock(h_src_inode);
++	} else
++		err = vfsub_clone_file_range(src, dst, len);
++	/* older XFS has a condition in cloning */
++	if (unlikely(err != -EOPNOTSUPP))
++		goto out;
++
++	/* the backend fs on NFS may not support cloning */
++	err = au_do_copy(dst, src, len);
++
++out:
++	AuTraceErr(err);
++	return err;
++}
++
 +/*
 + * to support a sparse file which is opened with O_APPEND,
 + * we need to close the file.
@@ -5105,25 +5145,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +	h_src_sb = h_src_inode->i_sb;
 +	if (!au_test_nfs(h_src_sb))
 +		IMustLock(h_src_inode);
-+
-+	if (h_src_sb != file_inode(file[DST].file)->i_sb
-+	    || !file[DST].file->f_op->clone_file_range)
-+		err = au_copy_file(file[DST].file, file[SRC].file, cpg->len);
-+	else {
-+		if (!au_test_nfs(h_src_sb)) {
-+			inode_unlock(h_src_inode);
-+			err = vfsub_clone_file_range(file[SRC].file,
-+						     file[DST].file, cpg->len);
-+			inode_lock(h_src_inode);
-+		} else
-+			err = vfsub_clone_file_range(file[SRC].file,
-+						     file[DST].file, cpg->len);
-+		if (unlikely(err == -EOPNOTSUPP && au_test_nfs(h_src_sb)))
-+			/* the backend fs on NFS may not support cloning */
-+			err = au_copy_file(file[DST].file, file[SRC].file,
-+					   cpg->len);
-+		AuTraceErr(err);
-+	}
++	err = au_clone_or_copy(file[DST].file, file[SRC].file, cpg->len);
 +
 +	/* i wonder if we had O_NO_DELAY_FPUT flag */
 +	if (tsk->flags & PF_KTHREAD)
@@ -5231,7 +5253,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +		sym.k[symlen] = 0;
 +		err = vfsub_symlink(h_dir, h_path, sym.k);
 +	}
-+	au_delayed_free_page((unsigned long)sym.k);
++	free_page((unsigned long)sym.k);
 +
 +out:
 +	return err;
@@ -5605,7 +5627,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +	}
 +out_parent:
 +	dput(dst_parent);
-+	au_delayed_kfree(a);
++	kfree(a);
 +out:
 +	return err;
 +}
@@ -6098,7 +6120,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +}
 diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
 --- /usr/share/empty/fs/aufs/cpup.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h	2017-05-06 22:16:52.774886674 +0200
++++ linux/fs/aufs/cpup.h	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,94 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -6196,7 +6218,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
 +#endif /* __AUFS_CPUP_H__ */
 diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 --- /usr/share/empty/fs/aufs/dbgaufs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c	2017-05-06 22:16:52.774886674 +0200
++++ linux/fs/aufs/dbgaufs.c	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,438 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -6241,7 +6263,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 +static int dbgaufs_xi_release(struct inode *inode __maybe_unused,
 +			      struct file *file)
 +{
-+	au_delayed_kfree(file->private_data);
++	kfree(file->private_data);
 +	return 0;
 +}
 +
@@ -6303,7 +6325,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 +static int dbgaufs_plink_release(struct inode *inode __maybe_unused,
 +				 struct file *file)
 +{
-+	au_delayed_free_page((unsigned long)file->private_data);
++	free_page((unsigned long)file->private_data);
 +	return 0;
 +}
 +
@@ -6367,7 +6389,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 +	goto out; /* success */
 +
 +out_free:
-+	au_delayed_free_page((unsigned long)p);
++	free_page((unsigned long)p);
 +out:
 +	return err;
 +}
@@ -6638,7 +6660,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
 --- /usr/share/empty/fs/aufs/dbgaufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.h	2017-05-06 22:16:52.774886674 +0200
++++ linux/fs/aufs/dbgaufs.h	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,48 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -6690,7 +6712,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
 +#endif /* __DBGAUFS_H__ */
 diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
 --- /usr/share/empty/fs/aufs/dcsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.c	2017-05-06 22:16:52.774886674 +0200
++++ linux/fs/aufs/dcsub.c	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,225 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -6723,7 +6745,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
 +	p = dpage->dentries;
 +	for (i = 0; i < dpage->ndentry; i++)
 +		dput(*p++);
-+	au_delayed_free_page((unsigned long)dpage->dentries);
++	free_page((unsigned long)dpage->dentries);
 +}
 +
 +int au_dpages_init(struct au_dcsub_pages *dpages, gfp_t gfp)
@@ -6746,7 +6768,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
 +	return 0; /* success */
 +
 +out_dpages:
-+	au_delayed_kfree(dpages->dpages);
++	kfree(dpages->dpages);
 +out:
 +	return err;
 +}
@@ -6759,7 +6781,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
 +	p = dpages->dpages;
 +	for (i = 0; i < dpages->ndpage; i++)
 +		au_dpage_free(p++);
-+	au_delayed_kfree(dpages->dpages);
++	kfree(dpages->dpages);
 +}
 +
 +static int au_dpages_append(struct au_dcsub_pages *dpages,
@@ -6919,7 +6941,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
 --- /usr/share/empty/fs/aufs/dcsub.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.h	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/dcsub.h	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,136 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -7059,7 +7081,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
 +#endif /* __AUFS_DCSUB_H__ */
 diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 --- /usr/share/empty/fs/aufs/debug.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/debug.c	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,440 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -7399,7 +7421,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +	au_br_count_init(&a->fake);
 +	err = do_pri_br(-1, &a->fake);
 +	au_br_count_fin(&a->fake);
-+	au_delayed_kfree(a);
++	kfree(a);
 +	dpri("dev 0x%x\n", sb->s_dev);
 +	if (err || !au_test_aufs(sb))
 +		return;
@@ -7503,7 +7525,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +}
 diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
 --- /usr/share/empty/fs/aufs/debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.h	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/debug.h	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,225 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -7732,7 +7754,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
 +#endif /* __AUFS_DEBUG_H__ */
 diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 --- /usr/share/empty/fs/aufs/dentry.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/dentry.c	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,1130 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -7950,7 +7972,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +
 +out_parent:
 +	dput(parent);
-+	au_delayed_kfree(whname.name);
++	kfree(whname.name);
 +out:
 +	return err;
 +}
@@ -8866,8 +8888,8 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +};
 diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 --- /usr/share/empty/fs/aufs/dentry.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h	2017-05-06 22:16:52.778220093 +0200
-@@ -0,0 +1,255 @@
++++ linux/fs/aufs/dentry.h	2017-07-29 12:14:25.899708630 +0200
+@@ -0,0 +1,252 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -8908,10 +8930,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 +	struct au_rwsem		di_rwsem;
 +	aufs_bindex_t		di_btop, di_bbot, di_bwh, di_bdiropq;
 +	unsigned char		di_tmpfile; /* to allow the different name */
-+	union {
-+		struct au_hdentry	*di_hdentry;
-+		struct llist_node	di_lnode;	/* delayed free */
-+	};
++	struct au_hdentry	*di_hdentry;
 +} ____cacheline_aligned_in_smp;
 +
 +/* ---------------------------------------------------------------------- */
@@ -9125,7 +9144,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 +#endif /* __AUFS_DENTRY_H__ */
 diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 --- /usr/share/empty/fs/aufs/dinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dinfo.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/dinfo.c	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,553 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -9182,7 +9201,7 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +		goto out;
 +	}
 +
-+	au_cache_dfree_dinfo(dinfo);
++	au_cache_free_dinfo(dinfo);
 +	dinfo = NULL;
 +
 +out:
@@ -9202,8 +9221,8 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +		while (bindex++ <= bbot)
 +			au_hdput(p++);
 +	}
-+	au_delayed_kfree(dinfo->di_hdentry);
-+	au_cache_dfree_dinfo(dinfo);
++	kfree(dinfo->di_hdentry);
++	au_cache_free_dinfo(dinfo);
 +}
 +
 +void au_di_swap(struct au_dinfo *a, struct au_dinfo *b)
@@ -9682,8 +9701,8 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 --- /usr/share/empty/fs/aufs/dir.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c	2017-05-06 22:16:52.778220093 +0200
-@@ -0,0 +1,762 @@
++++ linux/fs/aufs/dir.c	2017-07-29 12:14:25.899708630 +0200
+@@ -0,0 +1,759 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -9842,7 +9861,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +out:
 +	dput(a->dentry);
 +	au_nwt_done(&au_sbi(sb)->si_nowait);
-+	au_delayed_kfree(arg);
++	kfree(arg);
 +}
 +
 +void au_dir_ts(struct inode *dir, aufs_bindex_t bindex)
@@ -9878,7 +9897,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	if (unlikely(wkq_err)) {
 +		pr_err("wkq %d\n", wkq_err);
 +		dput(dentry);
-+		au_delayed_kfree(arg);
++		kfree(arg);
 +	}
 +
 +out:
@@ -9997,7 +10016,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +		};
 +		err = au_do_open(file, &args);
 +		if (unlikely(err))
-+			au_delayed_kfree(fidir);
++			kfree(fidir);
 +	}
 +	si_read_unlock(sb);
 +	return err;
@@ -10011,9 +10030,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	struct au_fidir *fidir;
 +	struct au_hfile *hf;
 +	aufs_bindex_t bindex, bbot;
-+	int execed, delayed;
 +
-+	delayed = (current->flags & PF_KTHREAD) || in_interrupt();
 +	finfo = au_fi(file);
 +	fidir = finfo->fi_hdir;
 +	if (fidir) {
@@ -10021,11 +10038,10 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +			    &au_sbi(file->f_path.dentry->d_sb)->si_files);
 +		vdir_cache = fidir->fd_vdir_cache; /* lock-free */
 +		if (vdir_cache)
-+			au_vdir_free(vdir_cache, delayed);
++			au_vdir_free(vdir_cache);
 +
 +		bindex = finfo->fi_btop;
 +		if (bindex >= 0) {
-+			execed = vfsub_file_execed(file);
 +			hf = fidir->fd_hfile + bindex;
 +			/*
 +			 * calls fput() instead of filp_close(),
@@ -10034,12 +10050,12 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +			bbot = fidir->fd_bbot;
 +			for (; bindex <= bbot; bindex++, hf++)
 +				if (hf->hf_file)
-+					au_hfput(hf, execed);
++					au_hfput(hf, /*execed*/0);
 +		}
-+		au_delayed_kfree(fidir);
++		kfree(fidir);
 +		finfo->fi_hdir = NULL;
 +	}
-+	au_finfo_fin(file, delayed);
++	au_finfo_fin(file);
 +	return 0;
 +}
 +
@@ -10448,8 +10464,8 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +};
 diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 --- /usr/share/empty/fs/aufs/dir.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.h	2017-05-06 22:16:52.778220093 +0200
-@@ -0,0 +1,137 @@
++++ linux/fs/aufs/dir.h	2017-07-29 12:14:25.899708630 +0200
+@@ -0,0 +1,131 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -10494,10 +10510,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 +
 +struct au_vdir_dehstr {
 +	struct hlist_node	hash;
-+	union {
-+		struct au_vdir_destr	*str;
-+		struct llist_node	lnode;	/* delayed free */
-+	};
++	struct au_vdir_destr	*str;
 +} ____cacheline_aligned_in_smp;
 +
 +struct au_vdir_de {
@@ -10535,10 +10548,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 +
 +	unsigned long	vd_version;
 +	unsigned int	vd_deblk_sz;
-+	union {
-+		unsigned long		vd_jiffy;
-+		struct llist_node	vd_lnode;	/* delayed free */
-+	};
++	unsigned long		vd_jiffy;
 +} ____cacheline_aligned_in_smp;
 +
 +/* ---------------------------------------------------------------------- */
@@ -10562,7 +10572,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 +int au_nhash_append_wh(struct au_nhash *whlist, char *name, int nlen, ino_t ino,
 +		       unsigned int d_type, aufs_bindex_t bindex,
 +		       unsigned char shwh);
-+void au_vdir_free(struct au_vdir *vdir, int atonce);
++void au_vdir_free(struct au_vdir *vdir);
 +int au_vdir_init(struct file *file);
 +int au_vdir_fill_de(struct file *file, struct dir_context *ctx);
 +
@@ -10589,7 +10599,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 +#endif /* __AUFS_DIR_H__ */
 diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 --- /usr/share/empty/fs/aufs/dynop.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/dynop.c	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,371 @@
 +/*
 + * Copyright (C) 2010-2017 Junjiro R. Okajima
@@ -10707,7 +10717,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 +
 +	key = container_of(rcu, struct au_dykey, dk_rcu);
 +	DyPrSym(key);
-+	kfree(key);	/* not delayed */
++	kfree(key);
 +}
 +
 +static void dy_free(struct kref *kref)
@@ -10835,7 +10845,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 +	p->set(key, op->dy_hop, au_br_sb(br));
 +	old = dy_gadd(sphl, key);
 +	if (old) {
-+		au_delayed_kfree(key);
++		kfree(key);
 +		key = old;
 +	}
 +
@@ -10964,7 +10974,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
 --- /usr/share/empty/fs/aufs/dynop.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.h	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/dynop.h	2017-07-29 12:14:25.899708630 +0200
 @@ -0,0 +1,74 @@
 +/*
 + * Copyright (C) 2010-2017 Junjiro R. Okajima
@@ -11042,7 +11052,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
 +#endif /* __AUFS_DYNOP_H__ */
 diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 --- /usr/share/empty/fs/aufs/export.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/export.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,836 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -11462,7 +11472,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +	}
 +
 +out_name:
-+	au_delayed_free_page((unsigned long)arg.name);
++	free_page((unsigned long)arg.name);
 +out_file:
 +	fput(file);
 +out:
@@ -11616,7 +11626,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +			dentry = ERR_PTR(-ESTALE);
 +		}
 +out_pathname:
-+	au_delayed_free_page((unsigned long)pathname);
++	free_page((unsigned long)pathname);
 +out_h_parent:
 +	dput(h_parent);
 +out:
@@ -11882,7 +11892,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +}
 diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 --- /usr/share/empty/fs/aufs/fhsm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fhsm.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/fhsm.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,426 @@
 +/*
 + * Copyright (C) 2011-2017 Junjiro R. Okajima
@@ -12312,8 +12322,8 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 +}
 diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 --- /usr/share/empty/fs/aufs/file.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c	2017-05-06 22:16:52.778220093 +0200
-@@ -0,0 +1,860 @@
++++ linux/fs/aufs/file.c	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,858 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -12589,7 +12599,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	}
 +	if (unlikely(err)) {
 +		finfo->fi_hdir = NULL;
-+		au_finfo_fin(file, /*atonce*/0);
++		au_finfo_fin(file);
 +	}
 +
 +out:
@@ -12909,7 +12919,6 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +
 +static void au_do_refresh_dir(struct file *file)
 +{
-+	int execed;
 +	aufs_bindex_t bindex, bbot, new_bindex, brid;
 +	struct au_hfile *p, tmp, *q;
 +	struct au_finfo *finfo;
@@ -12948,7 +12957,6 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +		}
 +	}
 +
-+	execed = vfsub_file_execed(file);
 +	p = fidir->fd_hfile;
 +	if (!au_test_mmapped(file) && !d_unlinked(file->f_path.dentry)) {
 +		bbot = au_sbbot(sb);
@@ -12957,14 +12965,14 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +			if (p->hf_file) {
 +				if (file_inode(p->hf_file))
 +					break;
-+				au_hfput(p, execed);
++				au_hfput(p, /*execed*/0);
 +			}
 +	} else {
 +		bbot = au_br_index(sb, brid);
 +		for (finfo->fi_btop = 0; finfo->fi_btop < bbot;
 +		     finfo->fi_btop++, p++)
 +			if (p->hf_file)
-+				au_hfput(p, execed);
++				au_hfput(p, /*execed*/0);
 +		bbot = au_sbbot(sb);
 +	}
 +
@@ -12974,7 +12982,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +		if (p->hf_file) {
 +			if (file_inode(p->hf_file))
 +				break;
-+			au_hfput(p, execed);
++			au_hfput(p, /*execed*/0);
 +		}
 +	AuDebugOn(fidir->fd_bbot < finfo->fi_btop);
 +}
@@ -13176,8 +13184,8 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +};
 diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
 --- /usr/share/empty/fs/aufs/file.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.h	2017-05-06 22:16:52.778220093 +0200
-@@ -0,0 +1,333 @@
++++ linux/fs/aufs/file.h	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,330 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -13243,10 +13251,7 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
 +	struct au_fidir		*fi_hdir;	/* for dir only */
 +
 +	struct hlist_node	fi_hlist;
-+	union {
-+		struct file		*fi_file;	/* very ugly */
-+		struct llist_node	fi_lnode;	/* delayed free */
-+	};
++	struct file		*fi_file;	/* very ugly */
 +} ____cacheline_aligned_in_smp;
 +
 +/* ---------------------------------------------------------------------- */
@@ -13306,7 +13311,7 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
 +int au_fidir_realloc(struct au_finfo *finfo, int nbr, int may_shrink);
 +
 +void au_fi_init_once(void *_fi);
-+void au_finfo_fin(struct file *file, int atonce);
++void au_finfo_fin(struct file *file);
 +int au_finfo_init(struct file *file, struct au_fidir *fidir);
 +
 +/* ioctl.c */
@@ -13513,8 +13518,8 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
 +#endif /* __AUFS_FILE_H__ */
 diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 --- /usr/share/empty/fs/aufs/finfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/finfo.c	2017-05-06 22:16:52.778220093 +0200
-@@ -0,0 +1,151 @@
++++ linux/fs/aufs/finfo.c	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,148 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -13619,7 +13624,7 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 +
 +/* ---------------------------------------------------------------------- */
 +
-+void au_finfo_fin(struct file *file, int atonce)
++void au_finfo_fin(struct file *file)
 +{
 +	struct au_finfo *finfo;
 +
@@ -13628,10 +13633,7 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 +	finfo = au_fi(file);
 +	AuDebugOn(finfo->fi_hdir);
 +	AuRwDestroy(&finfo->fi_rwsem);
-+	if (!atonce)
-+		au_cache_dfree_finfo(finfo);
-+	else
-+		au_cache_free_finfo(finfo);
++	au_cache_free_finfo(finfo);
 +}
 +
 +void au_fi_init_once(void *_finfo)
@@ -13668,8 +13670,8 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 --- /usr/share/empty/fs/aufs/f_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c	2017-05-06 22:16:52.778220093 +0200
-@@ -0,0 +1,819 @@
++++ linux/fs/aufs/f_op.c	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,817 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -13771,7 +13773,6 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +{
 +	struct au_finfo *finfo;
 +	aufs_bindex_t bindex;
-+	int delayed;
 +
 +	finfo = au_fi(file);
 +	au_sphl_del(&finfo->fi_hlist,
@@ -13780,8 +13781,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +	if (bindex >= 0)
 +		au_set_h_fptr(file, bindex, NULL);
 +
-+	delayed = (current->flags & PF_KTHREAD) || in_interrupt();
-+	au_finfo_fin(file, delayed);
++	au_finfo_fin(file);
 +	return 0;
 +}
 +
@@ -13907,12 +13907,11 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +	h_inode = file_inode(h_file);
 +	inode->i_mode = h_inode->i_mode;
 +	ii_write_unlock(inode);
-+	fput(h_file);
-+
 +	/* AuDbg("blks %llu, %llu\n", (u64)blks, (u64)h_inode->i_blocks); */
 +	if (written > 0)
 +		au_fhsm_wrote(inode->i_sb, wpre->btop,
 +			      /*force*/h_inode->i_blocks > wpre->blks);
++	fput(h_file);
 +}
 +
 +static ssize_t aufs_read(struct file *file, char __user *buf, size_t count,
@@ -14434,7 +14433,8 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +	if (IS_ERR(h_file))
 +		goto out;
 +
-+	arg |= vfsub_file_flags(file) & FASYNC; /* stop calling h_file->fasync */
++	/* stop calling h_file->fasync */
++	arg |= vfsub_file_flags(file) & FASYNC;
 +	err = setfl(/*unused fd*/-1, h_file, arg);
 +	fput(h_file); /* instead of au_read_post() */
 +
@@ -14491,7 +14491,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +};
 diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
 --- /usr/share/empty/fs/aufs/fstype.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/fstype.h	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,400 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -14895,8 +14895,8 @@ diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
 +#endif /* __AUFS_FSTYPE_H__ */
 diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 --- /usr/share/empty/fs/aufs/hfsnotify.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsnotify.c	2017-05-06 22:16:52.778220093 +0200
-@@ -0,0 +1,287 @@
++++ linux/fs/aufs/hfsnotify.c	2017-07-29 12:14:32.526591175 +0200
+@@ -0,0 +1,289 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -14931,7 +14931,7 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 +	struct au_hnotify *hn = container_of(mark, struct au_hnotify,
 +					     hn_mark);
 +	/* AuDbg("here\n"); */
-+	au_cache_dfree_hnotify(hn);
++	au_cache_free_hnotify(hn);
 +	smp_mb__before_atomic();
 +	if (atomic64_dec_and_test(&au_hfsn_ifree))
 +		wake_up(&au_hfsn_wq);
@@ -14953,15 +14953,15 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 +	AuDebugOn(!br->br_hfsn);
 +
 +	mark = &hn->hn_mark;
-+	fsnotify_init_mark(mark, au_hfsn_free_mark);
++	fsnotify_init_mark(mark, br->br_hfsn->hfsn_group);
 +	mark->mask = AuHfsnMask;
 +	/*
 +	 * by udba rename or rmdir, aufs assign a new inode to the known
 +	 * h_inode, so specify 1 to allow dups.
 +	 */
 +	lockdep_off();
-+	err = fsnotify_add_mark(mark, br->br_hfsn->hfsn_group, hinode->hi_inode,
-+				 /*mnt*/NULL, /*allow_dups*/1);
++	err = fsnotify_add_mark(mark, hinode->hi_inode, /*mnt*/NULL,
++				/*allow_dups*/1);
 +	lockdep_on();
 +
 +	return err;
@@ -15055,7 +15055,7 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 +	struct au_br_hfsnotify *hfsn = group->private;
 +
 +	/* AuDbg("here\n"); */
-+	au_delayed_kfree(hfsn);
++	kfree(hfsn);
 +}
 +
 +static int au_hfsn_handle_event(struct fsnotify_group *group,
@@ -15063,7 +15063,8 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 +				struct fsnotify_mark *inode_mark,
 +				struct fsnotify_mark *vfsmount_mark,
 +				u32 mask, const void *data, int data_type,
-+				const unsigned char *file_name, u32 cookie)
++				const unsigned char *file_name, u32 cookie,
++				struct fsnotify_iter_info *iter_info)
 +{
 +	int err;
 +	struct au_hnotify *hnotify;
@@ -15102,7 +15103,8 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 +
 +static struct fsnotify_ops au_hfsn_ops = {
 +	.handle_event		= au_hfsn_handle_event,
-+	.free_group_priv	= au_hfsn_free_group
++	.free_group_priv	= au_hfsn_free_group,
++	.free_mark		= au_hfsn_free_mark
 +};
 +
 +/* ---------------------------------------------------------------------- */
@@ -15149,7 +15151,7 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 +	goto out; /* success */
 +
 +out_hfsn:
-+	au_delayed_kfree(hfsn);
++	kfree(hfsn);
 +out:
 +	return err;
 +}
@@ -15186,7 +15188,7 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 +};
 diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
 --- /usr/share/empty/fs/aufs/hfsplus.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsplus.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/hfsplus.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,56 @@
 +/*
 + * Copyright (C) 2010-2017 Junjiro R. Okajima
@@ -15246,8 +15248,8 @@ diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
 +}
 diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 --- /usr/share/empty/fs/aufs/hnotify.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c	2017-05-06 22:16:52.778220093 +0200
-@@ -0,0 +1,723 @@
++++ linux/fs/aufs/hnotify.c	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,711 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -15285,7 +15287,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 +		AuTraceErr(err);
 +		if (unlikely(err)) {
 +			hinode->hi_notify = NULL;
-+			au_cache_dfree_hnotify(hn);
++			au_cache_free_hnotify(hn);
 +			/*
 +			 * The upper dir was removed by udba, but the same named
 +			 * dir left. In this case, aufs assignes a new inode
@@ -15309,7 +15311,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 +	if (hn) {
 +		hinode->hi_notify = NULL;
 +		if (au_hnotify_op.free(hinode, hn))
-+			au_cache_dfree_hnotify(hn);
++			au_cache_free_hnotify(hn);
 +	}
 +}
 +
@@ -15782,7 +15784,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 +	iput(a->dir);
 +	si_write_unlock(sb);
 +	au_nwt_done(&sbinfo->si_nowait);
-+	au_delayed_kfree(a);
++	kfree(a);
 +}
 +
 +/* ---------------------------------------------------------------------- */
@@ -15888,7 +15890,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 +		iput(args->h_child_inode);
 +		iput(args->h_dir);
 +		iput(args->dir);
-+		au_delayed_kfree(args);
++		kfree(args);
 +	}
 +
 +out:
@@ -15929,26 +15931,17 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 +
 +static void au_hn_destroy_cache(void)
 +{
-+	struct au_cache *cp;
-+
-+	flush_delayed_work(&au_dfree.dwork);
-+	cp = au_dfree.cache + AuCache_HNOTIFY;
-+	AuDebugOn(!llist_empty(&cp->llist));
-+	kmem_cache_destroy(cp->cache);
-+	cp->cache = NULL;
++	kmem_cache_destroy(au_cache[AuCache_HNOTIFY]);
++	au_cache[AuCache_HNOTIFY] = NULL;
 +}
 +
-+AU_CACHE_DFREE_FUNC(hnotify, HNOTIFY, hn_lnode);
-+
 +int __init au_hnotify_init(void)
 +{
 +	int err;
-+	struct au_cache *cp;
 +
 +	err = -ENOMEM;
-+	cp = au_dfree.cache + AuCache_HNOTIFY;
-+	cp->cache = AuCache(au_hnotify);
-+	if (cp->cache) {
++	au_cache[AuCache_HNOTIFY] = AuCache(au_hnotify);
++	if (au_cache[AuCache_HNOTIFY]) {
 +		err = 0;
 +		if (au_hnotify_op.init)
 +			err = au_hnotify_op.init();
@@ -15961,19 +15954,16 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 +
 +void au_hnotify_fin(void)
 +{
-+	struct au_cache *cp;
-+
 +	if (au_hnotify_op.fin)
 +		au_hnotify_op.fin();
 +
 +	/* cf. au_cache_fin() */
-+	cp = au_dfree.cache + AuCache_HNOTIFY;
-+	if (cp->cache)
++	if (au_cache[AuCache_HNOTIFY])
 +		au_hn_destroy_cache();
 +}
 diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
 --- /usr/share/empty/fs/aufs/iinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/iinfo.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/iinfo.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,285 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -16245,7 +16235,7 @@ diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
 +
 +	iinfo = au_ii(inode);
 +	if (iinfo->ii_vdir)
-+		au_vdir_free(iinfo->ii_vdir, /*atonce*/0);
++		au_vdir_free(iinfo->ii_vdir);
 +
 +	bindex = iinfo->ii_btop;
 +	if (bindex >= 0) {
@@ -16257,12 +16247,12 @@ diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
 +			hi++;
 +		}
 +	}
-+	au_delayed_kfree(iinfo->ii_hinode);
++	kfree(iinfo->ii_hinode);
 +	AuRwDestroy(&iinfo->ii_rwsem);
 +}
 diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
 --- /usr/share/empty/fs/aufs/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/inode.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,527 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -16793,8 +16783,8 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
 +}
 diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 --- /usr/share/empty/fs/aufs/inode.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h	2017-05-06 22:16:52.781553511 +0200
-@@ -0,0 +1,692 @@
++++ linux/fs/aufs/inode.h	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,686 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -16832,10 +16822,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 +	/* never use fsnotify_add_vfsmount_mark() */
 +	struct fsnotify_mark		hn_mark;
 +#endif
-+	union {
-+		struct inode		*hn_aufs_inode;	/* no get/put */
-+		struct llist_node	hn_lnode;	/* delayed free */
-+	};
++	struct inode		*hn_aufs_inode;	/* no get/put */
 +#endif
 +} ____cacheline_aligned_in_smp;
 +
@@ -16878,10 +16865,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 +struct au_icntnr {
 +	struct au_iinfo iinfo;
 +	struct inode vfs_inode;
-+	union {
-+		struct hlist_node	plink;
-+		struct llist_node	lnode;	/* delayed free */
-+	};
++	struct hlist_node plink;
 +} ____cacheline_aligned_in_smp;
 +
 +/* au_pin flags */
@@ -17489,7 +17473,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 +#endif /* __AUFS_INODE_H__ */
 diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
 --- /usr/share/empty/fs/aufs/ioctl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/ioctl.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,219 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -17712,7 +17696,7 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
 +#endif
 diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 --- /usr/share/empty/fs/aufs/i_op_add.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/i_op_add.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,920 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -18061,7 +18045,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 +	if (!try_aopen)
 +		aufs_read_unlock(dentry, AuLock_DW);
 +out_free:
-+	au_delayed_kfree(a);
++	kfree(a);
 +out:
 +	return err;
 +}
@@ -18521,7 +18505,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 +	}
 +	aufs_read_and_write_unlock2(dentry, src_dentry);
 +out_kfree:
-+	au_delayed_kfree(a);
++	kfree(a);
 +out:
 +	AuTraceErr(err);
 +	return err;
@@ -18630,13 +18614,13 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 +	}
 +	aufs_read_unlock(dentry, AuLock_DW);
 +out_free:
-+	au_delayed_kfree(a);
++	kfree(a);
 +out:
 +	return err;
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 --- /usr/share/empty/fs/aufs/i_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/i_op.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,1452 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -19641,7 +19625,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 +out_si:
 +	si_read_unlock(sb);
 +out_kfree:
-+	au_delayed_kfree(a);
++	kfree(a);
 +out:
 +	AuTraceErr(err);
 +	return err;
@@ -19732,7 +19716,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 +	di_write_unlock(dentry);
 +	si_read_unlock(sb);
 +out_kfree:
-+	au_delayed_kfree(a);
++	kfree(a);
 +out:
 +	AuTraceErr(err);
 +	return err;
@@ -20092,7 +20076,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 +};
 diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
 --- /usr/share/empty/fs/aufs/i_op_del.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_del.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/i_op_del.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,511 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -20490,7 +20474,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
 +out_unlock:
 +	aufs_read_unlock(dentry, AuLock_DW);
 +out_free:
-+	au_delayed_kfree(a);
++	kfree(a);
 +out:
 +	return err;
 +}
@@ -20600,14 +20584,14 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
 +out_unlock:
 +	aufs_read_unlock(dentry, AuLock_DW);
 +out_free:
-+	au_delayed_kfree(a);
++	kfree(a);
 +out:
 +	AuTraceErr(err);
 +	return err;
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
 --- /usr/share/empty/fs/aufs/i_op_ren.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c	2017-05-06 22:16:52.778220093 +0200
++++ linux/fs/aufs/i_op_ren.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,1165 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -21769,14 +21753,14 @@ diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
 +	iput(a->dst_inode);
 +	if (a->thargs)
 +		au_whtmp_rmdir_free(a->thargs);
-+	au_delayed_kfree(a);
++	kfree(a);
 +out:
 +	AuTraceErr(err);
 +	return err;
 +}
 diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
 --- /usr/share/empty/fs/aufs/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Kconfig	2017-05-06 22:16:52.774886674 +0200
++++ linux/fs/aufs/Kconfig	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,185 @@
 +config AUFS_FS
 +	tristate "Aufs (Advanced multi layered unification filesystem) support"
@@ -21965,7 +21949,7 @@ diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
 +endif
 diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
 --- /usr/share/empty/fs/aufs/loop.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/loop.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,147 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -22112,11 +22096,11 @@ diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
 +{
 +	if (backing_file_func)
 +		symbol_put(loop_backing_file);
-+	au_delayed_kfree(au_warn_loopback_array);
++	kfree(au_warn_loopback_array);
 +}
 diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
 --- /usr/share/empty/fs/aufs/loop.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.h	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/loop.h	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,52 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -22172,7 +22156,7 @@ diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
 +#endif /* __AUFS_LOOP_H__ */
 diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
 --- /usr/share/empty/fs/aufs/magic.mk	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/magic.mk	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/magic.mk	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,30 @@
 +
 +# defined in ${srctree}/fs/fuse/inode.c
@@ -22206,7 +22190,7 @@ diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
 +endif
 diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
 --- /usr/share/empty/fs/aufs/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile	2017-05-06 22:16:52.774886674 +0200
++++ linux/fs/aufs/Makefile	2017-07-29 12:14:25.896375188 +0200
 @@ -0,0 +1,44 @@
 +
 +include ${src}/magic.mk
@@ -22254,8 +22238,8 @@ diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
 +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
 diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 --- /usr/share/empty/fs/aufs/module.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c	2017-05-06 22:16:52.781553511 +0200
-@@ -0,0 +1,333 @@
++++ linux/fs/aufs/module.c	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,266 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -22292,7 +22276,7 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +	if (p) {
 +#if 0 /* unused */
 +		if (!new_sz) {
-+			au_delayed_kfree(p);
++			kfree(p);
 +			p = NULL;
 +			goto out;
 +		}
@@ -22316,7 +22300,7 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +		if (q) {
 +			if (p) {
 +				memcpy(q, p, new_sz);
-+				au_delayed_kfree(p);
++				kfree(p);
 +			}
 +			p = q;
 +		} else
@@ -22340,61 +22324,11 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +/*
 + * aufs caches
 + */
-+
-+struct au_dfree au_dfree;
-+
-+/* delayed free */
-+static void au_do_dfree(struct work_struct *work __maybe_unused)
-+{
-+	struct llist_head *head;
-+	struct llist_node *node, *next;
-+
-+#define AU_CACHE_DFREE_DO_BODY(name, idx, lnode) do {			\
-+		head = &au_dfree.cache[AuCache_##idx].llist;		\
-+		node = llist_del_all(head);				\
-+		for (; node; node = next) {				\
-+			struct au_##name *p				\
-+				= llist_entry(node, struct au_##name,	\
-+					      lnode);			\
-+			next = llist_next(node);			\
-+			au_cache_free_##name(p);			\
-+		}							\
-+	} while (0)
-+
-+	AU_CACHE_DFREE_DO_BODY(dinfo, DINFO, di_lnode);
-+	AU_CACHE_DFREE_DO_BODY(icntnr, ICNTNR, lnode);
-+	AU_CACHE_DFREE_DO_BODY(finfo, FINFO, fi_lnode);
-+	AU_CACHE_DFREE_DO_BODY(vdir, VDIR, vd_lnode);
-+	AU_CACHE_DFREE_DO_BODY(vdir_dehstr, DEHSTR, lnode);
-+#ifdef CONFIG_AUFS_HNOTIFY
-+	AU_CACHE_DFREE_DO_BODY(hnotify, HNOTIFY, hn_lnode);
-+#endif
-+
-+#define AU_DFREE_DO_BODY(llist, func) do {		\
-+		node = llist_del_all(llist);		\
-+		for (; node; node = next) {		\
-+			next = llist_next(node);	\
-+			func(node);			\
-+		}					\
-+	} while (0)
-+
-+	AU_DFREE_DO_BODY(au_dfree.llist + AU_DFREE_KFREE, kfree);
-+	AU_DFREE_DO_BODY(au_dfree.llist + AU_DFREE_FREE_PAGE, au_free_page);
-+
-+#undef AU_CACHE_DFREE_DO_BODY
-+#undef AU_DFREE_DO_BODY
-+}
-+
-+AU_CACHE_DFREE_FUNC(dinfo, DINFO, di_lnode);
-+AU_CACHE_DFREE_FUNC(icntnr, ICNTNR, lnode);
-+AU_CACHE_DFREE_FUNC(finfo, FINFO, fi_lnode);
-+AU_CACHE_DFREE_FUNC(vdir, VDIR, vd_lnode);
-+AU_CACHE_DFREE_FUNC(vdir_dehstr, DEHSTR, lnode);
++struct kmem_cache *au_cache[AuCache_Last];
 +
 +static void au_cache_fin(void)
 +{
 +	int i;
-+	struct au_cache *cp;
 +
 +	/*
 +	 * Make sure all delayed rcu free inodes are flushed before we
@@ -22404,33 +22338,27 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +
 +	/* excluding AuCache_HNOTIFY */
 +	BUILD_BUG_ON(AuCache_HNOTIFY + 1 != AuCache_Last);
-+	flush_delayed_work(&au_dfree.dwork);
 +	for (i = 0; i < AuCache_HNOTIFY; i++) {
-+		cp = au_dfree.cache + i;
-+		AuDebugOn(!llist_empty(&cp->llist));
-+		kmem_cache_destroy(cp->cache);
-+		cp->cache = NULL;
++		kmem_cache_destroy(au_cache[i]);
++		au_cache[i] = NULL;
 +	}
 +}
 +
 +static int __init au_cache_init(void)
 +{
-+	struct au_cache *cp;
-+
-+	cp = au_dfree.cache;
-+	cp[AuCache_DINFO].cache = AuCacheCtor(au_dinfo, au_di_init_once);
-+	if (cp[AuCache_DINFO].cache)
++	au_cache[AuCache_DINFO] = AuCacheCtor(au_dinfo, au_di_init_once);
++	if (au_cache[AuCache_DINFO])
 +		/* SLAB_DESTROY_BY_RCU */
-+		cp[AuCache_ICNTNR].cache = AuCacheCtor(au_icntnr,
++		au_cache[AuCache_ICNTNR] = AuCacheCtor(au_icntnr,
 +						       au_icntnr_init_once);
-+	if (cp[AuCache_ICNTNR].cache)
-+		cp[AuCache_FINFO].cache = AuCacheCtor(au_finfo,
++	if (au_cache[AuCache_ICNTNR])
++		au_cache[AuCache_FINFO] = AuCacheCtor(au_finfo,
 +						      au_fi_init_once);
-+	if (cp[AuCache_FINFO].cache)
-+		cp[AuCache_VDIR].cache = AuCache(au_vdir);
-+	if (cp[AuCache_VDIR].cache)
-+		cp[AuCache_DEHSTR].cache = AuCache(au_vdir_dehstr);
-+	if (cp[AuCache_DEHSTR].cache)
++	if (au_cache[AuCache_FINFO])
++		au_cache[AuCache_VDIR] = AuCache(au_vdir);
++	if (au_cache[AuCache_VDIR])
++		au_cache[AuCache_DEHSTR] = AuCache(au_vdir_dehstr);
++	if (au_cache[AuCache_DEHSTR])
 +		return 0;
 +
 +	au_cache_fin();
@@ -22479,9 +22407,9 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +	int err;
 +
 +	err = seq_path(seq, path, au_esc_chars);
-+	if (err > 0)
++	if (err >= 0)
 +		err = 0;
-+	else if (err < 0)
++	else
 +		err = -ENOMEM;
 +
 +	return err;
@@ -22493,7 +22421,6 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +{
 +	int err, i;
 +	char *p;
-+	struct au_cache *cp;
 +
 +	p = au_esc_chars;
 +	for (i = 1; i <= ' '; i++)
@@ -22508,15 +22435,7 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +	for (i = 0; i < AuIop_Last; i++)
 +		aufs_iop_nogetattr[i].getattr = NULL;
 +
-+	/* First, initialize au_dfree */
-+	for (i = 0; i < AuCache_Last; i++) {	/* including hnotify */
-+		cp = au_dfree.cache + i;
-+		cp->cache = NULL;
-+		init_llist_head(&cp->llist);
-+	}
-+	for (i = 0; i < AU_DFREE_Last; i++)
-+		init_llist_head(au_dfree.llist + i);
-+	INIT_DELAYED_WORK(&au_dfree.dwork, au_do_dfree);
++	memset(au_cache, 0, sizeof(au_cache));	/* including hnotify */
 +
 +	au_sbilist_init();
 +	sysaufs_brs_init();
@@ -22568,7 +22487,6 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +out_sysaufs:
 +	sysaufs_fin();
 +	au_dy_fin();
-+	flush_delayed_work(&au_dfree.dwork);
 +out:
 +	return err;
 +}
@@ -22584,15 +22502,14 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +	au_procfs_fin();
 +	sysaufs_fin();
 +	au_dy_fin();
-+	flush_delayed_work(&au_dfree.dwork);
 +}
 +
 +module_init(aufs_init);
 +module_exit(aufs_exit);
 diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 --- /usr/share/empty/fs/aufs/module.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h	2017-05-06 22:16:52.781553511 +0200
-@@ -0,0 +1,156 @@
++++ linux/fs/aufs/module.h	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,101 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -22620,7 +22537,6 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 +#ifdef __KERNEL__
 +
 +#include <linux/slab.h>
-+#include "debug.h"
 +
 +struct path;
 +struct seq_file;
@@ -22659,7 +22575,7 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 +
 +/* ---------------------------------------------------------------------- */
 +
-+/* kmem cache and delayed free */
++/* kmem cache */
 +enum {
 +	AuCache_DINFO,
 +	AuCache_ICNTNR,
@@ -22670,28 +22586,7 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 +	AuCache_Last
 +};
 +
-+enum {
-+	AU_DFREE_KFREE,
-+	AU_DFREE_FREE_PAGE,
-+	AU_DFREE_Last
-+};
-+
-+struct au_cache {
-+	struct kmem_cache	*cache;
-+	struct llist_head	llist;	/* delayed free */
-+};
-+
-+/*
-+ * in order to reduce the cost of the internal timer, consolidate all the
-+ * delayed free works into a single delayed_work.
-+ */
-+struct au_dfree {
-+	struct au_cache		cache[AuCache_Last];
-+	struct llist_head	llist[AU_DFREE_Last];
-+	struct delayed_work	dwork;
-+};
-+
-+extern struct au_dfree au_dfree;
++extern struct kmem_cache *au_cache[AuCache_Last];
 +
 +#define AuCacheFlags		(SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD)
 +#define AuCache(type)		KMEM_CACHE(type, AuCacheFlags)
@@ -22699,25 +22594,11 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 +	kmem_cache_create(#type, sizeof(struct type), \
 +			  __alignof__(struct type), AuCacheFlags, ctor)
 +
-+#define AU_DFREE_DELAY		msecs_to_jiffies(10)
-+#define AU_DFREE_BODY(lnode, llist) do {				\
-+		if (llist_add(lnode, llist))				\
-+			schedule_delayed_work(&au_dfree.dwork,		\
-+					      AU_DFREE_DELAY);		\
-+	} while (0)
-+#define AU_CACHE_DFREE_FUNC(name, idx, lnode)				\
-+	void au_cache_dfree_##name(struct au_##name *p)			\
-+	{								\
-+		struct au_cache *cp = au_dfree.cache + AuCache_##idx;	\
-+		AU_DFREE_BODY(&p->lnode, &cp->llist);			\
-+	}
-+
 +#define AuCacheFuncs(name, index) \
 +static inline struct au_##name *au_cache_alloc_##name(void) \
-+{ return kmem_cache_alloc(au_dfree.cache[AuCache_##index].cache, GFP_NOFS); } \
++{ return kmem_cache_alloc(au_cache[AuCache_##index], GFP_NOFS); } \
 +static inline void au_cache_free_##name(struct au_##name *p) \
-+{ kmem_cache_free(au_dfree.cache[AuCache_##index].cache, p); } \
-+void au_cache_dfree_##name(struct au_##name *p)
++{ kmem_cache_free(au_cache[AuCache_##index], p); }
 +
 +AuCacheFuncs(dinfo, DINFO);
 +AuCacheFuncs(icntnr, ICNTNR);
@@ -22728,30 +22609,11 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 +AuCacheFuncs(hnotify, HNOTIFY);
 +#endif
 +
-+static inline void au_delayed_kfree(const void *p)
-+{
-+	AuDebugOn(!p);
-+	AuDebugOn(ksize(p) < sizeof(struct llist_node));
-+
-+	AU_DFREE_BODY((void *)p, au_dfree.llist + AU_DFREE_KFREE);
-+}
-+
-+/* cast only */
-+static inline void au_free_page(void *p)
-+{
-+	free_page((unsigned long)p);
-+}
-+
-+static inline void au_delayed_free_page(unsigned long addr)
-+{
-+	AU_DFREE_BODY((void *)addr, au_dfree.llist + AU_DFREE_FREE_PAGE);
-+}
-+
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_MODULE_H__ */
 diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
 --- /usr/share/empty/fs/aufs/mvdown.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/mvdown.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,704 @@
 +/*
 + * Copyright (C) 2011-2017 Junjiro R. Okajima
@@ -23452,15 +23314,15 @@ diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
 +	e = copy_to_user(uarg, &args->mvdown, sizeof(args->mvdown));
 +	if (unlikely(e))
 +		err = -EFAULT;
-+	au_delayed_kfree(args);
++	kfree(args);
 +out:
 +	AuTraceErr(err);
 +	return err;
 +}
 diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 --- /usr/share/empty/fs/aufs/opts.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c	2017-05-06 22:16:52.781553511 +0200
-@@ -0,0 +1,1848 @@
++++ linux/fs/aufs/opts.c	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,1846 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -24705,7 +24567,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +		}
 +	}
 +
-+	au_delayed_kfree(a);
++	kfree(a);
 +	dump_opts(opts);
 +	if (unlikely(err))
 +		au_opts_free(opts);
@@ -24968,7 +24830,6 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +		}
 +		break;
 +	}
-+
 +	return err;
 +}
 +
@@ -25129,8 +24990,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +		au_hn_inode_unlock(hdir);
 +
 +		if (!err && do_free) {
-+			if (wbr)
-+				au_delayed_kfree(wbr);
++			kfree(wbr);
 +			br->br_wbr = NULL;
 +		}
 +	}
@@ -25311,8 +25171,8 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +}
 diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
 --- /usr/share/empty/fs/aufs/opts.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h	2017-05-06 22:16:52.781553511 +0200
-@@ -0,0 +1,213 @@
++++ linux/fs/aufs/opts.h	2017-07-29 12:14:25.903042072 +0200
+@@ -0,0 +1,212 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -25342,7 +25202,6 @@ diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
 +#include <linux/path.h>
 +
 +struct file;
-+struct super_block;
 +
 +/* ---------------------------------------------------------------------- */
 +
@@ -25528,7 +25387,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
 +#endif /* __AUFS_OPTS_H__ */
 diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
 --- /usr/share/empty/fs/aufs/plink.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/plink.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/plink.c	2017-07-29 12:14:25.903042072 +0200
 @@ -0,0 +1,514 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -26046,7 +25905,7 @@ diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
 +}
 diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
 --- /usr/share/empty/fs/aufs/poll.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/poll.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/poll.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,52 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -26102,7 +25961,7 @@ diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
 +}
 diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
 --- /usr/share/empty/fs/aufs/posix_acl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/posix_acl.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/posix_acl.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,102 @@
 +/*
 + * Copyright (C) 2014-2017 Junjiro R. Okajima
@@ -26208,7 +26067,7 @@ diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
 +}
 diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
 --- /usr/share/empty/fs/aufs/procfs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/procfs.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,169 @@
 +/*
 + * Copyright (C) 2010-2017 Junjiro R. Okajima
@@ -26381,7 +26240,7 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
 +}
 diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
 --- /usr/share/empty/fs/aufs/rdu.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/rdu.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,381 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -26766,7 +26625,7 @@ diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
 +#endif
 diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
 --- /usr/share/empty/fs/aufs/rwsem.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/rwsem.h	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,198 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -26968,7 +26827,7 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
 +#endif /* __AUFS_RWSEM_H__ */
 diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 --- /usr/share/empty/fs/aufs/sbinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sbinfo.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/sbinfo.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,304 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -27016,11 +26875,11 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 +	au_br_free(sbinfo);
 +	au_rw_write_unlock(&sbinfo->si_rwsem);
 +
-+	au_delayed_kfree(sbinfo->si_branch);
++	kfree(sbinfo->si_branch);
 +	mutex_destroy(&sbinfo->si_xib_mtx);
 +	AuRwDestroy(&sbinfo->si_rwsem);
 +
-+	au_delayed_kfree(sbinfo);
++	kfree(sbinfo);
 +}
 +
 +int au_si_alloc(struct super_block *sb)
@@ -27091,9 +26950,9 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 +	return 0; /* success */
 +
 +out_br:
-+	au_delayed_kfree(sbinfo->si_branch);
++	kfree(sbinfo->si_branch);
 +out_sbinfo:
-+	au_delayed_kfree(sbinfo);
++	kfree(sbinfo);
 +out:
 +	return err;
 +}
@@ -27276,7 +27135,7 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/spl.h linux/fs/aufs/spl.h
 --- /usr/share/empty/fs/aufs/spl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/spl.h	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/spl.h	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,113 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -27393,7 +27252,7 @@ diff -urN /usr/share/empty/fs/aufs/spl.h linux/fs/aufs/spl.h
 +#endif /* __AUFS_SPL_H__ */
 diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 --- /usr/share/empty/fs/aufs/super.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/super.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,1044 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -27443,7 +27302,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 +{
 +	struct inode *inode = container_of(head, struct inode, i_rcu);
 +
-+	au_cache_dfree_icntnr(container_of(inode, struct au_icntnr, vfs_inode));
++	au_cache_free_icntnr(container_of(inode, struct au_icntnr, vfs_inode));
 +}
 +
 +static void aufs_destroy_inode(struct inode *inode)
@@ -28231,7 +28090,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 +out_mtx:
 +	inode_unlock(inode);
 +out_opts:
-+	au_delayed_free_page((unsigned long)opts.opt);
++	free_page((unsigned long)opts.opt);
 +out:
 +	err = cvt_err(err);
 +	AuTraceErr(err);
@@ -28372,7 +28231,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 +	kobject_put(&sbinfo->si_kobj);
 +	sb->s_fs_info = NULL;
 +out_opts:
-+	au_delayed_free_page((unsigned long)opts.opt);
++	free_page((unsigned long)opts.opt);
 +out:
 +	AuTraceErr(err);
 +	err = cvt_err(err);
@@ -28441,7 +28300,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 +};
 diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
 --- /usr/share/empty/fs/aufs/super.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/super.h	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,617 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -29062,7 +28921,7 @@ diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
 +#endif /* __AUFS_SUPER_H__ */
 diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
 --- /usr/share/empty/fs/aufs/sysaufs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/sysaufs.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,104 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -29170,7 +29029,7 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
 +}
 diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
 --- /usr/share/empty/fs/aufs/sysaufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.h	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/sysaufs.h	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,101 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -29275,7 +29134,7 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
 +#endif /* __SYSAUFS_H__ */
 diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
 --- /usr/share/empty/fs/aufs/sysfs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysfs.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/sysfs.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,376 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -29488,7 +29347,7 @@ diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
 +		if (unlikely(err == PAGE_SIZE))
 +			err = -EFBIG;
 +	}
-+	au_delayed_kfree(seq);
++	kfree(seq);
 +out_unlock:
 +	si_read_unlock(sb);
 +out:
@@ -29559,9 +29418,9 @@ diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
 +		err = -EFAULT;
 +
 +out_seq:
-+	au_delayed_kfree(seq);
++	kfree(seq);
 +out_buf:
-+	au_delayed_free_page((unsigned long)buf);
++	free_page((unsigned long)buf);
 +out:
 +	si_read_unlock(sb);
 +	return err;
@@ -29655,7 +29514,7 @@ diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
 +}
 diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
 --- /usr/share/empty/fs/aufs/sysrq.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysrq.c	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/sysrq.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,157 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -29816,8 +29675,8 @@ diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 --- /usr/share/empty/fs/aufs/vdir.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c	2017-05-06 22:16:52.781553511 +0200
-@@ -0,0 +1,900 @@
++++ linux/fs/aufs/vdir.c	2017-07-29 12:14:25.906375514 +0200
+@@ -0,0 +1,892 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -29930,7 +29789,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +	struct hlist_node *node;
 +
 +	hlist_for_each_entry_safe(pos, node, head, wh_hash)
-+		au_delayed_kfree(pos);
++		kfree(pos);
 +}
 +
 +static void au_nhash_de_do_free(struct hlist_head *head)
@@ -29939,7 +29798,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +	struct hlist_node *node;
 +
 +	hlist_for_each_entry_safe(pos, node, head, hash)
-+		au_cache_dfree_vdir_dehstr(pos);
++		au_cache_free_vdir_dehstr(pos);
 +}
 +
 +static void au_nhash_do_free(struct au_nhash *nhash,
@@ -29957,7 +29816,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +		nhash_count(head);
 +		free(head++);
 +	}
-+	au_delayed_kfree(nhash->nh_head);
++	kfree(nhash->nh_head);
 +}
 +
 +void au_nhash_wh_free(struct au_nhash *whlist)
@@ -30170,23 +30029,15 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +
 +/* ---------------------------------------------------------------------- */
 +
-+void au_vdir_free(struct au_vdir *vdir, int atonce)
++void au_vdir_free(struct au_vdir *vdir)
 +{
 +	unsigned char **deblk;
 +
 +	deblk = vdir->vd_deblk;
-+	if (!atonce) {
-+		while (vdir->vd_nblk--)
-+			au_delayed_kfree(*deblk++);
-+		au_delayed_kfree(vdir->vd_deblk);
-+		au_cache_dfree_vdir(vdir);
-+	} else {
-+		/* not delayed */
-+		while (vdir->vd_nblk--)
-+			kfree(*deblk++);
-+		kfree(vdir->vd_deblk);
-+		au_cache_free_vdir(vdir);
-+	}
++	while (vdir->vd_nblk--)
++		kfree(*deblk++);
++	kfree(vdir->vd_deblk);
++	au_cache_free_vdir(vdir);
 +}
 +
 +static struct au_vdir *alloc_vdir(struct file *file)
@@ -30220,10 +30071,10 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +	if (!err)
 +		return vdir; /* success */
 +
-+	au_delayed_kfree(vdir->vd_deblk);
++	kfree(vdir->vd_deblk);
 +
 +out_free:
-+	au_cache_dfree_vdir(vdir);
++	au_cache_free_vdir(vdir);
 +out:
 +	vdir = ERR_PTR(err);
 +	return vdir;
@@ -30235,7 +30086,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +	union au_vdir_deblk_p p, deblk_end;
 +
 +	while (vdir->vd_nblk > 1) {
-+		au_delayed_kfree(vdir->vd_deblk[vdir->vd_nblk - 1]);
++		kfree(vdir->vd_deblk[vdir->vd_nblk - 1]);
 +		/* vdir->vd_deblk[vdir->vd_nblk - 1] = NULL; */
 +		vdir->vd_nblk--;
 +	}
@@ -30366,7 +30217,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +		}
 +	}
 +
-+	au_delayed_free_page((unsigned long)o);
++	free_page((unsigned long)o);
 +
 +out:
 +	AuTraceErr(err);
@@ -30505,7 +30356,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +		if (allocated)
 +			au_set_ivdir(inode, allocated);
 +	} else if (allocated)
-+		au_vdir_free(allocated, /*atonce*/0);
++		au_vdir_free(allocated);
 +
 +out:
 +	return err;
@@ -30600,7 +30451,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +		if (allocated)
 +			au_set_fvdir_cache(file, allocated);
 +	} else if (allocated)
-+		au_vdir_free(allocated, /*atonce*/0);
++		au_vdir_free(allocated);
 +
 +out:
 +	return err;
@@ -30720,8 +30571,8 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 --- /usr/share/empty/fs/aufs/vfsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c	2017-05-06 22:16:52.781553511 +0200
-@@ -0,0 +1,899 @@
++++ linux/fs/aufs/vfsub.c	2017-07-29 12:14:25.906375514 +0200
+@@ -0,0 +1,900 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -31322,6 +31173,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 +	lockdep_on();
 +	if (err >= 0)
 +		vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/
++
 +	return err;
 +}
 +
@@ -31623,7 +31475,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 --- /usr/share/empty/fs/aufs/vfsub.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h	2017-05-06 22:16:52.781553511 +0200
++++ linux/fs/aufs/vfsub.h	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,353 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -31980,7 +31832,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 +#endif /* __AUFS_VFSUB_H__ */
 diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
 --- /usr/share/empty/fs/aufs/wbr_policy.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c	2017-05-06 22:16:52.784886929 +0200
++++ linux/fs/aufs/wbr_policy.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,830 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -32445,7 +32297,7 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
 +
 +	mfs->mfsrr_bytes = bavail;
 +	AuDbg("b%d\n", mfs->mfs_bindex);
-+	au_delayed_kfree(st);
++	kfree(st);
 +}
 +
 +static int au_wbr_create_mfs(struct dentry *dentry, unsigned int flags)
@@ -32814,7 +32666,7 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
 +};
 diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 --- /usr/share/empty/fs/aufs/whout.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c	2017-05-06 22:16:52.784886929 +0200
++++ linux/fs/aufs/whout.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,1061 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -32980,7 +32832,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 +
 +out_name:
 +	if (name != defname)
-+		au_delayed_kfree(name);
++		kfree(name);
 +out:
 +	AuTraceErrPtr(dentry);
 +	return dentry;
@@ -33420,7 +33272,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 +	au_br_put(a->br);
 +	si_write_unlock(a->sb);
 +	au_nwt_done(&au_sbi(a->sb)->si_nowait);
-+	au_delayed_kfree(arg);
++	kfree(arg);
 +	if (unlikely(err))
 +		AuIOErr("err %d\n", err);
 +}
@@ -33448,7 +33300,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 +		if (unlikely(wkq_err)) {
 +			atomic_dec(&br->br_wbr->wbr_wh_running);
 +			au_br_put(br);
-+			au_delayed_kfree(arg);
++			kfree(arg);
 +		}
 +		do_dec = 0;
 +	}
@@ -33607,7 +33459,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 +	wh_dentry = ERR_PTR(err);
 +	if (!err) {
 +		wh_dentry = vfsub_lkup_one(&wh_name, h_parent);
-+		au_delayed_kfree(wh_name.name);
++		kfree(wh_name.name);
 +	}
 +	return wh_dentry;
 +}
@@ -33683,7 +33535,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 +			break;
 +		}
 +	}
-+	au_delayed_free_page((unsigned long)wh_name.name);
++	free_page((unsigned long)wh_name.name);
 +
 +out:
 +	return err;
@@ -33725,7 +33577,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 +		rdhash = AUFS_RDHASH_DEF;
 +	err = au_nhash_alloc(&whtmp->whlist, rdhash, gfp);
 +	if (unlikely(err)) {
-+		au_delayed_kfree(whtmp);
++		kfree(whtmp);
 +		whtmp = ERR_PTR(err);
 +	}
 +
@@ -33740,7 +33592,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 +	dput(whtmp->wh_dentry);
 +	iput(whtmp->dir);
 +	au_nhash_wh_free(&whtmp->whlist);
-+	au_delayed_kfree(whtmp);
++	kfree(whtmp);
 +}
 +
 +/*
@@ -33879,8 +33731,8 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 +}
 diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
 --- /usr/share/empty/fs/aufs/whout.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h	2017-05-06 22:16:52.784886929 +0200
-@@ -0,0 +1,85 @@
++++ linux/fs/aufs/whout.h	2017-07-29 12:14:25.906375514 +0200
+@@ -0,0 +1,84 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
 + *
@@ -33913,7 +33765,6 @@ diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
 +int au_wh_name_alloc(struct qstr *wh, const struct qstr *name);
 +int au_wh_test(struct dentry *h_parent, struct qstr *wh_name, int try_sio);
 +int au_diropq_test(struct dentry *h_dentry);
-+struct au_branch;
 +struct dentry *au_whtmp_lkup(struct dentry *h_parent, struct au_branch *br,
 +			     struct qstr *prefix);
 +int au_whtmp_ren(struct dentry *h_dentry, struct au_branch *br);
@@ -33968,7 +33819,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
 +#endif /* __AUFS_WHOUT_H__ */
 diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
 --- /usr/share/empty/fs/aufs/wkq.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c	2017-05-06 22:16:52.784886929 +0200
++++ linux/fs/aufs/wkq.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,213 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -34026,7 +33877,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
 +	else {
 +		kobject_put(wkinfo->kobj);
 +		module_put(THIS_MODULE); /* todo: ?? */
-+		au_delayed_kfree(wkinfo);
++		kfree(wkinfo);
 +	}
 +}
 +
@@ -34049,7 +33900,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
 +
 +static void au_wkq_comp_free(struct completion *comp)
 +{
-+	au_delayed_kfree(comp);
++	kfree(comp);
 +}
 +
 +#else
@@ -34185,7 +34036,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
 +}
 diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
 --- /usr/share/empty/fs/aufs/wkq.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h	2017-05-06 22:16:52.784886929 +0200
++++ linux/fs/aufs/wkq.h	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,93 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -34282,7 +34133,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
 +#endif /* __AUFS_WKQ_H__ */
 diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 --- /usr/share/empty/fs/aufs/xattr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c	2017-05-06 22:16:52.784886929 +0200
++++ linux/fs/aufs/xattr.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,357 @@
 +/*
 + * Copyright (C) 2014-2017 Junjiro R. Okajima
@@ -34465,11 +34316,11 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +	}
 +
 +	if (value)
-+		au_delayed_kfree(value);
++		kfree(value);
 +
 +out_free:
 +	if (o)
-+		au_delayed_kfree(o);
++		kfree(o);
 +out:
 +	if (!unlocked)
 +		inode_unlock(h_isrc);
@@ -34643,7 +34494,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +}
 diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 --- /usr/share/empty/fs/aufs/xino.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c	2017-05-06 22:16:52.784886929 +0200
++++ linux/fs/aufs/xino.c	2017-07-29 12:14:25.906375514 +0200
 @@ -0,0 +1,1415 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -34985,7 +34836,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +		AuErr1("statfs err %d, ignored\n", err);
 +
 +out_st:
-+	au_delayed_kfree(st);
++	kfree(st);
 +out:
 +	return err;
 +}
@@ -35020,7 +34871,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +	au_br_put(br);
 +	si_write_unlock(sb);
 +	au_nwt_done(&au_sbi(sb)->si_nowait);
-+	au_delayed_kfree(args);
++	kfree(args);
 +}
 +
 +static int xino_trunc_test(struct super_block *sb, struct au_branch *br)
@@ -35074,7 +34925,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +
 +	pr_err("wkq %d\n", wkq_err);
 +	au_br_put(br);
-+	au_delayed_kfree(args);
++	kfree(args);
 +
 +out:
 +	atomic_dec(&br->br_xino_running);
@@ -35598,7 +35449,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +				(sb, au_sbr(sb, bindex)->br_xino.xi_file, page);
 +		else
 +			AuDbg("b%d\n", bindex);
-+	au_delayed_free_page((unsigned long)page);
++	free_page((unsigned long)page);
 +
 +out:
 +	return err;
@@ -35676,7 +35527,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +		fput(sbinfo->si_xib);
 +	sbinfo->si_xib = NULL;
 +	if (sbinfo->si_xib_buf)
-+		au_delayed_free_page((unsigned long)sbinfo->si_xib_buf);
++		free_page((unsigned long)sbinfo->si_xib_buf);
 +	sbinfo->si_xib_buf = NULL;
 +}
 +
@@ -35720,7 +35571,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +
 +out_free:
 +	if (sbinfo->si_xib_buf)
-+		au_delayed_free_page((unsigned long)sbinfo->si_xib_buf);
++		free_page((unsigned long)sbinfo->si_xib_buf);
 +	sbinfo->si_xib_buf = NULL;
 +	if (err >= 0)
 +		err = -EIO;
@@ -35813,7 +35664,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +			fput(p->new);
 +		else
 +			break;
-+	au_delayed_kfree(fpair);
++	kfree(fpair);
 +out:
 +	return err;
 +}
@@ -35924,7 +35775,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +			if (!IS_ERR(file))
 +				au_xino_brid_set(sb, br->br_id);
 +		}
-+		au_delayed_free_page((unsigned long)page);
++		free_page((unsigned long)page);
 +	} else {
 +		file = au_xino_create(sb, AUFS_XINO_DEFPATH, /*silent*/0);
 +		if (IS_ERR(file))
@@ -36062,7 +35913,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +}
 diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
 --- /usr/share/empty/include/uapi/linux/aufs_type.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h	2017-05-06 22:16:52.784886929 +0200
++++ linux/include/uapi/linux/aufs_type.h	2017-07-29 12:14:32.526591175 +0200
 @@ -0,0 +1,419 @@
 +/*
 + * Copyright (C) 2005-2017 Junjiro R. Okajima
@@ -36105,7 +35956,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +
 +#include <linux/limits.h>
 +
-+#define AUFS_VERSION	"4.x-rcN-20170410"
++#define AUFS_VERSION	"4.x-rcN-20170703"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -36486,10 +36337,10 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 aufs4.x-rcN loopback patch
 
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index cf39138..29b33b2 100644
+index 6b8a6a4c..a80416e 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -551,7 +551,7 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
+@@ -547,7 +547,7 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
  }
  
  struct switch_request {
@@ -36498,7 +36349,7 @@ index cf39138..29b33b2 100644
  	struct completion wait;
  };
  
-@@ -577,6 +577,7 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
+@@ -573,6 +573,7 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
  	mapping = file->f_mapping;
  	mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
  	lo->lo_backing_file = file;
@@ -36506,7 +36357,7 @@ index cf39138..29b33b2 100644
  	lo->lo_blocksize = S_ISBLK(mapping->host->i_mode) ?
  		mapping->host->i_bdev->bd_block_size : PAGE_SIZE;
  	lo->old_gfp_mask = mapping_gfp_mask(mapping);
-@@ -589,11 +590,13 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
+@@ -585,11 +586,13 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
   * First it needs to flush existing IO, it does this by sending a magic
   * BIO down the pipe. The completion of this BIO does the actual switch.
   */
@@ -36521,14 +36372,10 @@ index cf39138..29b33b2 100644
  
  	/* freeze queue and wait for completion of scheduled requests */
  	blk_mq_freeze_queue(lo->lo_queue);
-@@ -612,7 +615,16 @@ static int loop_switch(struct loop_device *lo, struct file *file)
-  */
- static int loop_flush(struct loop_device *lo)
- {
--	return loop_switch(lo, NULL);
-+	return loop_switch(lo, NULL, NULL);
-+}
-+
+@@ -614,6 +617,15 @@ static int loop_flush(struct loop_device *lo)
+ 	return loop_switch(lo, NULL);
+ }
+ 
 +static struct file *loop_real_file(struct file *file)
 +{
 +	struct file *f = NULL;
@@ -36536,10 +36383,12 @@ index cf39138..29b33b2 100644
 +	if (file->f_path.dentry->d_sb->s_op->real_loop)
 +		f = file->f_path.dentry->d_sb->s_op->real_loop(file);
 +	return f;
- }
- 
++}
++
  static void loop_reread_partitions(struct loop_device *lo,
-@@ -649,6 +661,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+ 				   struct block_device *bdev)
+ {
+@@ -648,6 +660,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  			  unsigned int arg)
  {
  	struct file	*file, *old_file;
@@ -36547,7 +36396,7 @@ index cf39138..29b33b2 100644
  	struct inode	*inode;
  	int		error;
  
-@@ -665,9 +678,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -664,9 +677,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	file = fget(arg);
  	if (!file)
  		goto out;
@@ -36564,7 +36413,7 @@ index cf39138..29b33b2 100644
  
  	error = -EINVAL;
  
-@@ -679,17 +699,21 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -678,17 +698,21 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  		goto out_putf;
  
  	/* and ... switch */
@@ -36587,7 +36436,7 @@ index cf39138..29b33b2 100644
   out:
  	return error;
  }
-@@ -876,7 +900,7 @@ static int loop_prepare_queue(struct loop_device *lo)
+@@ -875,7 +899,7 @@ static int loop_prepare_queue(struct loop_device *lo)
  static int loop_set_fd(struct loop_device *lo, fmode_t mode,
  		       struct block_device *bdev, unsigned int arg)
  {
@@ -36596,7 +36445,7 @@ index cf39138..29b33b2 100644
  	struct inode	*inode;
  	struct address_space *mapping;
  	unsigned lo_blocksize;
-@@ -891,6 +915,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -890,6 +914,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
  	file = fget(arg);
  	if (!file)
  		goto out;
@@ -36609,7 +36458,7 @@ index cf39138..29b33b2 100644
  
  	error = -EBUSY;
  	if (lo->lo_state != Lo_unbound)
-@@ -943,6 +973,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -942,6 +972,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
  	lo->lo_device = bdev;
  	lo->lo_flags = lo_flags;
  	lo->lo_backing_file = file;
@@ -36617,7 +36466,7 @@ index cf39138..29b33b2 100644
  	lo->transfer = NULL;
  	lo->ioctl = NULL;
  	lo->lo_sizelimit = 0;
-@@ -975,6 +1006,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -974,6 +1005,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
  
   out_putf:
  	fput(file);
@@ -36626,7 +36475,7 @@ index cf39138..29b33b2 100644
   out:
  	/* This is safe: open() is still holding a reference. */
  	module_put(THIS_MODULE);
-@@ -1021,6 +1054,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
+@@ -1020,6 +1053,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
  static int loop_clr_fd(struct loop_device *lo)
  {
  	struct file *filp = lo->lo_backing_file;
@@ -36634,7 +36483,7 @@ index cf39138..29b33b2 100644
  	gfp_t gfp = lo->old_gfp_mask;
  	struct block_device *bdev = lo->lo_device;
  
-@@ -1052,6 +1086,7 @@ static int loop_clr_fd(struct loop_device *lo)
+@@ -1051,6 +1085,7 @@ static int loop_clr_fd(struct loop_device *lo)
  	spin_lock_irq(&lo->lo_lock);
  	lo->lo_state = Lo_rundown;
  	lo->lo_backing_file = NULL;
@@ -36642,7 +36491,7 @@ index cf39138..29b33b2 100644
  	spin_unlock_irq(&lo->lo_lock);
  
  	loop_release_xfer(lo);
-@@ -1096,6 +1131,8 @@ static int loop_clr_fd(struct loop_device *lo)
+@@ -1095,6 +1130,8 @@ static int loop_clr_fd(struct loop_device *lo)
  	 * bd_mutex which is usually taken before lo_ctl_mutex.
  	 */
  	fput(filp);
@@ -36652,7 +36501,7 @@ index cf39138..29b33b2 100644
  }
  
 diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index fb2237c..c3888c5 100644
+index fecd3f9..6b3a7c9 100644
 --- a/drivers/block/loop.h
 +++ b/drivers/block/loop.h
 @@ -46,7 +46,7 @@ struct loop_device {
@@ -36665,10 +36514,10 @@ index fb2237c..c3888c5 100644
  	unsigned	lo_blocksize;
  	void		*key_data; 
 diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 7e03507..f31af1d 100644
+index 870717e..ea7fee0 100644
 --- a/fs/aufs/f_op.c
 +++ b/fs/aufs/f_op.c
-@@ -360,7 +360,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
+@@ -357,7 +357,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
  	if (IS_ERR(h_file))
  		goto out;
  
@@ -36678,12 +36527,12 @@ index 7e03507..f31af1d 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 61e9197..9910bea 100644
+index e35f015..b37f1ae 100644
 --- a/fs/aufs/loop.c
 +++ b/fs/aufs/loop.c
 @@ -132,3 +132,19 @@ void au_loopback_fin(void)
  		symbol_put(loop_backing_file);
- 	au_delayed_kfree(au_warn_loopback_array);
+ 	kfree(au_warn_loopback_array);
  }
 +
 +/* ---------------------------------------------------------------------- */
@@ -36727,7 +36576,7 @@ index e2df495..36e5052 100644
  
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 0e9bbc3..b90d52f 100644
+index 5455fb1..8b9df60 100644
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
 @@ -837,7 +837,10 @@ static const struct super_operations aufs_sop = {
@@ -36743,10 +36592,10 @@ index 0e9bbc3..b90d52f 100644
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 3668627..2cbc8fe 100644
+index 22d2910..d8db3fb 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1810,6 +1810,10 @@ struct super_operations {
+@@ -1811,6 +1811,10 @@ struct super_operations {
  				  struct shrink_control *);
  	long (*free_cached_objects)(struct super_block *,
  				    struct shrink_control *);
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 319191ce..28517b8b 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,38 +26,4 @@
  				exit
  			fi
  		done
-From 5d12f71723762a39435d054d02bbf5fb87c5cd14 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm at maven.pl>
-Date: Mon, 6 Feb 2017 14:45:15 +0100
-Subject: [PATCH] mac80211: Print text for disassociation reason
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When disassociation happens only numeric reason is printed
-in ieee80211_rx_mgmt_disassoc(). Add text variant, too.
-
-Signed-off-by: Arkadiusz Miśkiewicz <arekm at maven.pl>
----
- net/mac80211/mlme.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
-index 098ce9b179ee..fcf8d0aa66ec 100644
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -2801,8 +2801,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
- 
- 	reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
- 
--	sdata_info(sdata, "disassociated from %pM (Reason: %u)\n",
--		   mgmt->sa, reason_code);
-+	sdata_info(sdata, "disassociated from %pM (Reason: %u=%s)\n",
-+		   mgmt->sa, reason_code,
-+		   ieee80211_get_reason_code_string(reason_code));
- 
- 	ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
- 
--- 
-2.11.0
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/1c60b727338bd05e415668bde455f1029ff88814



More information about the pld-cvs-commit mailing list