[packages/kernel] - partial update to 4.7.0; zph needs fix/drop; apparmor pending update (upstream is preparing patche

arekm arekm at pld-linux.org
Tue Jul 26 08:56:01 CEST 2016


commit 5afbbe0d2cf36a3aaa279aba8ceed469c01d3f78
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Jul 26 08:55:47 2016 +0200

    - partial update to 4.7.0; zph needs fix/drop; apparmor pending update (upstream is preparing patches); imq needs update; builds without imq, apparmor and zph

 kernel-aufs4.patch      | 2990 ++++++++++++++++++++++++-----------------------
 kernel-multiarch.config |   93 +-
 kernel-x86.config       |    5 -
 kernel.spec             |   12 +-
 4 files changed, 1622 insertions(+), 1478 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 9348a86..2c1a03a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,9 +68,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
-%define		basever		4.6
-%define		postver		.4
+%define		rel		0.1
+%define		basever		4.7
+%define		postver		.0
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -116,7 +116,7 @@ Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5:	d2927020e24a76da4ab482a8bc3e9ef3
+# Source0-md5:	5276563eb1f39a048e4a8a887408c031
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
 # Patch0-md5:	c8ff415734155965ae7a2a85ef9c9e03
@@ -198,7 +198,7 @@ Patch101:	kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs4-standalone.git
 # cd aufs4-standalone
-# git checkout -b aufs4.5 origin/aufs4.5
+# git checkout -b aufs4.7 origin/aufs4.7
 # 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
@@ -669,6 +669,7 @@ cd linux-%{basever}
 # end of netfilter
 
 # zph
+# FIXME or DROPME
 %patch49 -p1
 
 %if %{with imq}
@@ -706,6 +707,7 @@ cd linux-%{basever}
 %endif
 
 # apparmor
+# FIME
 %patch5000 -p1
 
 %patch250 -p1
diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch
index 4b72052..64ad03c 100644
--- a/kernel-aufs4.patch
+++ b/kernel-aufs4.patch
@@ -1,10 +1,10 @@
-aufs4.5 kbuild patch
+aufs4.x-rcN kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
-index 9adee0d..5e9cfb2 100644
+index b8fcb41..78adefb 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -232,6 +232,7 @@ source "fs/pstore/Kconfig"
+@@ -236,6 +236,7 @@ source "fs/pstore/Kconfig"
  source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
  source "fs/exofs/Kconfig"
@@ -13,16 +13,16 @@ index 9adee0d..5e9cfb2 100644
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
-index 79f5225..a7c7f16 100644
+index 85b6e13..e7bb164 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -126,3 +126,4 @@ obj-y				+= exofs/ # Multiple modules
+@@ -128,3 +128,4 @@ obj-y				+= exofs/ # Multiple modules
  obj-$(CONFIG_CEPH_FS)		+= ceph/
  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 ebd10e6..32152e7 100644
+index 8bdae34..65dbd5f 100644
 --- a/include/uapi/linux/Kbuild
 +++ b/include/uapi/linux/Kbuild
 @@ -59,6 +59,7 @@ header-y += atmsvc.h
@@ -33,13 +33,13 @@ index ebd10e6..32152e7 100644
  header-y += auto_fs4.h
  header-y += auto_fs.h
  header-y += auxvec.h
-aufs4.5 base patch
+aufs4.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 6ee06ea..3147250 100644
+index 952fd2a..6a8f0f8 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2082,6 +2082,19 @@ F:	include/linux/audit.h
+@@ -2210,6 +2210,19 @@ F:	include/linux/audit.h
  F:	include/uapi/linux/audit.h
  F:	kernel/audit*
  
@@ -60,10 +60,10 @@ index 6ee06ea..3147250 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 423f4ca..0b816b2 100644
+index 1fa8cc2..7339e65 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -706,6 +706,24 @@ static inline int is_loop_device(struct file *file)
+@@ -712,6 +712,24 @@ static inline int is_loop_device(struct file *file)
  	return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
  }
  
@@ -89,10 +89,10 @@ index 423f4ca..0b816b2 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 2398f9f9..318c329 100644
+index d6847d7..c3c0b6d 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1156,7 +1156,7 @@ enum d_walk_ret {
+@@ -1202,7 +1202,7 @@ enum d_walk_ret {
   *
   * The @enter() and @finish() callbacks are called with d_lock held.
   */
@@ -123,11 +123,24 @@ index 350a2c8..6f42279 100644
  	if (error)
  		return error;
  
+diff --git a/fs/inode.c b/fs/inode.c
+index 4ccbc21..aa6d071 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -1591,7 +1591,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.
+  */
+-static int update_time(struct inode *inode, struct timespec *time, int flags)
++int update_time(struct inode *inode, struct timespec *time, int flags)
+ {
+ 	int (*update_time)(struct inode *, struct timespec *, int);
+ 
 diff --git a/fs/read_write.c b/fs/read_write.c
-index dadf24e..c8b5b7a 100644
+index 933b53a..2d13282 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -534,6 +534,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
+@@ -515,6 +515,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
  }
  EXPORT_SYMBOL(__vfs_write);
  
@@ -157,10 +170,10 @@ index dadf24e..c8b5b7a 100644
  {
  	mm_segment_t old_fs;
 diff --git a/fs/splice.c b/fs/splice.c
-index 82bc0d6..93aee51 100644
+index dd9bf7e..9326c2a 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1108,8 +1108,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1111,8 +1111,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -171,7 +184,7 @@ index 82bc0d6..93aee51 100644
  {
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
  				loff_t *, size_t, unsigned int);
-@@ -1125,9 +1125,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1128,9 +1128,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.
   */
@@ -185,7 +198,7 @@ index 82bc0d6..93aee51 100644
  	ssize_t (*splice_read)(struct file *, loff_t *,
  			       struct pipe_inode_info *, size_t, unsigned int);
 diff --git a/include/linux/file.h b/include/linux/file.h
-index f87d308..9a290b3 100644
+index 7444f5f..bdac0be 100644
 --- a/include/linux/file.h
 +++ b/include/linux/file.h
 @@ -19,6 +19,7 @@ struct dentry;
@@ -197,10 +210,10 @@ index f87d308..9a290b3 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 ae68100..99fc2bd 100644
+index dd28814..b689a48 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1260,6 +1260,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1306,6 +1306,7 @@ extern void fasync_free(struct fasync_struct *);
  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  
@@ -208,7 +221,7 @@ index ae68100..99fc2bd 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);
-@@ -1646,6 +1647,7 @@ struct file_operations {
+@@ -1690,6 +1691,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);
@@ -216,7 +229,7 @@ index ae68100..99fc2bd 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);
-@@ -1704,6 +1706,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);
  
@@ -229,6 +242,14 @@ index ae68100..99fc2bd 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 *);
+@@ -2105,6 +2113,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);
++extern int update_time(struct inode *, struct timespec *, int);
+ 
+ /* /sys/fs */
+ extern struct kobject *fs_kobj;
 diff --git a/include/linux/splice.h b/include/linux/splice.h
 index da2751d..2e0fca6 100644
 --- a/include/linux/splice.h
@@ -244,13 +265,13 @@ index da2751d..2e0fca6 100644
 +			 struct pipe_inode_info *pipe, size_t len,
 +			 unsigned int flags);
  #endif
-aufs4.5 mmap patch
+aufs4.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 4f764c2..229de5e 100644
+index a11eb71..8f10865 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -1933,7 +1933,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -1939,7 +1939,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) {
@@ -276,7 +297,7 @@ index f8595e8..cb8eda0 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index fa95ab2..d440354 100644
+index 4648c7f..061cb85 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -298,7 +298,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
@@ -291,7 +312,7 @@ index fa95ab2..d440354 100644
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1576,7 +1579,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1624,7 +1627,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;
@@ -317,10 +338,10 @@ index faacb0c..17b43be 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 516e149..ddd5454 100644
+index ece042d..1e24513 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1217,6 +1217,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1239,6 +1239,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
  }
  #endif
  
@@ -350,10 +371,10 @@ index 516e149..ddd5454 100644
  extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
  		void *buf, int len, int write);
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 624b78b..1be91c5 100644
+index ca3e517..10bc491 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -269,6 +269,7 @@ struct vm_region {
+@@ -274,6 +274,7 @@ struct vm_region {
  	unsigned long	vm_top;		/* region allocated to here */
  	unsigned long	vm_pgoff;	/* the offset in vm_file corresponding to vm_start */
  	struct file	*vm_file;	/* the backing file or NULL */
@@ -361,19 +382,19 @@ index 624b78b..1be91c5 100644
  
  	int		vm_usage;	/* region usage count (access under nommu_region_sem) */
  	bool		vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -343,6 +344,7 @@ struct vm_area_struct {
+@@ -348,6 +349,7 @@ struct vm_area_struct {
  	unsigned long vm_pgoff;		/* Offset (within vm_file) in PAGE_SIZE
- 					   units, *not* PAGE_CACHE_SIZE */
+ 					   units */
  	struct file * vm_file;		/* File we map to (can be NULL). */
 +	struct file *vm_prfile;		/* shadow of vm_file */
  	void * vm_private_data;		/* was vm_pte (shared mem) */
  
  #ifndef CONFIG_MMU
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 2e391c7..6c4215c 100644
+index 4a7ec0c..8c8f7ac 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -464,7 +464,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -479,7 +479,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
  			struct inode *inode = file_inode(file);
  			struct address_space *mapping = file->f_mapping;
  
@@ -383,10 +404,10 @@ index 2e391c7..6c4215c 100644
  				atomic_dec(&inode->i_writecount);
  			i_mmap_lock_write(mapping);
 diff --git a/mm/Makefile b/mm/Makefile
-index 2ed4319..e3a53f5 100644
+index 78c6f7d..aea4230 100644
 --- a/mm/Makefile
 +++ b/mm/Makefile
-@@ -21,7 +21,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o \
+@@ -37,7 +37,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o \
  			   mm_init.o mmu_context.o percpu.o slab_common.o \
  			   compaction.o vmacache.o \
  			   interval_tree.o list_lru.o workingset.o \
@@ -396,10 +417,10 @@ index 2ed4319..e3a53f5 100644
  obj-y += init-mm.o
  
 diff --git a/mm/filemap.c b/mm/filemap.c
-index da7a35d..f800f87 100644
+index 20f3b1f..ee827ce 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -2229,7 +2229,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+@@ -2208,7 +2208,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
  	int ret = VM_FAULT_LOCKED;
  
  	sb_start_pagefault(inode->i_sb);
@@ -409,10 +430,10 @@ index da7a35d..f800f87 100644
  	if (page->mapping != inode->i_mapping) {
  		unlock_page(page);
 diff --git a/mm/memory.c b/mm/memory.c
-index 8132787..3f7de66 100644
+index cd1f29e..f0c204c 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -2042,7 +2042,7 @@ static inline int wp_page_reuse(struct mm_struct *mm,
+@@ -2100,7 +2100,7 @@ static inline int wp_page_reuse(struct mm_struct *mm,
  		}
  
  		if (!page_mkwrite)
@@ -422,10 +443,10 @@ index 8132787..3f7de66 100644
  
  	return VM_FAULT_WRITE;
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 76d1ec2..fdd163e 100644
+index de2c176..b7f391c 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
-@@ -290,7 +290,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -162,7 +162,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
@@ -434,7 +455,7 @@ index 76d1ec2..fdd163e 100644
  	mpol_put(vma_policy(vma));
  	kmem_cache_free(vm_area_cachep, vma);
  	return next;
-@@ -909,7 +909,7 @@ again:			remove_next = 1 + (end > next->vm_end);
+@@ -782,7 +782,7 @@ again:			remove_next = 1 + (end > next->vm_end);
  	if (remove_next) {
  		if (file) {
  			uprobe_munmap(next, next->vm_start, next->vm_end);
@@ -443,7 +464,7 @@ index 76d1ec2..fdd163e 100644
  		}
  		if (next->anon_vma)
  			anon_vma_merge(vma, next);
-@@ -1683,8 +1683,8 @@ out:
+@@ -1563,8 +1563,8 @@ out:
  	return addr;
  
  unmap_and_free_vma:
@@ -453,7 +474,7 @@ index 76d1ec2..fdd163e 100644
  
  	/* Undo any partial mapping done by a device driver. */
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2479,7 +2479,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2358,7 +2358,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  		goto out_free_mpol;
  
  	if (new->vm_file)
@@ -462,7 +483,7 @@ index 76d1ec2..fdd163e 100644
  
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
-@@ -2498,7 +2498,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2377,7 +2377,7 @@ static 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)
@@ -471,28 +492,45 @@ index 76d1ec2..fdd163e 100644
  	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
-@@ -2640,7 +2640,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2528,7 +2528,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;
 -	struct file *file;
++	struct file *file, *prfile;
  
- 	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. "
- 			"See Documentation/vm/remap_file_pages.txt.\n",
-@@ -2708,10 +2707,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+ 	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
+ 		     current->comm, current->pid);
+@@ -2597,10 +2597,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  		}
  	}
  
 -	file = get_file(vma->vm_file);
 +	vma_get_file(vma);
++	file = vma->vm_file;
++	prfile = vma->vm_prfile;
  	ret = do_mmap_pgoff(vma->vm_file, start, size,
  			prot, flags, pgoff, &populate);
--	fput(file);
-+	vma_fput(vma);
++	if (!IS_ERR_VALUE(ret) && file && prfile) {
++		struct vm_area_struct *new_vma;
++
++		new_vma = find_vma(mm, ret);
++		if (!new_vma->vm_prfile)
++			new_vma->vm_prfile = prfile;
++		if (new_vma != vma)
++			get_file(prfile);
++	}
++	/*
++	 * two fput()s instead of vma_fput(vma),
++	 * coz vma may not be available anymore.
++	 */
+ 	fput(file);
++	if (prfile)
++		fput(prfile);
  out:
  	up_write(&mm->mmap_sem);
  	if (populate)
-@@ -2982,7 +2981,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2873,7 +2890,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)
@@ -502,10 +540,10 @@ index 76d1ec2..fdd163e 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 fbf6f0f1..1a4a06d 100644
+index c2e588802..c39edc4 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -671,7 +671,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -644,7 +644,7 @@ static void __put_nommu_region(struct vm_region *region)
  		up_write(&nommu_region_sem);
  
  		if (region->vm_file)
@@ -514,7 +552,7 @@ index fbf6f0f1..1a4a06d 100644
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -829,7 +829,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -802,7 +802,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)
@@ -523,7 +561,7 @@ index fbf6f0f1..1a4a06d 100644
  	put_nommu_region(vma->vm_region);
  	kmem_cache_free(vm_area_cachep, vma);
  }
-@@ -1355,7 +1355,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1328,7 +1328,7 @@ unsigned long do_mmap(struct file *file,
  					goto error_just_free;
  				}
  			}
@@ -532,7 +570,7 @@ index fbf6f0f1..1a4a06d 100644
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1430,10 +1430,10 @@ error_just_free:
+@@ -1403,10 +1403,10 @@ error_just_free:
  	up_write(&nommu_region_sem);
  error:
  	if (region->vm_file)
@@ -637,13 +675,13 @@ index 0000000..b323b8a
 +		fput(pr);
 +}
 +#endif /* !CONFIG_MMU */
-aufs4.5 standalone patch
+aufs4.x-rcN standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 318c329..72d3cc8 100644
+index c3c0b6d..c99d2d2 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1261,6 +1261,7 @@ rename_retry:
+@@ -1310,6 +1310,7 @@ rename_retry:
  	seq = 1;
  	goto again;
  }
@@ -652,10 +690,10 @@ index 318c329..72d3cc8 100644
  /*
   * Search for at least 1 mount point in the dentry's subdirs.
 diff --git a/fs/exec.c b/fs/exec.c
-index dcd4ac7..09a7818 100644
+index 887c1c9..40e8767 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
-@@ -103,6 +103,7 @@ bool path_noexec(const struct path *path)
+@@ -104,6 +104,7 @@ bool path_noexec(const struct path *path)
  	return (path->mnt->mnt_flags & MNT_NOEXEC) ||
  	       (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
  }
@@ -711,8 +749,20 @@ index ad17e05..ae9f267 100644
  
  void __init files_init(void)
  { 
+diff --git a/fs/inode.c b/fs/inode.c
+index aa6d071..f336032 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -1600,6 +1600,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
+ 
+ 	return update_time(inode, time, flags);
+ }
++EXPORT_SYMBOL_GPL(update_time);
+ 
+ /**
+  *	touch_atime	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 4fb1691..97654d2 100644
+index 783004a..44abb2d 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -732,7 +782,7 @@ index 4fb1691..97654d2 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 d16b62c..53e45b6 100644
+index 3e2dd85..b17cb4b 100644
 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
 @@ -22,6 +22,7 @@
@@ -743,7 +793,7 @@ index d16b62c..53e45b6 100644
  
  #include <linux/fsnotify_backend.h>
  #include "fsnotify.h"
-@@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
+@@ -81,6 +82,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
  {
  	atomic_inc(&group->refcnt);
  }
@@ -751,7 +801,7 @@ index d16b62c..53e45b6 100644
  
  /*
   * Drop a reference to a group.  Free it if it's through.
-@@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+@@ -90,6 +92,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
  	if (atomic_dec_and_test(&group->refcnt))
  		fsnotify_final_destroy_group(group);
  }
@@ -759,7 +809,7 @@ index d16b62c..53e45b6 100644
  
  /*
   * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+@@ -118,6 +121,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
  
  	return group;
  }
@@ -768,7 +818,7 @@ index d16b62c..53e45b6 100644
  int fsnotify_fasync(int fd, struct file *file, int on)
  {
 diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 7115c5d..ac2bd69 100644
+index d3fea0b..5fc06ad 100644
 --- a/fs/notify/mark.c
 +++ b/fs/notify/mark.c
 @@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
@@ -779,7 +829,7 @@ index 7115c5d..ac2bd69 100644
  
  /* Calculate mask of events for a list of marks */
  u32 fsnotify_recalc_mask(struct hlist_head *head)
-@@ -213,6 +214,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
+@@ -230,6 +231,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
  	mutex_unlock(&group->mark_mutex);
  	fsnotify_free_mark(mark);
  }
@@ -787,7 +837,7 @@ index 7115c5d..ac2bd69 100644
  
  void fsnotify_destroy_marks(struct hlist_head *head, spinlock_t *lock)
  {
-@@ -398,6 +400,7 @@ err:
+@@ -415,6 +417,7 @@ err:
  
  	return ret;
  }
@@ -795,16 +845,16 @@ index 7115c5d..ac2bd69 100644
  
  int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
  		      struct inode *inode, struct vfsmount *mnt, int allow_dups)
-@@ -498,6 +501,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+@@ -533,6 +536,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
  	atomic_set(&mark->refcnt, 1);
  	mark->free_mark = free_mark;
  }
 +EXPORT_SYMBOL_GPL(fsnotify_init_mark);
  
- static void fsnotify_mark_destroy(struct work_struct *work)
- {
+ /*
+  * Destroy all marks in destroy_list, waits for SRCU period to finish before
 diff --git a/fs/open.c b/fs/open.c
-index 55bdc75..fd1df73 100644
+index 93ae3cd..d25b9bd 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,
@@ -813,7 +863,7 @@ index 55bdc75..fd1df73 100644
  }
 +EXPORT_SYMBOL_GPL(do_truncate);
  
- long vfs_truncate(struct path *path, loff_t length)
+ long vfs_truncate(const struct path *path, loff_t length)
  {
 @@ -678,6 +679,7 @@ int open_check_o_direct(struct file *f)
  	}
@@ -824,10 +874,10 @@ index 55bdc75..fd1df73 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 c8b5b7a..9461d12 100644
+index 2d13282..260c4a4 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -544,6 +544,7 @@ vfs_readf_t vfs_readf(struct file *file)
+@@ -525,6 +525,7 @@ vfs_readf_t vfs_readf(struct file *file)
  		return new_sync_read;
  	return ERR_PTR(-ENOSYS);
  }
@@ -835,7 +885,7 @@ index c8b5b7a..9461d12 100644
  
  vfs_writef_t vfs_writef(struct file *file)
  {
-@@ -555,6 +556,7 @@ vfs_writef_t vfs_writef(struct file *file)
+@@ -536,6 +537,7 @@ vfs_writef_t vfs_writef(struct file *file)
  		return new_sync_write;
  	return ERR_PTR(-ENOSYS);
  }
@@ -844,10 +894,10 @@ index c8b5b7a..9461d12 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 93aee51..52d2f5b 100644
+index 9326c2a..0606690 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1121,6 +1121,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1124,6 +1124,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -855,7 +905,7 @@ index 93aee51..52d2f5b 100644
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -1147,6 +1148,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1153,6 +1154,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -864,7 +914,7 @@ index 93aee51..52d2f5b 100644
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/fs/xattr.c b/fs/xattr.c
-index 4861322..c4bb039 100644
+index 4beafc4..e118715 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
 @@ -207,6 +207,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
@@ -885,7 +935,7 @@ index 53fa971..bce3211 100644
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/commoncap.c b/security/commoncap.c
-index 48071ed..50a1a40 100644
+index e7fadde..6423e53 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
 @@ -1058,12 +1058,14 @@ int cap_mmap_addr(unsigned long addr)
@@ -924,58 +974,58 @@ index 03c1652..f88c84b 100644
  int devcgroup_inode_mknod(int mode, dev_t dev)
  {
 diff --git a/security/security.c b/security/security.c
-index e8ffd92..51fa026 100644
+index 7095693..da7fe2c 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -433,6 +433,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+@@ -434,6 +434,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
  		return 0;
  	return call_int_hook(path_rmdir, 0, dir, dentry);
  }
 +EXPORT_SYMBOL_GPL(security_path_rmdir);
  
- int security_path_unlink(struct path *dir, struct dentry *dentry)
+ int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {
-@@ -449,6 +450,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+@@ -450,6 +451,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);
  }
 +EXPORT_SYMBOL_GPL(security_path_symlink);
  
- int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -457,6 +459,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+@@ -458,6 +460,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);
  }
 +EXPORT_SYMBOL_GPL(security_path_link);
  
- int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- 			 struct path *new_dir, struct dentry *new_dentry,
-@@ -484,6 +487,7 @@ int security_path_truncate(struct path *path)
+ int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
+ 			 const struct path *new_dir, struct dentry *new_dentry,
+@@ -485,6 +488,7 @@ int security_path_truncate(const struct path *path)
  		return 0;
  	return call_int_hook(path_truncate, 0, path);
  }
 +EXPORT_SYMBOL_GPL(security_path_truncate);
  
- int security_path_chmod(struct path *path, umode_t mode)
+ int security_path_chmod(const struct path *path, umode_t mode)
  {
-@@ -491,6 +495,7 @@ int security_path_chmod(struct path *path, umode_t mode)
+@@ -492,6 +496,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
  		return 0;
  	return call_int_hook(path_chmod, 0, path, mode);
  }
 +EXPORT_SYMBOL_GPL(security_path_chmod);
  
- int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
+ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {
-@@ -498,6 +503,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
+@@ -499,6 +504,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);
  }
 +EXPORT_SYMBOL_GPL(security_path_chown);
  
- int security_path_chroot(struct path *path)
+ int security_path_chroot(const struct path *path)
  {
-@@ -583,6 +589,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -584,6 +590,7 @@ int security_inode_readlink(struct dentry *dentry)
  		return 0;
  	return call_int_hook(inode_readlink, 0, dentry);
  }
@@ -983,7 +1033,7 @@ index e8ffd92..51fa026 100644
  
  int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
  			       bool rcu)
-@@ -598,6 +605,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -599,6 +606,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return call_int_hook(inode_permission, 0, inode, mask);
  }
@@ -991,7 +1041,7 @@ index e8ffd92..51fa026 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -736,6 +744,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -737,6 +745,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -999,7 +1049,7 @@ index e8ffd92..51fa026 100644
  
  int security_file_alloc(struct file *file)
  {
-@@ -795,6 +804,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
+@@ -796,6 +805,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }
@@ -1009,7 +1059,7 @@ index e8ffd92..51fa026 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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/ABI/testing/debugfs-aufs	2015-09-24 10:47:58.244719488 +0200
 @@ -0,0 +1,50 @@
 +What:		/debug/aufs/si_<id>/
 +Date:		March 2009
@@ -1063,7 +1113,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/ABI/testing/sysfs-aufs	2015-09-24 10:47:58.244719488 +0200
 @@ -0,0 +1,31 @@
 +What:		/sys/fs/aufs/si_<id>/
 +Date:		March 2009
@@ -1098,7 +1148,7 @@ 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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/01intro.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,170 @@
 +
 +# Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -1272,7 +1322,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/02struct.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,258 @@
 +
 +# Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -1534,7 +1584,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,85 @@
 +
 +# Copyright (C) 2015-2016 Junjiro R. Okajima
@@ -1623,7 +1673,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,113 @@
 +
 +# Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -1740,7 +1790,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/04branch.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,74 @@
 +
 +# Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -1818,7 +1868,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,64 @@
 +
 +# Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -1886,7 +1936,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,120 @@
 +
 +# Copyright (C) 2011-2016 Junjiro R. Okajima
@@ -2010,7 +2060,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,72 @@
 +
 +# Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -2086,7 +2136,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,96 @@
 +
 +# Copyright (C) 2014-2016 Junjiro R. Okajima
@@ -2186,7 +2236,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/07export.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,58 @@
 +
 +# Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -2248,7 +2298,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,52 @@
 +
 +# Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -2304,7 +2354,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2016-07-25 19:05:34.807826401 +0200
 @@ -0,0 +1,47 @@
 +
 +# Copyright (C) 2010-2016 Junjiro R. Okajima
@@ -2355,8 +2405,8 @@ 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	2016-04-24 18:32:51.390353525 +0200
-@@ -0,0 +1,391 @@
++++ linux/Documentation/filesystems/aufs/README	2016-07-25 19:05:34.807826401 +0200
+@@ -0,0 +1,392 @@
 +
 +Aufs4 -- advanced multi layered unification filesystem version 4.x
 +http://aufs.sf.net
@@ -2731,6 +2781,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta
 +Stefano Di Biase made a donation (2014/8).
 +Daniel Epellei made a donation (2015/1).
 +OmegaPhil made a donation (2016/1).
++Tomasz Szewczyk made a donation (2016/4).
 +
 +Thank you very much.
 +Donations are always, including future donations, very important and
@@ -2750,7 +2801,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/aufs.h	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -2813,8 +2864,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	2016-04-24 18:32:51.390353525 +0200
-@@ -0,0 +1,1407 @@
++++ linux/fs/aufs/branch.c	2016-07-25 19:05:34.811159821 +0200
+@@ -0,0 +1,1406 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -2855,7 +2906,8 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		fput(br->br_xino.xi_file);
 +	mutex_destroy(&br->br_xino.xi_nondir_mtx);
 +
-+	AuDebugOn(atomic_read(&br->br_count));
++	AuDebugOn(au_br_count(br));
++	au_br_count_fin(br);
 +
 +	wbr = br->br_wbr;
 +	if (wbr) {
@@ -2895,7 +2947,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +
 +	AuRwMustWriteLock(&sbinfo->si_rwsem);
 +
-+	bmax = sbinfo->si_bend + 1;
++	bmax = sbinfo->si_bbot + 1;
 +	br = sbinfo->si_branch;
 +	while (bmax--)
 +		au_br_do_free(*br++);
@@ -2906,10 +2958,10 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 + */
 +int au_br_index(struct super_block *sb, aufs_bindex_t br_id)
 +{
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +
-+	bend = au_sbend(sb);
-+	for (bindex = 0; bindex <= bend; bindex++)
++	bbot = au_sbbot(sb);
++	for (bindex = 0; bindex <= bbot; bindex++)
 +		if (au_sbr_id(sb, bindex) == br_id)
 +			return bindex;
 +	return -1;
@@ -2974,7 +3026,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		err = au_di_realloc(au_di(root), new_nbranch);
 +	if (!err) {
 +		inode = d_inode(root);
-+		err = au_ii_realloc(au_ii(inode), new_nbranch);
++		err = au_hinode_realloc(au_ii(inode), new_nbranch);
 +	}
 +	if (!err)
 +		return add_branch; /* success */
@@ -3016,13 +3068,13 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +static int test_add(struct super_block *sb, struct au_opt_add *add, int remount)
 +{
 +	int err;
-+	aufs_bindex_t bend, bindex;
++	aufs_bindex_t bbot, bindex;
 +	struct dentry *root, *h_dentry;
 +	struct inode *inode, *h_inode;
 +
 +	root = sb->s_root;
-+	bend = au_sbend(sb);
-+	if (unlikely(bend >= 0
++	bbot = au_sbbot(sb);
++	if (unlikely(bbot >= 0
 +		     && au_find_dbindex(root, add->path.dentry) >= 0)) {
 +		err = 1;
 +		if (!remount) {
@@ -3034,13 +3086,13 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +
 +	err = -ENOSPC; /* -E2BIG; */
 +	if (unlikely(AUFS_BRANCH_MAX <= add->bindex
-+		     || AUFS_BRANCH_MAX - 1 <= bend)) {
++		     || AUFS_BRANCH_MAX - 1 <= bbot)) {
 +		pr_err("number of branches exceeded %s\n", add->pathname);
 +		goto out;
 +	}
 +
 +	err = -EDOM;
-+	if (unlikely(add->bindex < 0 || bend + 1 < add->bindex)) {
++	if (unlikely(add->bindex < 0 || bbot + 1 < add->bindex)) {
 +		pr_err("bad index %d\n", add->bindex);
 +		goto out;
 +	}
@@ -3074,11 +3126,11 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	if (unlikely(err))
 +		goto out;
 +
-+	if (bend < 0)
++	if (bbot < 0)
 +		return 0; /* success */
 +
 +	err = -EINVAL;
-+	for (bindex = 0; bindex <= bend; bindex++)
++	for (bindex = 0; bindex <= bbot; bindex++)
 +		if (unlikely(test_overlap(sb, add->path.dentry,
 +					  au_h_dptr(root, bindex)))) {
 +			pr_err("%s is overlapped\n", add->pathname);
@@ -3129,7 +3181,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	bindex = au_br_index(sb, br->br_id);
 +	if (0 <= bindex) {
 +		hdir = au_hi(d_inode(sb->s_root), bindex);
-+		au_hn_imtx_lock_nested(hdir, AuLsc_I_PARENT);
++		au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT);
 +	} else {
 +		h_dentry = au_br_dentry(br);
 +		h_inode = d_inode(h_dentry);
@@ -3143,7 +3195,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		wbr_wh_write_unlock(wbr);
 +	}
 +	if (hdir)
-+		au_hn_imtx_unlock(hdir);
++		au_hn_inode_unlock(hdir);
 +	else
 +		inode_unlock(h_inode);
 +	vfsub_mnt_drop_write(au_br_mnt(br));
@@ -3200,7 +3252,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	br->br_perm = add->perm;
 +	br->br_path = add->path; /* set first, path_get() later */
 +	spin_lock_init(&br->br_dykey_lock);
-+	atomic_set(&br->br_count, 0);
++	au_br_count_init(br);
 +	atomic_set(&br->br_xino_running, 0);
 +	br->br_id = au_new_br_id(sb);
 +	AuDebugOn(br->br_id < 0);
@@ -3232,7 +3284,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +}
 +
 +static void au_br_do_add_brp(struct au_sbinfo *sbinfo, aufs_bindex_t bindex,
-+			     struct au_branch *br, aufs_bindex_t bend,
++			     struct au_branch *br, aufs_bindex_t bbot,
 +			     aufs_bindex_t amount)
 +{
 +	struct au_branch **brp;
@@ -3242,40 +3294,39 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	brp = sbinfo->si_branch + bindex;
 +	memmove(brp + 1, brp, sizeof(*brp) * amount);
 +	*brp = br;
-+	sbinfo->si_bend++;
-+	if (unlikely(bend < 0))
-+		sbinfo->si_bend = 0;
++	sbinfo->si_bbot++;
++	if (unlikely(bbot < 0))
++		sbinfo->si_bbot = 0;
 +}
 +
 +static void au_br_do_add_hdp(struct au_dinfo *dinfo, aufs_bindex_t bindex,
-+			     aufs_bindex_t bend, aufs_bindex_t amount)
++			     aufs_bindex_t bbot, aufs_bindex_t amount)
 +{
 +	struct au_hdentry *hdp;
 +
 +	AuRwMustWriteLock(&dinfo->di_rwsem);
 +
-+	hdp = dinfo->di_hdentry + bindex;
++	hdp = au_hdentry(dinfo, bindex);
 +	memmove(hdp + 1, hdp, sizeof(*hdp) * amount);
 +	au_h_dentry_init(hdp);
-+	dinfo->di_bend++;
-+	if (unlikely(bend < 0))
-+		dinfo->di_bstart = 0;
++	dinfo->di_bbot++;
++	if (unlikely(bbot < 0))
++		dinfo->di_btop = 0;
 +}
 +
 +static void au_br_do_add_hip(struct au_iinfo *iinfo, aufs_bindex_t bindex,
-+			     aufs_bindex_t bend, aufs_bindex_t amount)
++			     aufs_bindex_t bbot, aufs_bindex_t amount)
 +{
 +	struct au_hinode *hip;
 +
 +	AuRwMustWriteLock(&iinfo->ii_rwsem);
 +
-+	hip = iinfo->ii_hinode + bindex;
++	hip = au_hinode(iinfo, bindex);
 +	memmove(hip + 1, hip, sizeof(*hip) * amount);
-+	hip->hi_inode = NULL;
-+	au_hn_init(hip);
-+	iinfo->ii_bend++;
-+	if (unlikely(bend < 0))
-+		iinfo->ii_bstart = 0;
++	au_hinode_init(hip);
++	iinfo->ii_bbot++;
++	if (unlikely(bbot < 0))
++		iinfo->ii_btop = 0;
 +}
 +
 +static void au_br_do_add(struct super_block *sb, struct au_branch *br,
@@ -3283,17 +3334,17 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +{
 +	struct dentry *root, *h_dentry;
 +	struct inode *root_inode, *h_inode;
-+	aufs_bindex_t bend, amount;
++	aufs_bindex_t bbot, amount;
 +
 +	root = sb->s_root;
 +	root_inode = d_inode(root);
-+	bend = au_sbend(sb);
-+	amount = bend + 1 - bindex;
++	bbot = au_sbbot(sb);
++	amount = bbot + 1 - bindex;
 +	h_dentry = au_br_dentry(br);
 +	au_sbilist_lock();
-+	au_br_do_add_brp(au_sbi(sb), bindex, br, bend, amount);
-+	au_br_do_add_hdp(au_di(root), bindex, bend, amount);
-+	au_br_do_add_hip(au_ii(root_inode), bindex, bend, amount);
++	au_br_do_add_brp(au_sbi(sb), bindex, br, bbot, amount);
++	au_br_do_add_hdp(au_di(root), bindex, bbot, amount);
++	au_br_do_add_hip(au_ii(root_inode), bindex, bbot, amount);
 +	au_set_h_dptr(root, bindex, dget(h_dentry));
 +	h_inode = d_inode(h_dentry);
 +	au_set_h_iptr(root_inode, bindex, au_igrab(h_inode), /*flags*/0);
@@ -3303,7 +3354,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +int au_br_add(struct super_block *sb, struct au_opt_add *add, int remount)
 +{
 +	int err;
-+	aufs_bindex_t bend, add_bindex;
++	aufs_bindex_t bbot, add_bindex;
 +	struct dentry *root, *h_dentry;
 +	struct inode *root_inode;
 +	struct au_branch *add_branch;
@@ -3311,6 +3362,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	root = sb->s_root;
 +	root_inode = d_inode(root);
 +	IMustLock(root_inode);
++	IiMustWriteLock(root_inode);
 +	err = test_add(sb, add, remount);
 +	if (unlikely(err < 0))
 +		goto out;
@@ -3319,8 +3371,8 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		goto out; /* success */
 +	}
 +
-+	bend = au_sbend(sb);
-+	add_branch = au_br_alloc(sb, bend + 2, add->perm);
++	bbot = au_sbbot(sb);
++	add_branch = au_br_alloc(sb, bbot + 2, add->perm);
 +	err = PTR_ERR(add_branch);
 +	if (IS_ERR(add_branch))
 +		goto out;
@@ -3396,7 +3448,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +static struct file **au_farray_alloc(struct super_block *sb,
 +				     unsigned long long *max)
 +{
-+	*max = atomic_long_read(&au_sbi(sb)->si_nfiles);
++	*max = au_nfiles(sb);
 +	return au_array_alloc(max, au_farray_cb, sb, /*arg*/NULL);
 +}
 +
@@ -3422,16 +3474,16 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		pr_info(fmt, ##__VA_ARGS__); \
 +} while (0)
 +
-+static int au_test_ibusy(struct inode *inode, aufs_bindex_t bstart,
-+			 aufs_bindex_t bend)
++static int au_test_ibusy(struct inode *inode, aufs_bindex_t btop,
++			 aufs_bindex_t bbot)
 +{
-+	return (inode && !S_ISDIR(inode->i_mode)) || bstart == bend;
++	return (inode && !S_ISDIR(inode->i_mode)) || btop == bbot;
 +}
 +
-+static int au_test_dbusy(struct dentry *dentry, aufs_bindex_t bstart,
-+			 aufs_bindex_t bend)
++static int au_test_dbusy(struct dentry *dentry, aufs_bindex_t btop,
++			 aufs_bindex_t bbot)
 +{
-+	return au_test_ibusy(d_inode(dentry), bstart, bend);
++	return au_test_ibusy(d_inode(dentry), btop, bbot);
 +}
 +
 +/*
@@ -3441,7 +3493,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +			    unsigned int sigen, const unsigned int verbose)
 +{
 +	int err, i, j, ndentry;
-+	aufs_bindex_t bstart, bend;
++	aufs_bindex_t btop, bbot;
 +	struct au_dcsub_pages dpages;
 +	struct au_dpage *dpage;
 +	struct dentry *d;
@@ -3481,12 +3533,12 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +			}
 +
 +			/* AuDbgDentry(d); */
-+			bstart = au_dbstart(d);
-+			bend = au_dbend(d);
-+			if (bstart <= bindex
-+			    && bindex <= bend
++			btop = au_dbtop(d);
++			bbot = au_dbbot(d);
++			if (btop <= bindex
++			    && bindex <= bbot
 +			    && au_h_dptr(d, bindex)
-+			    && au_test_dbusy(d, bstart, bend)) {
++			    && au_test_dbusy(d, btop, bbot)) {
 +				err = -EBUSY;
 +				AuVerbose(verbose, "busy %pd\n", d);
 +				AuDbgDentry(d);
@@ -3507,7 +3559,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	int err;
 +	unsigned long long max, ull;
 +	struct inode *i, **array;
-+	aufs_bindex_t bstart, bend;
++	aufs_bindex_t btop, bbot;
 +
 +	array = au_iarray_alloc(sb, &max);
 +	err = PTR_ERR(array);
@@ -3538,12 +3590,12 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +			}
 +		}
 +
-+		bstart = au_ibstart(i);
-+		bend = au_ibend(i);
-+		if (bstart <= bindex
-+		    && bindex <= bend
++		btop = au_ibtop(i);
++		bbot = au_ibbot(i);
++		if (btop <= bindex
++		    && bindex <= bbot
 +		    && au_h_iptr(i, bindex)
-+		    && au_test_ibusy(i, bstart, bend)) {
++		    && au_test_ibusy(i, btop, bbot)) {
 +			err = -EBUSY;
 +			AuVerbose(verbose, "busy i%lu\n", i->i_ino);
 +			AuDbgInode(i);
@@ -3579,7 +3631,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +{
 +	int err;
 +	unsigned char matched, root;
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +	struct au_fidir *fidir;
 +	struct au_hfile *hfile;
 +
@@ -3595,8 +3647,8 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	matched = 0;
 +	fidir = au_fi(file)->fi_hdir;
 +	AuDebugOn(!fidir);
-+	bend = au_fbend_dir(file);
-+	for (bindex = au_fbstart(file); bindex <= bend; bindex++) {
++	bbot = au_fbbot_dir(file);
++	for (bindex = au_fbtop(file); bindex <= bbot; bindex++) {
 +		hfile = fidir->fd_hfile + bindex;
 +		if (!hfile->hf_file)
 +			continue;
@@ -3618,7 +3670,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +{
 +	int err, idx;
 +	unsigned long long ull, max;
-+	aufs_bindex_t bstart;
++	aufs_bindex_t btop;
 +	struct file *file, **array;
 +	struct dentry *root;
 +	struct au_hfile *hfile;
@@ -3639,7 +3691,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +
 +		/* AuDbg("%pD\n", file); */
 +		fi_read_lock(file);
-+		bstart = au_fbstart(file);
++		btop = au_fbtop(file);
 +		if (!d_is_dir(file->f_path.dentry)) {
 +			hfile = &au_fi(file)->fi_htop;
 +			if (hfile->hf_br->br_id == br_id)
@@ -3662,7 +3714,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +			  aufs_bindex_t br_id)
 +{
 +	unsigned long long ull;
-+	aufs_bindex_t bindex, bstart, bend, bfound;
++	aufs_bindex_t bindex, btop, bbot, bfound;
 +	struct file *file;
 +	struct au_fidir *fidir;
 +	struct au_hfile *hfile;
@@ -3678,9 +3730,9 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		fidir = au_fi(file)->fi_hdir;
 +		AuDebugOn(!fidir);
 +		fi_write_lock(file);
-+		bstart = au_fbstart(file);
-+		bend = au_fbend_dir(file);
-+		for (bindex = bstart; bindex <= bend; bindex++) {
++		btop = au_fbtop(file);
++		bbot = au_fbbot_dir(file);
++		for (bindex = btop; bindex <= bbot; bindex++) {
 +			hfile = fidir->fd_hfile + bindex;
 +			if (!hfile->hf_file)
 +				continue;
@@ -3692,10 +3744,10 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		}
 +		AuDebugOn(bfound < 0);
 +		au_set_h_fptr(file, bfound, NULL);
-+		if (bfound == bstart) {
-+			for (bstart++; bstart <= bend; bstart++)
-+				if (au_hf_dir(file, bstart)) {
-+					au_set_fbstart(file, bstart);
++		if (bfound == btop) {
++			for (btop++; btop <= bbot; btop++)
++				if (au_hf_dir(file, btop)) {
++					au_set_fbtop(file, btop);
 +					break;
 +				}
 +		}
@@ -3705,59 +3757,57 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +
 +static void au_br_do_del_brp(struct au_sbinfo *sbinfo,
 +			     const aufs_bindex_t bindex,
-+			     const aufs_bindex_t bend)
++			     const aufs_bindex_t bbot)
 +{
 +	struct au_branch **brp, **p;
 +
 +	AuRwMustWriteLock(&sbinfo->si_rwsem);
 +
 +	brp = sbinfo->si_branch + bindex;
-+	if (bindex < bend)
-+		memmove(brp, brp + 1, sizeof(*brp) * (bend - bindex));
-+	sbinfo->si_branch[0 + bend] = NULL;
-+	sbinfo->si_bend--;
++	if (bindex < bbot)
++		memmove(brp, brp + 1, sizeof(*brp) * (bbot - bindex));
++	sbinfo->si_branch[0 + bbot] = NULL;
++	sbinfo->si_bbot--;
 +
-+	p = krealloc(sbinfo->si_branch, sizeof(*p) * bend, AuGFP_SBILIST);
++	p = krealloc(sbinfo->si_branch, sizeof(*p) * bbot, AuGFP_SBILIST);
 +	if (p)
 +		sbinfo->si_branch = p;
 +	/* harmless error */
 +}
 +
 +static void au_br_do_del_hdp(struct au_dinfo *dinfo, const aufs_bindex_t bindex,
-+			     const aufs_bindex_t bend)
++			     const aufs_bindex_t bbot)
 +{
 +	struct au_hdentry *hdp, *p;
 +
 +	AuRwMustWriteLock(&dinfo->di_rwsem);
 +
-+	hdp = dinfo->di_hdentry;
-+	if (bindex < bend)
-+		memmove(hdp + bindex, hdp + bindex + 1,
-+			sizeof(*hdp) * (bend - bindex));
-+	hdp[0 + bend].hd_dentry = NULL;
-+	dinfo->di_bend--;
++	hdp = au_hdentry(dinfo, bindex);
++	if (bindex < bbot)
++		memmove(hdp, hdp + 1, sizeof(*hdp) * (bbot - bindex));
++	/* au_h_dentry_init(au_hdentry(dinfo, bbot); */
++	dinfo->di_bbot--;
 +
-+	p = krealloc(hdp, sizeof(*p) * bend, AuGFP_SBILIST);
++	p = krealloc(dinfo->di_hdentry, sizeof(*p) * bbot, AuGFP_SBILIST);
 +	if (p)
 +		dinfo->di_hdentry = p;
 +	/* harmless error */
 +}
 +
 +static void au_br_do_del_hip(struct au_iinfo *iinfo, const aufs_bindex_t bindex,
-+			     const aufs_bindex_t bend)
++			     const aufs_bindex_t bbot)
 +{
 +	struct au_hinode *hip, *p;
 +
 +	AuRwMustWriteLock(&iinfo->ii_rwsem);
 +
-+	hip = iinfo->ii_hinode + bindex;
-+	if (bindex < bend)
-+		memmove(hip, hip + 1, sizeof(*hip) * (bend - bindex));
-+	iinfo->ii_hinode[0 + bend].hi_inode = NULL;
-+	au_hn_init(iinfo->ii_hinode + bend);
-+	iinfo->ii_bend--;
++	hip = au_hinode(iinfo, bindex);
++	if (bindex < bbot)
++		memmove(hip, hip + 1, sizeof(*hip) * (bbot - bindex));
++	/* au_hinode_init(au_hinode(iinfo, bbot)); */
++	iinfo->ii_bbot--;
 +
-+	p = krealloc(iinfo->ii_hinode, sizeof(*p) * bend, AuGFP_SBILIST);
++	p = krealloc(iinfo->ii_hinode, sizeof(*p) * bbot, AuGFP_SBILIST);
 +	if (p)
 +		iinfo->ii_hinode = p;
 +	/* harmless error */
@@ -3766,7 +3816,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +static void au_br_do_del(struct super_block *sb, aufs_bindex_t bindex,
 +			 struct au_branch *br)
 +{
-+	aufs_bindex_t bend;
++	aufs_bindex_t bbot;
 +	struct au_sbinfo *sbinfo;
 +	struct dentry *root, *h_root;
 +	struct inode *inode, *h_inode;
@@ -3777,7 +3827,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	root = sb->s_root;
 +	inode = d_inode(root);
 +	sbinfo = au_sbi(sb);
-+	bend = sbinfo->si_bend;
++	bbot = sbinfo->si_bbot;
 +
 +	h_root = au_h_dptr(root, bindex);
 +	hinode = au_hi(inode, bindex);
@@ -3785,9 +3835,9 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	au_hiput(hinode);
 +
 +	au_sbilist_lock();
-+	au_br_do_del_brp(sbinfo, bindex, bend);
-+	au_br_do_del_hdp(au_di(root), bindex, bend);
-+	au_br_do_del_hip(au_ii(inode), bindex, bend);
++	au_br_do_del_brp(sbinfo, bindex, bbot);
++	au_br_do_del_hdp(au_di(root), bindex, bbot);
++	au_br_do_del_hip(au_ii(inode), bindex, bbot);
 +	au_sbilist_unlock();
 +
 +	dput(h_root);
@@ -3806,7 +3856,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	int err, rerr, i;
 +	unsigned long long opened;
 +	unsigned int mnt_flags;
-+	aufs_bindex_t bindex, bend, br_id;
++	aufs_bindex_t bindex, bbot, br_id;
 +	unsigned char do_wh, verbose;
 +	struct au_branch *br;
 +	struct au_wbr *wbr;
@@ -3830,8 +3880,8 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	err = -EBUSY;
 +	mnt_flags = au_mntflags(sb);
 +	verbose = !!au_opt_test(mnt_flags, VERBOSE);
-+	bend = au_sbend(sb);
-+	if (unlikely(!bend)) {
++	bbot = au_sbbot(sb);
++	if (unlikely(!bbot)) {
 +		AuVerbose(verbose, "no more branches left\n");
 +		goto out;
 +	}
@@ -3839,7 +3889,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	AuDebugOn(!path_equal(&br->br_path, &del->h_path));
 +
 +	br_id = br->br_id;
-+	opened = atomic_read(&br->br_count);
++	opened = au_br_count(br);
 +	if (unlikely(opened)) {
 +		to_free = au_array_alloc(&opened, empty_cb, sb, NULL);
 +		err = PTR_ERR(to_free);
@@ -3919,7 +3969,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +static int au_ibusy(struct super_block *sb, struct aufs_ibusy __user *arg)
 +{
 +	int err;
-+	aufs_bindex_t bstart, bend;
++	aufs_bindex_t btop, bbot;
 +	struct aufs_ibusy ibusy;
 +	struct inode *inode, *h_inode;
 +
@@ -3938,7 +3988,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +
 +	err = -EINVAL;
 +	si_read_lock(sb, AuLock_FLUSH);
-+	if (unlikely(ibusy.bindex < 0 || ibusy.bindex > au_sbend(sb)))
++	if (unlikely(ibusy.bindex < 0 || ibusy.bindex > au_sbbot(sb)))
 +		goto out_unlock;
 +
 +	err = 0;
@@ -3946,15 +3996,15 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +	inode = ilookup(sb, ibusy.ino);
 +	if (!inode
 +	    || inode->i_ino == AUFS_ROOT_INO
-+	    || is_bad_inode(inode))
++	    || au_is_bad_inode(inode))
 +		goto out_unlock;
 +
 +	ii_read_lock_child(inode);
-+	bstart = au_ibstart(inode);
-+	bend = au_ibend(inode);
-+	if (bstart <= ibusy.bindex && ibusy.bindex <= bend) {
++	btop = au_ibtop(inode);
++	bbot = au_ibbot(inode);
++	if (btop <= ibusy.bindex && ibusy.bindex <= bbot) {
 +		h_inode = au_h_iptr(inode, ibusy.bindex);
-+		if (h_inode && au_test_ibusy(inode, bstart, bend))
++		if (h_inode && au_test_ibusy(inode, btop, bbot))
 +			ibusy.h_ino = h_inode->i_ino;
 +	}
 +	ii_read_unlock(inode);
@@ -4224,8 +4274,8 @@ 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	2016-04-24 18:32:51.390353525 +0200
-@@ -0,0 +1,279 @@
++++ linux/fs/aufs/branch.h	2016-07-25 19:05:34.811159821 +0200
+@@ -0,0 +1,309 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -4327,7 +4377,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
 +	struct path		br_path;
 +	spinlock_t		br_dykey_lock;
 +	struct au_dykey		*br_dykey[AuBrDynOp];
-+	atomic_t		br_count;
++	struct percpu_counter	br_count;
 +
 +	struct au_wbr		*br_wbr;
 +	struct au_br_fhsm	*br_fhsm;
@@ -4362,6 +4412,31 @@ diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
 +	return au_br_mnt(br)->mnt_sb;
 +}
 +
++static inline void au_br_get(struct au_branch *br)
++{
++	percpu_counter_inc(&br->br_count);
++}
++
++static inline void au_br_put(struct au_branch *br)
++{
++	percpu_counter_dec(&br->br_count);
++}
++
++static inline s64 au_br_count(struct au_branch *br)
++{
++	return percpu_counter_sum(&br->br_count);
++}
++
++static inline void au_br_count_init(struct au_branch *br)
++{
++	percpu_counter_init(&br->br_count, 0, GFP_NOFS);
++}
++
++static inline void au_br_count_fin(struct au_branch *br)
++{
++	percpu_counter_destroy(&br->br_count);
++}
++
 +static inline int au_br_rdonly(struct au_branch *br)
 +{
 +	return ((au_br_sb(br)->s_flags & MS_RDONLY)
@@ -4457,9 +4532,14 @@ diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
 +	return au_br_sb(au_sbr(sb, bindex));
 +}
 +
++static inline void au_sbr_get(struct super_block *sb, aufs_bindex_t bindex)
++{
++	au_br_get(au_sbr(sb, bindex));
++}
++
 +static inline void au_sbr_put(struct super_block *sb, aufs_bindex_t bindex)
 +{
-+	atomic_dec(&au_sbr(sb, bindex)->br_count);
++	au_br_put(au_sbr(sb, bindex));
 +}
 +
 +static inline int au_sbr_perm(struct super_block *sb, aufs_bindex_t bindex)
@@ -4507,7 +4587,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/conf.mk	2015-09-24 10:47:58.248052907 +0200
 @@ -0,0 +1,38 @@
 +
 +AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
@@ -4549,8 +4629,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	2016-04-24 18:32:51.390353525 +0200
-@@ -0,0 +1,1379 @@
++++ linux/fs/aufs/cpup.c	2016-07-25 19:05:34.811159821 +0200
+@@ -0,0 +1,1383 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -4593,7 +4673,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +{
 +	struct inode *h_inode;
 +
-+	h_inode = au_h_iptr(inode, au_ibstart(inode));
++	h_inode = au_h_iptr(inode, au_ibtop(inode));
 +	fsstack_copy_attr_times(inode, h_inode);
 +	fsstack_copy_inode_size(inode, h_inode);
 +}
@@ -4602,10 +4682,10 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +{
 +	struct inode *h_inode;
 +	struct super_block *sb;
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +
 +	sb = inode->i_sb;
-+	bindex = au_ibstart(inode);
++	bindex = au_ibtop(inode);
 +	h_inode = au_h_iptr(inode, bindex);
 +	if (!force
 +	    && !S_ISDIR(h_inode->i_mode)
@@ -4628,8 +4708,8 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +	 * it may includes whplink directory.
 +	 */
 +	if (S_ISDIR(h_inode->i_mode)) {
-+		bend = au_ibend(inode);
-+		for (bindex++; bindex <= bend; bindex++) {
++		bbot = au_ibbot(inode);
++		for (bindex++; bindex <= bbot; bindex++) {
 +			h_inode = au_h_iptr(inode, bindex);
 +			if (h_inode)
 +				au_add_nlink(inode, h_inode);
@@ -4641,7 +4721,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +{
 +	struct inode *h_inode;
 +
-+	h_inode = au_h_iptr(inode, au_ibstart(inode));
++	h_inode = au_h_iptr(inode, au_ibtop(inode));
 +	inode->i_mode = h_inode->i_mode;
 +	inode->i_uid = h_inode->i_uid;
 +	inode->i_gid = h_inode->i_gid;
@@ -4663,7 +4743,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +{
 +	struct inode *h_inode;
 +
-+	h_inode = au_h_iptr(inode, au_ibstart(inode));
++	h_inode = au_h_iptr(inode, au_ibtop(inode));
 +	au_cpup_attr_changeable(inode);
 +	if (inode->i_nlink > 0)
 +		au_cpup_attr_nlink(inode, force);
@@ -5120,7 +5200,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +	 * particularry setattr case
 +	 */
 +	dir = d_inode(dst_parent);
-+	if (au_ibstart(dir) == cpg->bdst)
++	if (au_ibtop(dir) == cpg->bdst)
 +		au_cpup_attr_nlink(dir, /*force*/1);
 +	inode = d_inode(cpg->dentry);
 +	au_cpup_attr_nlink(inode, /*force*/1);
@@ -5281,7 +5361,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +static int au_cpup_single(struct au_cp_generic *cpg, struct dentry *dst_parent)
 +{
 +	int err, rerr;
-+	aufs_bindex_t old_ibstart;
++	aufs_bindex_t old_ibtop;
 +	unsigned char isdir, plink;
 +	struct dentry *h_src, *h_dst, *h_parent;
 +	struct inode *dst_inode, *h_dir, *inode, *delegated, *src_inode;
@@ -5369,7 +5449,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +	}
 +
 +	isdir = S_ISDIR(inode->i_mode);
-+	old_ibstart = au_ibstart(inode);
++	old_ibtop = au_ibtop(inode);
 +	err = cpup_entry(cpg, dst_parent, &a->h_src_attr);
 +	if (unlikely(err))
 +		goto out_rev;
@@ -5386,7 +5466,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +		goto out_rev;
 +	}
 +
-+	if (cpg->bdst < old_ibstart) {
++	if (cpg->bdst < old_ibtop) {
 +		if (S_ISREG(inode->i_mode)) {
 +			err = au_dy_iaop(inode, cpg->bdst, dst_inode);
 +			if (unlikely(err)) {
@@ -5396,9 +5476,9 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +				goto out_rev;
 +			}
 +		}
-+		au_set_ibstart(inode, cpg->bdst);
++		au_set_ibtop(inode, cpg->bdst);
 +	} else
-+		au_set_ibend(inode, cpg->bdst);
++		au_set_ibbot(inode, cpg->bdst);
 +	au_set_h_iptr(inode, cpg->bdst, au_igrab(dst_inode),
 +		      au_hi_flags(inode, isdir));
 +
@@ -5554,7 +5634,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +
 +		/* revert */
 +		au_set_h_dptr(dentry, cpg->bdst, NULL);
-+		au_set_dbstart(dentry, cpg->bsrc);
++		au_set_dbtop(dentry, cpg->bsrc);
 +	}
 +
 +	return err;
@@ -5616,20 +5696,20 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +
 +int au_sio_cpup_simple(struct au_cp_generic *cpg)
 +{
-+	aufs_bindex_t bsrc, bend;
++	aufs_bindex_t bsrc, bbot;
 +	struct dentry *dentry, *h_dentry;
 +
 +	if (cpg->bsrc < 0) {
 +		dentry = cpg->dentry;
-+		bend = au_dbend(dentry);
-+		for (bsrc = cpg->bdst + 1; bsrc <= bend; bsrc++) {
++		bbot = au_dbbot(dentry);
++		for (bsrc = cpg->bdst + 1; bsrc <= bbot; bsrc++) {
 +			h_dentry = au_h_dptr(dentry, bsrc);
 +			if (h_dentry) {
 +				AuDebugOn(d_is_negative(h_dentry));
 +				break;
 +			}
 +		}
-+		AuDebugOn(bsrc > bend);
++		AuDebugOn(bsrc > bbot);
 +		cpg->bsrc = bsrc;
 +	}
 +	AuDebugOn(cpg->bsrc <= cpg->bdst);
@@ -5653,23 +5733,27 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +	int err;
 +	unsigned int flags_orig;
 +	aufs_bindex_t bsrc_orig;
-+	struct dentry *h_d_dst, *h_d_start;
 +	struct au_dinfo *dinfo;
-+	struct au_hdentry *hdp;
++	struct {
++		struct au_hdentry *hd;
++		struct dentry *h_dentry;
++	} hdst, hsrc;
 +
 +	dinfo = au_di(cpg->dentry);
 +	AuRwMustWriteLock(&dinfo->di_rwsem);
 +
 +	bsrc_orig = cpg->bsrc;
-+	cpg->bsrc = dinfo->di_bstart;
-+	hdp = dinfo->di_hdentry;
-+	h_d_dst = hdp[0 + cpg->bdst].hd_dentry;
-+	dinfo->di_bstart = cpg->bdst;
-+	hdp[0 + cpg->bdst].hd_dentry = wh_dentry;
-+	h_d_start = NULL;
++	cpg->bsrc = dinfo->di_btop;
++	hdst.hd = au_hdentry(dinfo, cpg->bdst);
++	hdst.h_dentry = hdst.hd->hd_dentry;
++	hdst.hd->hd_dentry = wh_dentry;
++	dinfo->di_btop = cpg->bdst;
++
++	hsrc.h_dentry = NULL;
 +	if (file) {
-+		h_d_start = hdp[0 + cpg->bsrc].hd_dentry;
-+		hdp[0 + cpg->bsrc].hd_dentry = au_hf_top(file)->f_path.dentry;
++		hsrc.hd = au_hdentry(dinfo, cpg->bsrc);
++		hsrc.h_dentry = hsrc.hd->hd_dentry;
++		hsrc.hd->hd_dentry = au_hf_top(file)->f_path.dentry;
 +	}
 +	flags_orig = cpg->flags;
 +	cpg->flags = !AuCpup_DTIME;
@@ -5678,10 +5762,10 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +	if (file) {
 +		if (!err)
 +			err = au_reopen_nondir(file);
-+		hdp[0 + cpg->bsrc].hd_dentry = h_d_start;
++		hsrc.hd->hd_dentry = hsrc.h_dentry;
 +	}
-+	hdp[0 + cpg->bdst].hd_dentry = h_d_dst;
-+	dinfo->di_bstart = cpg->bsrc;
++	hdst.hd->hd_dentry = hdst.h_dentry;
++	dinfo->di_btop = cpg->bsrc;
 +	cpg->bsrc = bsrc_orig;
 +
 +	return err;
@@ -5865,7 +5949,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +		h_dentry = au_h_dptr(d, bdst);
 +		if (!h_dentry || d_is_negative(h_dentry)) {
 +			if (h_dentry)
-+				au_update_dbstart(d);
++				au_update_dbtop(d);
 +
 +			au_pin_set_dentry(&pin, d);
 +			err = au_do_pin(&pin);
@@ -5932,7 +6016,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/cpup.h	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,94 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -6030,7 +6114,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/dbgaufs.c	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,432 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -6272,7 +6356,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 +	sbinfo = inode->i_private;
 +	sb = sbinfo->si_sb;
 +	si_noflush_read_lock(sb);
-+	if (l <= au_sbend(sb)) {
++	if (l <= au_sbbot(sb)) {
 +		xf = au_sbr(sb, (aufs_bindex_t)l)->br_xino.xi_file;
 +		err = dbgaufs_xi_open(xf, file, /*do_fcnt*/1);
 +	} else
@@ -6292,15 +6376,15 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 +
 +void dbgaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex)
 +{
-+	aufs_bindex_t bend;
++	aufs_bindex_t bbot;
 +	struct au_branch *br;
 +	struct au_xino_file *xi;
 +
 +	if (!au_sbi(sb)->si_dbgaufs)
 +		return;
 +
-+	bend = au_sbend(sb);
-+	for (; bindex <= bend; bindex++) {
++	bbot = au_sbbot(sb);
++	for (; bindex <= bbot; bindex++) {
 +		br = au_sbr(sb, bindex);
 +		xi = &br->br_xino;
 +		debugfs_remove(xi->xi_dbgaufs);
@@ -6314,7 +6398,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 +	struct dentry *parent;
 +	struct au_branch *br;
 +	struct au_xino_file *xi;
-+	aufs_bindex_t bend;
++	aufs_bindex_t bbot;
 +	char name[sizeof(DbgaufsXi_PREFIX) + 5]; /* "xi" bindex NULL */
 +
 +	sbinfo = au_sbi(sb);
@@ -6322,8 +6406,8 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 +	if (!parent)
 +		return;
 +
-+	bend = au_sbend(sb);
-+	for (; bindex <= bend; bindex++) {
++	bbot = au_sbbot(sb);
++	for (; bindex <= bbot; bindex++) {
 +		snprintf(name, sizeof(name), DbgaufsXi_PREFIX "%d", bindex);
 +		br = au_sbr(sb, bindex);
 +		xi = &br->br_xino;
@@ -6466,7 +6550,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/dbgaufs.h	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,48 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -6518,7 +6602,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/dcsub.c	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,224 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -6746,7 +6830,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/dcsub.h	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,136 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -6886,8 +6970,8 @@ 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	2016-04-24 18:32:51.390353525 +0200
-@@ -0,0 +1,438 @@
++++ linux/fs/aufs/debug.c	2016-07-25 19:05:34.811159821 +0200
+@@ -0,0 +1,441 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -7031,25 +7115,24 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +void au_dpri_inode(struct inode *inode)
 +{
 +	struct au_iinfo *iinfo;
++	struct au_hinode *hi;
 +	aufs_bindex_t bindex;
 +	int err, hn;
 +
 +	err = do_pri_inode(-1, inode, -1, NULL);
-+	if (err || !au_test_aufs(inode->i_sb))
++	if (err || !au_test_aufs(inode->i_sb) || au_is_bad_inode(inode))
 +		return;
 +
 +	iinfo = au_ii(inode);
-+	if (!iinfo)
-+		return;
-+	dpri("i-1: bstart %d, bend %d, gen %d\n",
-+	     iinfo->ii_bstart, iinfo->ii_bend, au_iigen(inode, NULL));
-+	if (iinfo->ii_bstart < 0)
++	dpri("i-1: btop %d, bbot %d, gen %d\n",
++	     iinfo->ii_btop, iinfo->ii_bbot, au_iigen(inode, NULL));
++	if (iinfo->ii_btop < 0)
 +		return;
 +	hn = 0;
-+	for (bindex = iinfo->ii_bstart; bindex <= iinfo->ii_bend; bindex++) {
-+		hn = !!au_hn(iinfo->ii_hinode + bindex);
-+		do_pri_inode(bindex, iinfo->ii_hinode[0 + bindex].hi_inode, hn,
-+			     iinfo->ii_hinode[0 + bindex].hi_whdentry);
++	for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot; bindex++) {
++		hi = au_hinode(iinfo, bindex);
++		hn = !!au_hn(hi);
++		do_pri_inode(bindex, hi->hi_inode, hn, hi->hi_whdentry);
 +	}
 +}
 +
@@ -7067,7 +7150,9 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +{
 +	struct dentry *wh = NULL;
 +	int hn;
++	struct inode *inode;
 +	struct au_iinfo *iinfo;
++	struct au_hinode *hi;
 +
 +	if (!dentry || IS_ERR(dentry)) {
 +		dpri("d%d: err %ld\n", bindex, PTR_ERR(dentry));
@@ -7081,16 +7166,19 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +	     au_dcount(dentry), dentry->d_flags,
 +	     d_unhashed(dentry) ? "un" : "");
 +	hn = -1;
-+	if (bindex >= 0
-+	    && d_is_positive(dentry)
-+	    && au_test_aufs(dentry->d_sb)) {
-+		iinfo = au_ii(d_inode(dentry));
-+		if (iinfo) {
-+			hn = !!au_hn(iinfo->ii_hinode + bindex);
-+			wh = iinfo->ii_hinode[0 + bindex].hi_whdentry;
-+		}
-+	}
-+	do_pri_inode(bindex, d_inode(dentry), hn, wh);
++	inode = NULL;
++	if (d_is_positive(dentry))
++		inode = d_inode(dentry);
++	if (inode
++	    && au_test_aufs(dentry->d_sb)
++	    && bindex >= 0
++	    && !au_is_bad_inode(inode)) {
++		iinfo = au_ii(inode);
++		hi = au_hinode(iinfo, bindex);
++		hn = !!au_hn(hi);
++		wh = hi->hi_whdentry;
++	}
++	do_pri_inode(bindex, inode, hn, wh);
 +	return 0;
 +}
 +
@@ -7099,7 +7187,6 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +	struct au_dinfo *dinfo;
 +	aufs_bindex_t bindex;
 +	int err;
-+	struct au_hdentry *hdp;
 +
 +	err = do_pri_dentry(-1, dentry);
 +	if (err || !au_test_aufs(dentry->d_sb))
@@ -7108,15 +7195,14 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +	dinfo = au_di(dentry);
 +	if (!dinfo)
 +		return;
-+	dpri("d-1: bstart %d, bend %d, bwh %d, bdiropq %d, gen %d, tmp %d\n",
-+	     dinfo->di_bstart, dinfo->di_bend,
++	dpri("d-1: btop %d, bbot %d, bwh %d, bdiropq %d, gen %d, tmp %d\n",
++	     dinfo->di_btop, dinfo->di_bbot,
 +	     dinfo->di_bwh, dinfo->di_bdiropq, au_digen(dentry),
 +	     dinfo->di_tmpfile);
-+	if (dinfo->di_bstart < 0)
++	if (dinfo->di_btop < 0)
 +		return;
-+	hdp = dinfo->di_hdentry;
-+	for (bindex = dinfo->di_bstart; bindex <= dinfo->di_bend; bindex++)
-+		do_pri_dentry(bindex, hdp[0 + bindex].hd_dentry);
++	for (bindex = dinfo->di_btop; bindex <= dinfo->di_bbot; bindex++)
++		do_pri_dentry(bindex, au_hdentry(dinfo, bindex)->hd_dentry);
 +}
 +
 +static int do_pri_file(aufs_bindex_t bindex, struct file *file)
@@ -7187,10 +7273,10 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +	if (!sb || IS_ERR(sb))
 +		goto out;
 +
-+	dpri("s%d: {perm 0x%x, id %d, cnt %d, wbr %p}, "
++	dpri("s%d: {perm 0x%x, id %d, cnt %lld, wbr %p}, "
 +	     "%s, dev 0x%02x%02x, flags 0x%lx, cnt %d, active %d, "
 +	     "xino %d\n",
-+	     bindex, br->br_perm, br->br_id, atomic_read(&br->br_count),
++	     bindex, br->br_perm, br->br_id, au_br_count(br),
 +	     br->br_wbr, au_sbtype(sb), MAJOR(sb->s_dev), MINOR(sb->s_dev),
 +	     sb->s_flags, sb->s_count,
 +	     atomic_read(&sb->s_active), !!br->br_xino.xi_file);
@@ -7221,9 +7307,9 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +
 +	a->mnt.mnt_sb = sb;
 +	a->fake.br_path.mnt = &a->mnt;
-+	atomic_set(&a->fake.br_count, 0);
-+	smp_mb(); /* atomic_set */
++	au_br_count_init(&a->fake);
 +	err = do_pri_br(-1, &a->fake);
++	au_br_count_fin(&a->fake);
 +	kfree(a);
 +	dpri("dev 0x%x\n", sb->s_dev);
 +	if (err || !au_test_aufs(sb))
@@ -7232,10 +7318,11 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +	sbinfo = au_sbi(sb);
 +	if (!sbinfo)
 +		return;
-+	dpri("nw %d, gen %u, kobj %d\n",
-+	     atomic_read(&sbinfo->si_nowait.nw_len), sbinfo->si_generation,
++	dpri("nw %lld, gen %u, kobj %d\n",
++	     percpu_counter_sum(&sbinfo->si_nowait.nw_len),
++	     sbinfo->si_generation,
 +	     atomic_read(&sbinfo->si_kobj.kref.refcount));
-+	for (bindex = 0; bindex <= sbinfo->si_bend; bindex++)
++	for (bindex = 0; bindex <= sbinfo->si_bbot; bindex++)
 +		do_pri_br(bindex, sbinfo->si_branch[0 + bindex]);
 +}
 +
@@ -7245,21 +7332,21 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +{
 +	struct inode *h_inode, *inode = d_inode(dentry);
 +	struct dentry *h_dentry;
-+	aufs_bindex_t bindex, bend, bi;
++	aufs_bindex_t bindex, bbot, bi;
 +
 +	if (!inode /* || au_di(dentry)->di_lsc == AuLsc_DI_TMP */)
 +		return;
 +
-+	bend = au_dbend(dentry);
-+	bi = au_ibend(inode);
-+	if (bi < bend)
-+		bend = bi;
-+	bindex = au_dbstart(dentry);
-+	bi = au_ibstart(inode);
++	bbot = au_dbbot(dentry);
++	bi = au_ibbot(inode);
++	if (bi < bbot)
++		bbot = bi;
++	bindex = au_dbtop(dentry);
++	bi = au_ibtop(inode);
 +	if (bi > bindex)
 +		bindex = bi;
 +
-+	for (; bindex <= bend; bindex++) {
++	for (; bindex <= bbot; bindex++) {
 +		h_dentry = au_h_dptr(dentry, bindex);
 +		if (!h_dentry)
 +			continue;
@@ -7328,7 +7415,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/debug.h	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,225 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -7557,8 +7644,8 @@ 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	2016-04-24 18:32:51.390353525 +0200
-@@ -0,0 +1,1136 @@
++++ linux/fs/aufs/dentry.c	2016-07-25 19:05:34.811159821 +0200
+@@ -0,0 +1,1128 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -7583,14 +7670,6 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +#include <linux/namei.h>
 +#include "aufs.h"
 +
-+#define AuLkup_ALLOW_NEG	1
-+#define AuLkup_IGNORE_PERM	(1 << 1)
-+#define au_ftest_lkup(flags, name)	((flags) & AuLkup_##name)
-+#define au_fset_lkup(flags, name) \
-+	do { (flags) |= AuLkup_##name; } while (0)
-+#define au_fclr_lkup(flags, name) \
-+	do { (flags) &= ~AuLkup_##name; } while (0)
-+
 +struct au_do_lookup_args {
 +	unsigned int		flags;
 +	mode_t			type;
@@ -7626,7 +7705,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +		goto out;
 +
 +	/* We found a whiteout */
-+	/* au_set_dbend(dentry, bindex); */
++	/* au_set_dbbot(dentry, bindex); */
 +	au_set_dbwh(dentry, bindex);
 +	if (!allow_neg)
 +		return NULL; /* success */
@@ -7651,10 +7730,10 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +		   || (args->type && args->type != (h_inode->i_mode & S_IFMT)))
 +		goto out_neg;
 +
-+	if (au_dbend(dentry) <= bindex)
-+		au_set_dbend(dentry, bindex);
-+	if (au_dbstart(dentry) < 0 || bindex < au_dbstart(dentry))
-+		au_set_dbstart(dentry, bindex);
++	if (au_dbbot(dentry) <= bindex)
++		au_set_dbbot(dentry, bindex);
++	if (au_dbtop(dentry) < 0 || bindex < au_dbtop(dentry))
++		au_set_dbtop(dentry, bindex);
 +	au_set_h_dptr(dentry, bindex, h_dentry);
 +
 +	if (!d_is_dir(h_dentry)
@@ -7693,15 +7772,15 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 + * otherwise an error.
 + * can be called at unlinking with @type is zero.
 + */
-+int au_lkup_dentry(struct dentry *dentry, aufs_bindex_t bstart, mode_t type)
++int au_lkup_dentry(struct dentry *dentry, aufs_bindex_t btop,
++		   unsigned int flags)
 +{
 +	int npositive, err;
 +	aufs_bindex_t bindex, btail, bdiropq;
 +	unsigned char isdir, dirperm1;
 +	struct qstr whname;
 +	struct au_do_lookup_args args = {
-+		.flags		= 0,
-+		.type		= type
++		.flags		= flags
 +	};
 +	const struct qstr *name = &dentry->d_name;
 +	struct dentry *parent;
@@ -7717,14 +7796,12 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +		goto out;
 +
 +	isdir = !!d_is_dir(dentry);
-+	if (!type)
-+		au_fset_lkup(args.flags, ALLOW_NEG);
 +	dirperm1 = !!au_opt_test(au_mntflags(sb), DIRPERM1);
 +
 +	npositive = 0;
 +	parent = dget_parent(dentry);
 +	btail = au_dbtaildir(parent);
-+	for (bindex = bstart; bindex <= btail; bindex++) {
++	for (bindex = btop; bindex <= btail; bindex++) {
 +		struct dentry *h_parent, *h_dentry;
 +		struct inode *h_inode, *h_dir;
 +
@@ -7732,9 +7809,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +		if (h_dentry) {
 +			if (d_is_positive(h_dentry))
 +				npositive++;
-+			if (type != S_IFDIR)
-+				break;
-+			continue;
++			break;
 +		}
 +		h_parent = au_h_dptr(parent, bindex);
 +		if (!h_parent || !d_is_dir(h_parent))
@@ -7775,11 +7850,11 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +
 +	if (npositive) {
 +		AuLabel(positive);
-+		au_update_dbstart(dentry);
++		au_update_dbtop(dentry);
 +	}
 +	err = npositive;
 +	if (unlikely(!au_opt_test(au_mntflags(sb), UDBA_NONE)
-+		     && au_dbstart(dentry) < 0)) {
++		     && au_dbtop(dentry) < 0)) {
 +		err = -EIO;
 +		AuIOErr("both of real entry and whiteout found, %pd, err %d\n",
 +			dentry, err);
@@ -7841,10 +7916,10 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +	}
 +
 +	err = 0;
-+	if (bindex < au_dbstart(dentry))
-+		au_set_dbstart(dentry, bindex);
-+	if (au_dbend(dentry) < bindex)
-+		au_set_dbend(dentry, bindex);
++	if (bindex < au_dbtop(dentry))
++		au_set_dbtop(dentry, bindex);
++	if (au_dbbot(dentry) < bindex)
++		au_set_dbbot(dentry, bindex);
 +	au_set_h_dptr(dentry, bindex, h_dentry);
 +
 +out:
@@ -7956,7 +8031,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +static int au_do_refresh_hdentry(struct dentry *dentry, struct dentry *parent)
 +{
 +	int err;
-+	aufs_bindex_t new_bindex, bindex, bend, bwh, bdiropq;
++	aufs_bindex_t new_bindex, bindex, bbot, bwh, bdiropq;
 +	struct au_hdentry tmp, *p, *q;
 +	struct au_dinfo *dinfo;
 +	struct super_block *sb;
@@ -7965,11 +8040,12 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +
 +	sb = dentry->d_sb;
 +	dinfo = au_di(dentry);
-+	bend = dinfo->di_bend;
++	bbot = dinfo->di_bbot;
 +	bwh = dinfo->di_bwh;
 +	bdiropq = dinfo->di_bdiropq;
-+	p = dinfo->di_hdentry + dinfo->di_bstart;
-+	for (bindex = dinfo->di_bstart; bindex <= bend; bindex++, p++) {
++	bindex = dinfo->di_btop;
++	p = au_hdentry(dinfo, bindex);
++	for (; bindex <= bbot; bindex++, p++) {
 +		if (!p->hd_dentry)
 +			continue;
 +
@@ -7988,7 +8064,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +		}
 +
 +		/* swap two lower dentries, and loop again */
-+		q = dinfo->di_hdentry + new_bindex;
++		q = au_hdentry(dinfo, new_bindex);
 +		tmp = *q;
 +		*q = *p;
 +		*p = tmp;
@@ -7999,31 +8075,33 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +	}
 +
 +	dinfo->di_bwh = -1;
-+	if (bwh >= 0 && bwh <= au_sbend(sb) && au_sbr_whable(sb, bwh))
++	if (bwh >= 0 && bwh <= au_sbbot(sb) && au_sbr_whable(sb, bwh))
 +		dinfo->di_bwh = bwh;
 +
 +	dinfo->di_bdiropq = -1;
 +	if (bdiropq >= 0
-+	    && bdiropq <= au_sbend(sb)
++	    && bdiropq <= au_sbbot(sb)
 +	    && au_sbr_whable(sb, bdiropq))
 +		dinfo->di_bdiropq = bdiropq;
 +
 +	err = -EIO;
-+	dinfo->di_bstart = -1;
-+	dinfo->di_bend = -1;
-+	bend = au_dbend(parent);
-+	p = dinfo->di_hdentry;
-+	for (bindex = 0; bindex <= bend; bindex++, p++)
++	dinfo->di_btop = -1;
++	dinfo->di_bbot = -1;
++	bbot = au_dbbot(parent);
++	bindex = 0;
++	p = au_hdentry(dinfo, bindex);
++	for (; bindex <= bbot; bindex++, p++)
 +		if (p->hd_dentry) {
-+			dinfo->di_bstart = bindex;
++			dinfo->di_btop = bindex;
 +			break;
 +		}
 +
-+	if (dinfo->di_bstart >= 0) {
-+		p = dinfo->di_hdentry + bend;
-+		for (bindex = bend; bindex >= 0; bindex--, p--)
++	if (dinfo->di_btop >= 0) {
++		bindex = bbot;
++		p = au_hdentry(dinfo, bindex);
++		for (; bindex >= 0; bindex--, p--)
 +			if (p->hd_dentry) {
-+				dinfo->di_bend = bindex;
++				dinfo->di_bbot = bindex;
 +				err = 0;
 +				break;
 +			}
@@ -8123,7 +8201,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +			       struct au_dinfo *tmp)
 +{
 +	int err;
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +	struct {
 +		struct dentry *dentry;
 +		struct inode *inode;
@@ -8136,16 +8214,16 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +	struct dentry *h_dentry;
 +
 +	err = 0;
-+	AuDebugOn(dinfo->di_bstart < 0);
++	AuDebugOn(dinfo->di_btop < 0);
 +	orig_h.mode = 0;
-+	orig_h.dentry = dinfo->di_hdentry[dinfo->di_bstart].hd_dentry;
++	orig_h.dentry = au_hdentry(dinfo, dinfo->di_btop)->hd_dentry;
 +	orig_h.inode = NULL;
 +	if (d_is_positive(orig_h.dentry)) {
 +		orig_h.inode = d_inode(orig_h.dentry);
 +		orig_h.mode = orig_h.inode->i_mode & S_IFMT;
 +	}
-+	if (tmp->di_bstart >= 0) {
-+		tmp_h.dentry = tmp->di_hdentry[tmp->di_bstart].hd_dentry;
++	if (tmp->di_btop >= 0) {
++		tmp_h.dentry = au_hdentry(tmp, tmp->di_btop)->hd_dentry;
 +		if (d_is_positive(tmp_h.dentry)) {
 +			tmp_h.inode = d_inode(tmp_h.dentry);
 +			tmp_h.mode = tmp_h.inode->i_mode & S_IFMT;
@@ -8162,20 +8240,20 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +			goto out;
 +		}
 +		AuDebugOn(inode);
-+		AuDebugOn(dinfo->di_bstart != dinfo->di_bend);
++		AuDebugOn(dinfo->di_btop != dinfo->di_bbot);
 +		AuDebugOn(dinfo->di_bdiropq != -1);
 +
 +		if (!tmp_h.inode) {
 +			AuDbg("negative --> negative\n");
 +			/* should have only one negative lower */
-+			if (tmp->di_bstart >= 0
-+			    && tmp->di_bstart < dinfo->di_bstart) {
-+				AuDebugOn(tmp->di_bstart != tmp->di_bend);
-+				AuDebugOn(dinfo->di_bstart != dinfo->di_bend);
-+				au_set_h_dptr(dentry, dinfo->di_bstart, NULL);
++			if (tmp->di_btop >= 0
++			    && tmp->di_btop < dinfo->di_btop) {
++				AuDebugOn(tmp->di_btop != tmp->di_bbot);
++				AuDebugOn(dinfo->di_btop != dinfo->di_bbot);
++				au_set_h_dptr(dentry, dinfo->di_btop, NULL);
 +				au_di_cp(dinfo, tmp);
-+				hd = tmp->di_hdentry + tmp->di_bstart;
-+				au_set_h_dptr(dentry, tmp->di_bstart,
++				hd = au_hdentry(tmp, tmp->di_btop);
++				au_set_h_dptr(dentry, tmp->di_btop,
 +					      dget(hd->hd_dentry));
 +			}
 +			au_dbg_verify_dinode(dentry);
@@ -8200,7 +8278,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +			AuDbg("positive --> negative\n");
 +			/* or bypassing aufs */
 +			au_hide(dentry);
-+			if (tmp->di_bwh >= 0 && tmp->di_bwh <= dinfo->di_bstart)
++			if (tmp->di_bwh >= 0 && tmp->di_bwh <= dinfo->di_btop)
 +				dinfo->di_bwh = tmp->di_bwh;
 +			if (inode)
 +				err = au_refresh_hinode_self(inode);
@@ -8208,7 +8286,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +		} else if (orig_h.mode == tmp_h.mode) {
 +			AuDbg("positive --> positive, same type\n");
 +			if (!S_ISDIR(orig_h.mode)
-+			    && dinfo->di_bstart > tmp->di_bstart) {
++			    && dinfo->di_btop > tmp->di_btop) {
 +				/*
 +				 * similar to the behaviour of removing and
 +				 * creating.
@@ -8219,19 +8297,19 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +				au_dbg_verify_dinode(dentry);
 +			} else {
 +				/* fill empty slots */
-+				if (dinfo->di_bstart > tmp->di_bstart)
-+					dinfo->di_bstart = tmp->di_bstart;
-+				if (dinfo->di_bend < tmp->di_bend)
-+					dinfo->di_bend = tmp->di_bend;
++				if (dinfo->di_btop > tmp->di_btop)
++					dinfo->di_btop = tmp->di_btop;
++				if (dinfo->di_bbot < tmp->di_bbot)
++					dinfo->di_bbot = tmp->di_bbot;
 +				dinfo->di_bwh = tmp->di_bwh;
 +				dinfo->di_bdiropq = tmp->di_bdiropq;
-+				hd = tmp->di_hdentry;
-+				bend = dinfo->di_bend;
-+				for (bindex = tmp->di_bstart; bindex <= bend;
-+				     bindex++) {
++				bbot = dinfo->di_bbot;
++				bindex = tmp->di_btop;
++				hd = au_hdentry(tmp, bindex);
++				for (; bindex <= bbot; bindex++, hd++) {
 +					if (au_h_dptr(dentry, bindex))
 +						continue;
-+					h_dentry = hd[bindex].hd_dentry;
++					h_dentry = hd->hd_dentry;
 +					if (!h_dentry)
 +						continue;
 +					AuDebugOn(d_is_negative(h_dentry));
@@ -8242,7 +8320,8 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +					au_set_h_dptr(dentry, bindex,
 +						      dget(h_dentry));
 +				}
-+				err = au_refresh_hinode(inode, dentry);
++				if (inode)
++					err = au_refresh_hinode(inode, dentry);
 +				au_dbg_verify_dinode(dentry);
 +			}
 +		} else {
@@ -8300,7 +8379,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +		goto out;
 +
 +	dinfo = au_di(dentry);
-+	err = au_di_realloc(dinfo, au_sbend(sb) + 1);
++	err = au_di_realloc(dinfo, au_sbbot(sb) + 1);
 +	if (unlikely(err))
 +		goto out;
 +	ebrange = au_dbrange_test(dentry);
@@ -8308,7 +8387,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +		ebrange = au_do_refresh_hdentry(dentry, parent);
 +
 +	if (d_unhashed(dentry) || ebrange /* || dinfo->di_tmpfile */) {
-+		AuDebugOn(au_dbstart(dentry) < 0 && au_dbend(dentry) >= 0);
++		AuDebugOn(au_dbtop(dentry) < 0 && au_dbbot(dentry) >= 0);
 +		if (d_really_is_positive(dentry)) {
 +			inode = d_inode(dentry);
 +			err = au_refresh_hinode_self(inode);
@@ -8331,7 +8410,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +	 * if current working dir is removed, it returns an error.
 +	 * but the dentry is legal.
 +	 */
-+	err = au_lkup_dentry(dentry, /*bstart*/0, /*type*/0);
++	err = au_lkup_dentry(dentry, /*btop*/0, AuLkup_ALLOW_NEG);
 +	AuDbgDentry(dentry);
 +	au_di_swap(tmp, dinfo);
 +	if (err == -ENOENT)
@@ -8394,7 +8473,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +{
 +	int err;
 +	umode_t mode, h_mode;
-+	aufs_bindex_t bindex, btail, bstart, ibs, ibe;
++	aufs_bindex_t bindex, btail, btop, ibs, ibe;
 +	unsigned char plus, unhashed, is_root, h_plus, h_nfs, tmpfile;
 +	struct inode *h_inode, *h_cached_inode;
 +	struct dentry *h_dentry;
@@ -8420,15 +8499,15 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +	if (do_udba && inode) {
 +		mode = (inode->i_mode & S_IFMT);
 +		plus = (inode->i_nlink > 0);
-+		ibs = au_ibstart(inode);
-+		ibe = au_ibend(inode);
++		ibs = au_ibtop(inode);
++		ibe = au_ibbot(inode);
 +	}
 +
-+	bstart = au_dbstart(dentry);
-+	btail = bstart;
++	btop = au_dbtop(dentry);
++	btail = btop;
 +	if (inode && S_ISDIR(inode->i_mode))
 +		btail = au_dbtaildir(dentry);
-+	for (bindex = bstart; bindex <= btail; bindex++) {
++	for (bindex = btop; bindex <= btail; bindex++) {
 +		h_dentry = au_h_dptr(dentry, bindex);
 +		if (!h_dentry)
 +			continue;
@@ -8610,7 +8689,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +	inode = NULL;
 +	if (d_really_is_positive(dentry))
 +		inode = d_inode(dentry);
-+	if (unlikely(inode && is_bad_inode(inode))) {
++	if (unlikely(inode && au_is_bad_inode(inode))) {
 +		err = -EINVAL;
 +		AuTraceErr(err);
 +		goto out_dgrade;
@@ -8643,11 +8722,11 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +
 +	do_udba = !au_opt_test(au_mntflags(sb), UDBA_NONE);
 +	if (do_udba && inode) {
-+		aufs_bindex_t bstart = au_ibstart(inode);
++		aufs_bindex_t btop = au_ibtop(inode);
 +		struct inode *h_inode;
 +
-+		if (bstart >= 0) {
-+			h_inode = au_h_iptr(inode, bstart);
++		if (btop >= 0) {
++			h_inode = au_h_iptr(inode, btop);
 +			if (h_inode && au_test_higen(inode, h_inode)) {
 +				AuTraceErr(err);
 +				goto out_inval;
@@ -8656,7 +8735,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +	}
 +
 +	err = h_d_revalidate(dentry, inode, flags, do_udba);
-+	if (unlikely(!err && do_udba && au_dbstart(dentry) < 0)) {
++	if (unlikely(!err && do_udba && au_dbtop(dentry) < 0)) {
 +		err = -EIO;
 +		AuDbg("both of real entry and whiteout found, %p, err %d\n",
 +		      dentry, err);
@@ -8697,8 +8776,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	2016-04-24 18:32:51.390353525 +0200
-@@ -0,0 +1,234 @@
++++ linux/fs/aufs/dentry.h	2016-07-25 19:05:34.811159821 +0200
+@@ -0,0 +1,252 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -8737,13 +8816,24 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 +	atomic_t		di_generation;
 +
 +	struct au_rwsem		di_rwsem;
-+	aufs_bindex_t		di_bstart, di_bend, di_bwh, di_bdiropq;
++	aufs_bindex_t		di_btop, di_bbot, di_bwh, di_bdiropq;
 +	unsigned char		di_tmpfile; /* to allow the different name */
 +	struct au_hdentry	*di_hdentry;
 +} ____cacheline_aligned_in_smp;
 +
 +/* ---------------------------------------------------------------------- */
 +
++/* flags for au_lkup_dentry() */
++#define AuLkup_ALLOW_NEG	1
++#define AuLkup_IGNORE_PERM	(1 << 1)
++#define au_ftest_lkup(flags, name)	((flags) & AuLkup_##name)
++#define au_fset_lkup(flags, name) \
++	do { (flags) |= AuLkup_##name; } while (0)
++#define au_fclr_lkup(flags, name) \
++	do { (flags) &= ~AuLkup_##name; } while (0)
++
++/* ---------------------------------------------------------------------- */
++
 +/* dentry.c */
 +extern const struct dentry_operations aufs_dop, aufs_dop_noreval;
 +struct au_branch;
@@ -8751,7 +8841,8 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 +int au_h_verify(struct dentry *h_dentry, unsigned int udba, struct inode *h_dir,
 +		struct dentry *h_parent, struct au_branch *br);
 +
-+int au_lkup_dentry(struct dentry *dentry, aufs_bindex_t bstart, mode_t type);
++int au_lkup_dentry(struct dentry *dentry, aufs_bindex_t btop,
++		   unsigned int flags);
 +int au_lkup_neg(struct dentry *dentry, aufs_bindex_t bindex, int wh);
 +int au_refresh_dentry(struct dentry *dentry, struct dentry *parent);
 +int au_reval_dpath(struct dentry *dentry, unsigned int sigen);
@@ -8787,8 +8878,8 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 +int au_dbrange_test(struct dentry *dentry);
 +void au_update_digen(struct dentry *dentry);
 +void au_update_dbrange(struct dentry *dentry, int do_put_zero);
-+void au_update_dbstart(struct dentry *dentry);
-+void au_update_dbend(struct dentry *dentry);
++void au_update_dbtop(struct dentry *dentry);
++void au_update_dbbot(struct dentry *dentry);
 +int au_find_dbindex(struct dentry *dentry, struct dentry *h_dentry);
 +
 +/* ---------------------------------------------------------------------- */
@@ -8859,22 +8950,28 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 +	hdentry->hd_dentry = NULL;
 +}
 +
++static inline struct au_hdentry *au_hdentry(struct au_dinfo *di,
++					    aufs_bindex_t bindex)
++{
++	return di->di_hdentry + bindex;
++}
++
 +static inline void au_hdput(struct au_hdentry *hd)
 +{
 +	if (hd)
 +		dput(hd->hd_dentry);
 +}
 +
-+static inline aufs_bindex_t au_dbstart(struct dentry *dentry)
++static inline aufs_bindex_t au_dbtop(struct dentry *dentry)
 +{
 +	DiMustAnyLock(dentry);
-+	return au_di(dentry)->di_bstart;
++	return au_di(dentry)->di_btop;
 +}
 +
-+static inline aufs_bindex_t au_dbend(struct dentry *dentry)
++static inline aufs_bindex_t au_dbbot(struct dentry *dentry)
 +{
 +	DiMustAnyLock(dentry);
-+	return au_di(dentry)->di_bend;
++	return au_di(dentry)->di_bbot;
 +}
 +
 +static inline aufs_bindex_t au_dbwh(struct dentry *dentry)
@@ -8890,22 +8987,22 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 +}
 +
 +/* todo: hard/soft set? */
-+static inline void au_set_dbstart(struct dentry *dentry, aufs_bindex_t bindex)
++static inline void au_set_dbtop(struct dentry *dentry, aufs_bindex_t bindex)
 +{
 +	DiMustWriteLock(dentry);
-+	au_di(dentry)->di_bstart = bindex;
++	au_di(dentry)->di_btop = bindex;
 +}
 +
-+static inline void au_set_dbend(struct dentry *dentry, aufs_bindex_t bindex)
++static inline void au_set_dbbot(struct dentry *dentry, aufs_bindex_t bindex)
 +{
 +	DiMustWriteLock(dentry);
-+	au_di(dentry)->di_bend = bindex;
++	au_di(dentry)->di_bbot = bindex;
 +}
 +
 +static inline void au_set_dbwh(struct dentry *dentry, aufs_bindex_t bindex)
 +{
 +	DiMustWriteLock(dentry);
-+	/* dbwh can be outside of bstart - bend range */
++	/* dbwh can be outside of btop - bbot range */
 +	au_di(dentry)->di_bwh = bindex;
 +}
 +
@@ -8935,8 +9032,8 @@ 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	2016-04-24 18:32:51.390353525 +0200
-@@ -0,0 +1,550 @@
++++ linux/fs/aufs/dinfo.c	2016-07-25 19:05:34.811159821 +0200
+@@ -0,0 +1,552 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -8963,10 +9060,8 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +void au_di_init_once(void *_dinfo)
 +{
 +	struct au_dinfo *dinfo = _dinfo;
-+	static struct lock_class_key aufs_di;
 +
 +	au_rw_init(&dinfo->di_rwsem);
-+	au_rw_class(&dinfo->di_rwsem, &aufs_di);
 +}
 +
 +struct au_dinfo *au_di_alloc(struct super_block *sb, unsigned int lsc)
@@ -8978,14 +9073,14 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +	if (unlikely(!dinfo))
 +		goto out;
 +
-+	nbr = au_sbend(sb) + 1;
++	nbr = au_sbbot(sb) + 1;
 +	if (nbr <= 0)
 +		nbr = 1;
 +	dinfo->di_hdentry = kcalloc(nbr, sizeof(*dinfo->di_hdentry), GFP_NOFS);
 +	if (dinfo->di_hdentry) {
 +		au_rw_write_lock_nested(&dinfo->di_rwsem, lsc);
-+		dinfo->di_bstart = -1;
-+		dinfo->di_bend = -1;
++		dinfo->di_btop = -1;
++		dinfo->di_bbot = -1;
 +		dinfo->di_bwh = -1;
 +		dinfo->di_bdiropq = -1;
 +		dinfo->di_tmpfile = 0;
@@ -9004,14 +9099,14 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +void au_di_free(struct au_dinfo *dinfo)
 +{
 +	struct au_hdentry *p;
-+	aufs_bindex_t bend, bindex;
++	aufs_bindex_t bbot, bindex;
 +
 +	/* dentry may not be revalidated */
-+	bindex = dinfo->di_bstart;
++	bindex = dinfo->di_btop;
 +	if (bindex >= 0) {
-+		bend = dinfo->di_bend;
-+		p = dinfo->di_hdentry + bindex;
-+		while (bindex++ <= bend)
++		bbot = dinfo->di_bbot;
++		p = au_hdentry(dinfo, bindex);
++		while (bindex++ <= bbot)
 +			au_hdput(p++);
 +	}
 +	kfree(dinfo->di_hdentry);
@@ -9034,8 +9129,8 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +	} while (0)
 +
 +	DiSwap(p, hdentry);
-+	DiSwap(bi, bstart);
-+	DiSwap(bi, bend);
++	DiSwap(bi, btop);
++	DiSwap(bi, bbot);
 +	DiSwap(bi, bwh);
 +	DiSwap(bi, bdiropq);
 +	/* smp_mb(); */
@@ -9048,8 +9143,8 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +	AuRwMustWriteLock(&dst->di_rwsem);
 +	AuRwMustWriteLock(&src->di_rwsem);
 +
-+	dst->di_bstart = src->di_bstart;
-+	dst->di_bend = src->di_bend;
++	dst->di_btop = src->di_btop;
++	dst->di_bbot = src->di_bbot;
 +	dst->di_bwh = src->di_bwh;
 +	dst->di_bdiropq = src->di_bdiropq;
 +	/* smp_mb(); */
@@ -9091,7 +9186,7 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +	AuRwMustWriteLock(&dinfo->di_rwsem);
 +
 +	err = -ENOMEM;
-+	sz = sizeof(*hdp) * (dinfo->di_bend + 1);
++	sz = sizeof(*hdp) * (dinfo->di_bbot + 1);
 +	if (!sz)
 +		sz = sizeof(*hdp);
 +	hdp = au_kzrealloc(dinfo->di_hdentry, sz, sizeof(*hdp) * nbr, GFP_NOFS);
@@ -9259,10 +9354,10 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +
 +	DiMustAnyLock(dentry);
 +
-+	if (au_dbstart(dentry) < 0 || bindex < au_dbstart(dentry))
++	if (au_dbtop(dentry) < 0 || bindex < au_dbtop(dentry))
 +		return NULL;
 +	AuDebugOn(bindex < 0);
-+	d = au_di(dentry)->di_hdentry[0 + bindex].hd_dentry;
++	d = au_hdentry(au_di(dentry), bindex)->hd_dentry;
 +	AuDebugOn(d && au_dcount(d) <= 0);
 +	return d;
 +}
@@ -9280,8 +9375,8 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +	AuDebugOn(d_really_is_negative(dentry));
 +
 +	h_dentry = NULL;
-+	if (au_dbstart(dentry) <= bindex
-+	    && bindex <= au_dbend(dentry))
++	if (au_dbtop(dentry) <= bindex
++	    && bindex <= au_dbbot(dentry))
 +		h_dentry = au_h_dptr(dentry, bindex);
 +	if (h_dentry && !au_d_linkable(h_dentry)) {
 +		dget(h_dentry);
@@ -9289,8 +9384,8 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +	}
 +
 +	inode = d_inode(dentry);
-+	AuDebugOn(bindex < au_ibstart(inode));
-+	AuDebugOn(au_ibend(inode) < bindex);
++	AuDebugOn(bindex < au_ibtop(inode));
++	AuDebugOn(au_ibbot(inode) < bindex);
 +	h_inode = au_h_iptr(inode, bindex);
 +	h_dentry = d_find_alias(h_inode);
 +	if (h_dentry) {
@@ -9320,30 +9415,30 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +
 +aufs_bindex_t au_dbtail(struct dentry *dentry)
 +{
-+	aufs_bindex_t bend, bwh;
++	aufs_bindex_t bbot, bwh;
 +
-+	bend = au_dbend(dentry);
-+	if (0 <= bend) {
++	bbot = au_dbbot(dentry);
++	if (0 <= bbot) {
 +		bwh = au_dbwh(dentry);
 +		if (!bwh)
 +			return bwh;
-+		if (0 < bwh && bwh < bend)
++		if (0 < bwh && bwh < bbot)
 +			return bwh - 1;
 +	}
-+	return bend;
++	return bbot;
 +}
 +
 +aufs_bindex_t au_dbtaildir(struct dentry *dentry)
 +{
-+	aufs_bindex_t bend, bopq;
++	aufs_bindex_t bbot, bopq;
 +
-+	bend = au_dbtail(dentry);
-+	if (0 <= bend) {
++	bbot = au_dbtail(dentry);
++	if (0 <= bbot) {
 +		bopq = au_dbdiropq(dentry);
-+		if (0 <= bopq && bopq < bend)
-+			bend = bopq;
++		if (0 <= bopq && bopq < bbot)
++			bbot = bopq;
 +	}
-+	return bend;
++	return bbot;
 +}
 +
 +/* ---------------------------------------------------------------------- */
@@ -9351,11 +9446,14 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +void au_set_h_dptr(struct dentry *dentry, aufs_bindex_t bindex,
 +		   struct dentry *h_dentry)
 +{
-+	struct au_hdentry *hd = au_di(dentry)->di_hdentry + bindex;
++	struct au_dinfo *dinfo;
++	struct au_hdentry *hd;
 +	struct au_branch *br;
 +
 +	DiMustWriteLock(dentry);
 +
++	dinfo = au_di(dentry);
++	hd = au_hdentry(dinfo, bindex);
 +	au_hdput(hd);
 +	hd->hd_dentry = h_dentry;
 +	if (h_dentry) {
@@ -9367,16 +9465,16 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +int au_dbrange_test(struct dentry *dentry)
 +{
 +	int err;
-+	aufs_bindex_t bstart, bend;
++	aufs_bindex_t btop, bbot;
 +
 +	err = 0;
-+	bstart = au_dbstart(dentry);
-+	bend = au_dbend(dentry);
-+	if (bstart >= 0)
-+		AuDebugOn(bend < 0 && bstart > bend);
++	btop = au_dbtop(dentry);
++	bbot = au_dbbot(dentry);
++	if (btop >= 0)
++		AuDebugOn(bbot < 0 && btop > bbot);
 +	else {
 +		err = -EIO;
-+		AuDebugOn(bend >= 0);
++		AuDebugOn(bbot >= 0);
 +	}
 +
 +	return err;
@@ -9405,72 +9503,73 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +	struct au_dinfo *dinfo;
 +	struct dentry *h_d;
 +	struct au_hdentry *hdp;
++	aufs_bindex_t bindex, bbot;
 +
 +	DiMustWriteLock(dentry);
 +
 +	dinfo = au_di(dentry);
-+	if (!dinfo || dinfo->di_bstart < 0)
++	if (!dinfo || dinfo->di_btop < 0)
 +		return;
 +
-+	hdp = dinfo->di_hdentry;
 +	if (do_put_zero) {
-+		aufs_bindex_t bindex, bend;
-+
-+		bend = dinfo->di_bend;
-+		for (bindex = dinfo->di_bstart; bindex <= bend; bindex++) {
-+			h_d = hdp[0 + bindex].hd_dentry;
++		bbot = dinfo->di_bbot;
++		bindex = dinfo->di_btop;
++		hdp = au_hdentry(dinfo, bindex);
++		for (; bindex <= bbot; bindex++, hdp++) {
++			h_d = hdp->hd_dentry;
 +			if (h_d && d_is_negative(h_d))
 +				au_set_h_dptr(dentry, bindex, NULL);
 +		}
 +	}
 +
-+	dinfo->di_bstart = -1;
-+	while (++dinfo->di_bstart <= dinfo->di_bend)
-+		if (hdp[0 + dinfo->di_bstart].hd_dentry)
++	dinfo->di_btop = 0;
++	hdp = au_hdentry(dinfo, dinfo->di_btop);
++	for (; dinfo->di_btop <= dinfo->di_bbot; dinfo->di_btop++, hdp++)
++		if (hdp->hd_dentry)
 +			break;
-+	if (dinfo->di_bstart > dinfo->di_bend) {
-+		dinfo->di_bstart = -1;
-+		dinfo->di_bend = -1;
++	if (dinfo->di_btop > dinfo->di_bbot) {
++		dinfo->di_btop = -1;
++		dinfo->di_bbot = -1;
 +		return;
 +	}
 +
-+	dinfo->di_bend++;
-+	while (0 <= --dinfo->di_bend)
-+		if (hdp[0 + dinfo->di_bend].hd_dentry)
++	hdp = au_hdentry(dinfo, dinfo->di_bbot);
++	for (; dinfo->di_bbot >= 0; dinfo->di_bbot--, hdp--)
++		if (hdp->hd_dentry)
 +			break;
-+	AuDebugOn(dinfo->di_bstart > dinfo->di_bend || dinfo->di_bend < 0);
++	AuDebugOn(dinfo->di_btop > dinfo->di_bbot || dinfo->di_bbot < 0);
 +}
 +
-+void au_update_dbstart(struct dentry *dentry)
++void au_update_dbtop(struct dentry *dentry)
 +{
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +	struct dentry *h_dentry;
 +
-+	bend = au_dbend(dentry);
-+	for (bindex = au_dbstart(dentry); bindex <= bend; bindex++) {
++	bbot = au_dbbot(dentry);
++	for (bindex = au_dbtop(dentry); bindex <= bbot; bindex++) {
 +		h_dentry = au_h_dptr(dentry, bindex);
 +		if (!h_dentry)
 +			continue;
 +		if (d_is_positive(h_dentry)) {
-+			au_set_dbstart(dentry, bindex);
++			au_set_dbtop(dentry, bindex);
 +			return;
 +		}
 +		au_set_h_dptr(dentry, bindex, NULL);
 +	}
 +}
 +
-+void au_update_dbend(struct dentry *dentry)
++void au_update_dbbot(struct dentry *dentry)
 +{
-+	aufs_bindex_t bindex, bstart;
++	aufs_bindex_t bindex, btop;
 +	struct dentry *h_dentry;
 +
-+	bstart = au_dbstart(dentry);
-+	for (bindex = au_dbend(dentry); bindex >= bstart; bindex--) {
++	btop = au_dbtop(dentry);
++	for (bindex = au_dbbot(dentry); bindex >= btop; bindex--) {
 +		h_dentry = au_h_dptr(dentry, bindex);
 +		if (!h_dentry)
 +			continue;
 +		if (d_is_positive(h_dentry)) {
-+			au_set_dbend(dentry, bindex);
++			au_set_dbbot(dentry, bindex);
 +			return;
 +		}
 +		au_set_h_dptr(dentry, bindex, NULL);
@@ -9479,17 +9578,17 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +
 +int au_find_dbindex(struct dentry *dentry, struct dentry *h_dentry)
 +{
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +
-+	bend = au_dbend(dentry);
-+	for (bindex = au_dbstart(dentry); bindex <= bend; bindex++)
++	bbot = au_dbbot(dentry);
++	for (bindex = au_dbtop(dentry); bindex <= bbot; bindex++)
 +		if (au_h_dptr(dentry, bindex) == h_dentry)
 +			return bindex;
 +	return -1;
 +}
 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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/dir.c	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,756 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -9548,7 +9647,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +loff_t au_dir_size(struct file *file, struct dentry *dentry)
 +{
 +	loff_t sz;
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +	struct file *h_file;
 +	struct dentry *h_dentry;
 +
@@ -9556,9 +9655,9 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	if (file) {
 +		AuDebugOn(!d_is_dir(file->f_path.dentry));
 +
-+		bend = au_fbend_dir(file);
-+		for (bindex = au_fbstart(file);
-+		     bindex <= bend && sz < KMALLOC_MAX_SIZE;
++		bbot = au_fbbot_dir(file);
++		for (bindex = au_fbtop(file);
++		     bindex <= bbot && sz < KMALLOC_MAX_SIZE;
 +		     bindex++) {
 +			h_file = au_hf_dir(file, bindex);
 +			if (h_file && file_inode(h_file))
@@ -9568,9 +9667,9 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +		AuDebugOn(!dentry);
 +		AuDebugOn(!d_is_dir(dentry));
 +
-+		bend = au_dbtaildir(dentry);
-+		for (bindex = au_dbstart(dentry);
-+		     bindex <= bend && sz < KMALLOC_MAX_SIZE;
++		bbot = au_dbtaildir(dentry);
++		for (bindex = au_dbtop(dentry);
++		     bindex <= bbot && sz < KMALLOC_MAX_SIZE;
 +		     bindex++) {
 +			h_dentry = au_h_dptr(dentry, bindex);
 +			if (h_dentry && d_is_positive(h_dentry))
@@ -9603,7 +9702,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	struct au_branch *br;
 +	struct au_hinode *hdir;
 +	int err;
-+	aufs_bindex_t bstart, bindex;
++	aufs_bindex_t btop, bindex;
 +
 +	sb = a->dentry->d_sb;
 +	if (d_really_is_negative(a->dentry))
@@ -9612,9 +9711,9 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	aufs_read_lock(a->dentry, AuLock_DW); /* noflush */
 +
 +	dir = d_inode(a->dentry);
-+	bstart = au_ibstart(dir);
++	btop = au_ibtop(dir);
 +	bindex = au_br_index(sb, a->brid);
-+	if (bindex < bstart)
++	if (bindex < btop)
 +		goto out_unlock;
 +
 +	br = au_sbr(sb, bindex);
@@ -9624,23 +9723,23 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	h_path.mnt = au_br_mnt(br);
 +	au_dtime_store(&dt, a->dentry, &h_path);
 +
-+	br = au_sbr(sb, bstart);
++	br = au_sbr(sb, btop);
 +	if (!au_br_writable(br->br_perm))
 +		goto out_unlock;
-+	h_path.dentry = au_h_dptr(a->dentry, bstart);
++	h_path.dentry = au_h_dptr(a->dentry, btop);
 +	h_path.mnt = au_br_mnt(br);
 +	err = vfsub_mnt_want_write(h_path.mnt);
 +	if (err)
 +		goto out_unlock;
-+	hdir = au_hi(dir, bstart);
-+	au_hn_imtx_lock_nested(hdir, AuLsc_I_PARENT);
-+	h_dir = au_h_iptr(dir, bstart);
++	hdir = au_hi(dir, btop);
++	au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT);
++	h_dir = au_h_iptr(dir, btop);
 +	if (h_dir->i_nlink
 +	    && timespec_compare(&h_dir->i_mtime, &dt.dt_mtime) < 0) {
 +		dt.dt_h_path = h_path;
 +		au_dtime_revert(&dt);
 +	}
-+	au_hn_imtx_unlock(hdir);
++	au_hn_inode_unlock(hdir);
 +	vfsub_mnt_drop_write(h_path.mnt);
 +	au_cpup_attr_timesizes(dir);
 +
@@ -9655,7 +9754,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +void au_dir_ts(struct inode *dir, aufs_bindex_t bindex)
 +{
 +	int perm, wkq_err;
-+	aufs_bindex_t bstart;
++	aufs_bindex_t btop;
 +	struct au_dir_ts_arg *arg;
 +	struct dentry *dentry;
 +	struct super_block *sb;
@@ -9665,13 +9764,13 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	dentry = d_find_any_alias(dir);
 +	AuDebugOn(!dentry);
 +	sb = dentry->d_sb;
-+	bstart = au_ibstart(dir);
-+	if (bstart == bindex) {
++	btop = au_ibtop(dir);
++	if (btop == bindex) {
 +		au_cpup_attr_timesizes(dir);
 +		goto out;
 +	}
 +
-+	perm = au_sbr_perm(sb, bstart);
++	perm = au_sbr_perm(sb, btop);
 +	if (!au_br_writable(perm))
 +		goto out;
 +
@@ -9698,24 +9797,24 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +{
 +	int err;
 +	unsigned int flags;
-+	aufs_bindex_t bindex, btail, bstart;
++	aufs_bindex_t bindex, btail, btop;
 +	struct dentry *dentry, *h_dentry;
 +	struct file *h_file;
 +
 +	/* open all lower dirs */
 +	dentry = file->f_path.dentry;
-+	bstart = au_dbstart(dentry);
-+	for (bindex = au_fbstart(file); bindex < bstart; bindex++)
++	btop = au_dbtop(dentry);
++	for (bindex = au_fbtop(file); bindex < btop; bindex++)
 +		au_set_h_fptr(file, bindex, NULL);
-+	au_set_fbstart(file, bstart);
++	au_set_fbtop(file, btop);
 +
 +	btail = au_dbtaildir(dentry);
-+	for (bindex = au_fbend_dir(file); btail < bindex; bindex--)
++	for (bindex = au_fbbot_dir(file); btail < bindex; bindex--)
 +		au_set_h_fptr(file, bindex, NULL);
-+	au_set_fbend_dir(file, btail);
++	au_set_fbbot_dir(file, btail);
 +
 +	flags = vfsub_file_flags(file);
-+	for (bindex = bstart; bindex <= btail; bindex++) {
++	for (bindex = btop; bindex <= btail; bindex++) {
 +		h_dentry = au_h_dptr(dentry, bindex);
 +		if (!h_dentry)
 +			continue;
@@ -9752,10 +9851,10 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	mnt = file->f_path.mnt;
 +	dentry = file->f_path.dentry;
 +	file->f_version = d_inode(dentry)->i_version;
-+	bindex = au_dbstart(dentry);
-+	au_set_fbstart(file, bindex);
++	bindex = au_dbtop(dentry);
++	au_set_fbtop(file, bindex);
 +	btail = au_dbtaildir(dentry);
-+	au_set_fbend_dir(file, btail);
++	au_set_fbbot_dir(file, btail);
 +	for (; !err && bindex <= btail; bindex++) {
 +		h_dentry = au_h_dptr(dentry, bindex);
 +		if (!h_dentry)
@@ -9778,10 +9877,10 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +		return 0; /* success */
 +
 +	/* close all */
-+	for (bindex = au_fbstart(file); bindex <= btail; bindex++)
++	for (bindex = au_fbtop(file); bindex <= btail; bindex++)
 +		au_set_h_fptr(file, bindex, NULL);
-+	au_set_fbstart(file, -1);
-+	au_set_fbend_dir(file, -1);
++	au_set_fbtop(file, -1);
++	au_set_fbbot_dir(file, -1);
 +
 +	return err;
 +}
@@ -9816,7 +9915,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	struct au_vdir *vdir_cache;
 +	struct au_finfo *finfo;
 +	struct au_fidir *fidir;
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +
 +	finfo = au_fi(file);
 +	fidir = finfo->fi_hdir;
@@ -9833,8 +9932,8 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +			 * calls fput() instead of filp_close(),
 +			 * since no dnotify or lock for the lower file.
 +			 */
-+			bend = fidir->fd_bbot;
-+			for (; bindex <= bend; bindex++)
++			bbot = fidir->fd_bbot;
++			for (; bindex <= bbot; bindex++)
 +				au_set_h_fptr(file, bindex, NULL);
 +		}
 +		kfree(fidir);
@@ -9849,12 +9948,12 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +static int au_do_flush_dir(struct file *file, fl_owner_t id)
 +{
 +	int err;
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +	struct file *h_file;
 +
 +	err = 0;
-+	bend = au_fbend_dir(file);
-+	for (bindex = au_fbstart(file); !err && bindex <= bend; bindex++) {
++	bbot = au_fbbot_dir(file);
++	for (bindex = au_fbtop(file); !err && bindex <= bbot; bindex++) {
 +		h_file = au_hf_dir(file, bindex);
 +		if (h_file)
 +			err = vfsub_flush(h_file, id);
@@ -9872,7 +9971,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +static int au_do_fsync_dir_no_file(struct dentry *dentry, int datasync)
 +{
 +	int err;
-+	aufs_bindex_t bend, bindex;
++	aufs_bindex_t bbot, bindex;
 +	struct inode *inode;
 +	struct super_block *sb;
 +
@@ -9880,8 +9979,8 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	sb = dentry->d_sb;
 +	inode = d_inode(dentry);
 +	IMustLock(inode);
-+	bend = au_dbend(dentry);
-+	for (bindex = au_dbstart(dentry); !err && bindex <= bend; bindex++) {
++	bbot = au_dbbot(dentry);
++	for (bindex = au_dbtop(dentry); !err && bindex <= bbot; bindex++) {
 +		struct path h_path;
 +
 +		if (au_test_ro(sb, bindex, inode))
@@ -9900,7 +9999,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +static int au_do_fsync_dir(struct file *file, int datasync)
 +{
 +	int err;
-+	aufs_bindex_t bend, bindex;
++	aufs_bindex_t bbot, bindex;
 +	struct file *h_file;
 +	struct super_block *sb;
 +	struct inode *inode;
@@ -9911,8 +10010,8 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +
 +	inode = file_inode(file);
 +	sb = inode->i_sb;
-+	bend = au_fbend_dir(file);
-+	for (bindex = au_fbstart(file); !err && bindex <= bend; bindex++) {
++	bbot = au_fbbot_dir(file);
++	for (bindex = au_fbtop(file); !err && bindex <= bbot; bindex++) {
 +		h_file = au_hf_dir(file, bindex);
 +		if (!h_file || au_test_ro(sb, bindex, inode))
 +			continue;
@@ -9959,7 +10058,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +
 +/* ---------------------------------------------------------------------- */
 +
-+static int aufs_iterate(struct file *file, struct dir_context *ctx)
++static int aufs_iterate_shared(struct file *file, struct dir_context *ctx)
 +{
 +	int err;
 +	struct dentry *dentry;
@@ -9984,7 +10083,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	if (unlikely(err))
 +		goto out_unlock;
 +
-+	h_inode = au_h_iptr(inode, au_ibstart(inode));
++	h_inode = au_h_iptr(inode, au_ibtop(inode));
 +	if (!au_test_nfsd()) {
 +		err = au_vdir_fill_de(file, ctx);
 +		fsstack_copy_attr_atime(inode, h_inode);
@@ -10153,7 +10252,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +{
 +	int err;
 +	unsigned int rdhash;
-+	aufs_bindex_t bindex, bstart, btail;
++	aufs_bindex_t bindex, btop, btail;
 +	struct au_nhash whlist;
 +	struct test_empty_arg arg = {
 +		.ctx = {
@@ -10173,20 +10272,20 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +
 +	arg.flags = 0;
 +	arg.whlist = &whlist;
-+	bstart = au_dbstart(dentry);
++	btop = au_dbtop(dentry);
 +	if (au_opt_test(au_mntflags(dentry->d_sb), SHWH))
 +		au_fset_testempty(arg.flags, SHWH);
 +	test_empty = do_test_empty;
 +	if (au_opt_test(au_mntflags(dentry->d_sb), DIRPERM1))
 +		test_empty = sio_test_empty;
-+	arg.bindex = bstart;
++	arg.bindex = btop;
 +	err = test_empty(dentry, &arg);
 +	if (unlikely(err))
 +		goto out_whlist;
 +
 +	au_fset_testempty(arg.flags, WHONLY);
 +	btail = au_dbtaildir(dentry);
-+	for (bindex = bstart + 1; !err && bindex <= btail; bindex++) {
++	for (bindex = btop + 1; !err && bindex <= btail; bindex++) {
 +		struct dentry *h_dentry;
 +
 +		h_dentry = au_h_dptr(dentry, bindex);
@@ -10218,7 +10317,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	if (au_opt_test(au_mntflags(dentry->d_sb), SHWH))
 +		au_fset_testempty(arg.flags, SHWH);
 +	btail = au_dbtaildir(dentry);
-+	for (bindex = au_dbstart(dentry); !err && bindex <= btail; bindex++) {
++	for (bindex = au_dbtop(dentry); !err && bindex <= btail; bindex++) {
 +		struct dentry *h_dentry;
 +
 +		h_dentry = au_h_dptr(dentry, bindex);
@@ -10237,7 +10336,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	.owner		= THIS_MODULE,
 +	.llseek		= default_llseek,
 +	.read		= generic_read_dir,
-+	.iterate	= aufs_iterate,
++	.iterate_shared	= aufs_iterate_shared,
 +	.unlocked_ioctl	= aufs_ioctl_dir,
 +#ifdef CONFIG_COMPAT
 +	.compat_ioctl	= aufs_compat_ioctl_dir,
@@ -10249,7 +10348,7 @@ 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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/dir.h	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,131 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -10384,7 +10483,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	2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/dynop.c	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,369 @@
 +/*
 + * Copyright (C) 2010-2016 Junjiro R. Okajima
@@ -10709,14 +10808,14 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 +int au_dy_irefresh(struct inode *inode)
 +{
 +	int err;
-+	aufs_bindex_t bstart;
++	aufs_bindex_t btop;
 +	struct inode *h_inode;
 +
 +	err = 0;
 +	if (S_ISREG(inode->i_mode)) {
-+		bstart = au_ibstart(inode);
-+		h_inode = au_h_iptr(inode, bstart);
-+		err = au_dy_iaop(inode, bstart, h_inode);
++		btop = au_ibtop(inode);
++		h_inode = au_h_iptr(inode, btop);
++		err = au_dy_iaop(inode, btop, h_inode);
 +	}
 +	return err;
 +}
@@ -10757,7 +10856,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	2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/dynop.h	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,74 @@
 +/*
 + * Copyright (C) 2010-2016 Junjiro R. Okajima
@@ -10835,8 +10934,8 @@ 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	2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,830 @@
++++ linux/fs/aufs/export.c	2016-07-25 19:05:34.811159821 +0200
+@@ -0,0 +1,837 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -11072,7 +11171,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +
 +	dentry = ERR_PTR(-ESTALE);
 +	sigen = au_sigen(sb);
-+	if (unlikely(is_bad_inode(inode)
++	if (unlikely(au_is_bad_inode(inode)
 +		     || IS_DEADDIR(inode)
 +		     || sigen != au_iigen(inode, NULL)))
 +		goto out_iput;
@@ -11352,9 +11451,11 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +	h_mnt = au_br_mnt(br);
 +	h_sb = h_mnt->mnt_sb;
 +	/* todo: call lower fh_to_dentry()? fh_to_parent()? */
++	lockdep_off();
 +	h_parent = exportfs_decode_fh(h_mnt, (void *)(fh + Fh_tail),
 +				      fh_len - Fh_tail, fh[Fh_h_type],
 +				      h_acceptable, /*context*/NULL);
++	lockdep_on();
 +	dentry = h_parent;
 +	if (unlikely(!h_parent || IS_ERR(h_parent))) {
 +		AuWarn1("%s decode_fh failed, %ld\n",
@@ -11458,7 +11559,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +
 +	/* is the parent dir cached? */
 +	br = au_sbr(sb, nsi_lock.bindex);
-+	atomic_inc(&br->br_count);
++	au_br_get(br);
 +	dentry = decode_by_dir_ino(sb, ino, dir_ino, &nsi_lock);
 +	if (IS_ERR(dentry))
 +		goto out_unlock;
@@ -11482,7 +11583,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +	dentry = ERR_PTR(-ESTALE);
 +out_unlock:
 +	if (br)
-+		atomic_dec(&br->br_count);
++		au_br_put(br);
 +	si_read_unlock(sb);
 +out:
 +	AuTraceErrPtr(dentry);
@@ -11549,7 +11650,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +	err = -EIO;
 +	parent = NULL;
 +	ii_read_lock_child(inode);
-+	bindex = au_ibstart(inode);
++	bindex = au_ibtop(inode);
 +	if (!dir) {
 +		dentry = d_find_any_alias(inode);
 +		if (unlikely(!dentry))
@@ -11624,7 +11725,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +	sb = inode->i_sb;
 +	si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
 +	ii_write_lock_child(inode);
-+	bindex = au_ibstart(inode);
++	bindex = au_ibtop(inode);
 +	AuDebugOn(bindex < 0);
 +	h_inode = au_h_iptr(inode, bindex);
 +
@@ -11660,6 +11761,11 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +	struct au_sbinfo *sbinfo;
 +	__u32 u;
 +
++	BUILD_BUG_ON_MSG(IS_BUILTIN(CONFIG_AUFS_FS)
++			 && IS_MODULE(CONFIG_EXPORTFS),
++			 AUFS_NAME ": unsupported configuration "
++			 "CONFIG_EXPORTFS=m and CONFIG_AUFS_FS=y");
++
 +	sb->s_export_op = &aufs_export_op;
 +	sbinfo = au_sbi(sb);
 +	sbinfo->si_xigen = NULL;
@@ -11669,7 +11775,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	2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/fhsm.c	2016-07-25 19:05:34.814493242 +0200
 @@ -0,0 +1,426 @@
 +/*
 + * Copyright (C) 2011-2016 Junjiro R. Okajima
@@ -11828,12 +11934,12 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 +
 +void au_fhsm_wrote_all(struct super_block *sb, int force)
 +{
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +	struct au_branch *br;
 +
 +	/* exclude the bottom */
-+	bend = au_fhsm_bottom(sb);
-+	for (bindex = 0; bindex < bend; bindex++) {
++	bbot = au_fhsm_bottom(sb);
++	for (bindex = 0; bindex < bbot; bindex++) {
 +		br = au_sbr(sb, bindex);
 +		if (au_br_fhsm(br->br_perm))
 +			au_fhsm_wrote(sb, bindex, force);
@@ -11879,15 +11985,15 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 +{
 +	ssize_t err;
 +	int nstbr;
-+	aufs_bindex_t bindex, bend;
++	aufs_bindex_t bindex, bbot;
 +	struct au_branch *br;
 +	struct au_br_fhsm *bf;
 +
 +	/* except the bottom branch */
 +	err = 0;
 +	nstbr = 0;
-+	bend = au_fhsm_bottom(sb);
-+	for (bindex = 0; !err && bindex < bend; bindex++) {
++	bbot = au_fhsm_bottom(sb);
++	for (bindex = 0; !err && bindex < bbot; bindex++) {
 +		br = au_sbr(sb, bindex);
 +		if (!au_br_fhsm(br->br_perm))
 +			continue;
@@ -11918,7 +12024,7 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 +{
 +	ssize_t err;
 +	int readable;
-+	aufs_bindex_t nfhsm, bindex, bend;
++	aufs_bindex_t nfhsm, bindex, bbot;
 +	struct au_sbinfo *sbinfo;
 +	struct au_fhsm *fhsm;
 +	struct au_branch *br;
@@ -11949,8 +12055,8 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 +		AuDebugOn(!sb);
 +		/* exclude the bottom branch */
 +		nfhsm = 0;
-+		bend = au_fhsm_bottom(sb);
-+		for (bindex = 0; bindex < bend; bindex++) {
++		bbot = au_fhsm_bottom(sb);
++		for (bindex = 0; bindex < bbot; bindex++) {
 +			br = au_sbr(sb, bindex);
 +			if (au_br_fhsm(br->br_perm))
 +				nfhsm++;
@@ -12099,8 +12205,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	2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,844 @@
++++ linux/fs/aufs/file.c	2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,843 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -12185,7 +12291,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +		}
 +	}
 +	flags &= ~O_CREAT;
-+	atomic_inc(&br->br_count);
++	au_br_get(br);
 +	h_path.dentry = h_dentry;
 +	h_path.mnt = au_br_mnt(br);
 +	h_file = vfsub_dentry_open(&h_path, flags);
@@ -12204,7 +12310,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	goto out; /* success */
 +
 +out_br:
-+	atomic_dec(&br->br_count);
++	au_br_put(br);
 +out:
 +	return h_file;
 +}
@@ -12238,7 +12344,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	err = 0;
 +	if (IS_ROOT(dentry))
 +		goto out;
-+	cpg.bsrc = au_dbstart(dentry);
++	cpg.bsrc = au_dbtop(dentry);
 +	if (!cpg.bsrc)
 +		goto out;
 +
@@ -12353,7 +12459,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +		if (!err)
 +			err = args->open(file, vfsub_file_flags(file),
 +					 args->h_file);
-+		if (!err && au_fbstart(file) != au_dbstart(dentry))
++		if (!err && au_fbtop(file) != au_dbtop(dentry))
 +			/*
 +			 * cmoo happens after h_file was opened.
 +			 * need to refresh file later.
@@ -12386,49 +12492,49 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +int au_reopen_nondir(struct file *file)
 +{
 +	int err;
-+	aufs_bindex_t bstart;
++	aufs_bindex_t btop;
 +	struct dentry *dentry;
 +	struct file *h_file, *h_file_tmp;
 +
 +	dentry = file->f_path.dentry;
-+	bstart = au_dbstart(dentry);
++	btop = au_dbtop(dentry);
 +	h_file_tmp = NULL;
-+	if (au_fbstart(file) == bstart) {
++	if (au_fbtop(file) == btop) {
 +		h_file = au_hf_top(file);
 +		if (file->f_mode == h_file->f_mode)
 +			return 0; /* success */
 +		h_file_tmp = h_file;
 +		get_file(h_file_tmp);
-+		au_set_h_fptr(file, bstart, NULL);
++		au_set_h_fptr(file, btop, NULL);
 +	}
 +	AuDebugOn(au_fi(file)->fi_hdir);
 +	/*
 +	 * it can happen
 +	 * file exists on both of rw and ro
-+	 * open --> dbstart and fbstart are both 0
++	 * open --> dbtop and fbtop are both 0
 +	 * prepend a branch as rw, "rw" become ro
 +	 * remove rw/file
 +	 * delete the top branch, "rw" becomes rw again
-+	 *	--> dbstart is 1, fbstart is still 0
-+	 * write --> fbstart is 0 but dbstart is 1
++	 *	--> dbtop is 1, fbtop is still 0
++	 * write --> fbtop is 0 but dbtop is 1
 +	 */
-+	/* AuDebugOn(au_fbstart(file) < bstart); */
++	/* AuDebugOn(au_fbtop(file) < btop); */
 +
-+	h_file = au_h_open(dentry, bstart, vfsub_file_flags(file) & ~O_TRUNC,
++	h_file = au_h_open(dentry, btop, vfsub_file_flags(file) & ~O_TRUNC,
 +			   file, /*force_wr*/0);
 +	err = PTR_ERR(h_file);
 +	if (IS_ERR(h_file)) {
 +		if (h_file_tmp) {
-+			atomic_inc(&au_sbr(dentry->d_sb, bstart)->br_count);
-+			au_set_h_fptr(file, bstart, h_file_tmp);
++			au_sbr_get(dentry->d_sb, btop);
++			au_set_h_fptr(file, btop, h_file_tmp);
 +			h_file_tmp = NULL;
 +		}
 +		goto out; /* todo: close all? */
 +	}
 +
 +	err = 0;
-+	au_set_fbstart(file, bstart);
-+	au_set_h_fptr(file, bstart, h_file);
++	au_set_fbtop(file, btop);
++	au_set_h_fptr(file, btop, h_file);
 +	au_update_figen(file);
 +	/* todo: necessary? */
 +	/* file->f_ra = h_file->f_ra; */
@@ -12445,7 +12551,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +			struct dentry *hi_wh)
 +{
 +	int err;
-+	aufs_bindex_t bstart;
++	aufs_bindex_t btop;
 +	struct au_dinfo *dinfo;
 +	struct dentry *h_dentry;
 +	struct au_hdentry *hdp;
@@ -12453,14 +12559,14 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	dinfo = au_di(file->f_path.dentry);
 +	AuRwMustWriteLock(&dinfo->di_rwsem);
 +
-+	bstart = dinfo->di_bstart;
-+	dinfo->di_bstart = btgt;
-+	hdp = dinfo->di_hdentry;
-+	h_dentry = hdp[0 + btgt].hd_dentry;
-+	hdp[0 + btgt].hd_dentry = hi_wh;
++	btop = dinfo->di_btop;
++	dinfo->di_btop = btgt;
++	hdp = au_hdentry(dinfo, btgt);
++	h_dentry = hdp->hd_dentry;
++	hdp->hd_dentry = hi_wh;
 +	err = au_reopen_nondir(file);
-+	hdp[0 + btgt].hd_dentry = h_dentry;
-+	dinfo->di_bstart = bstart;
++	hdp->hd_dentry = h_dentry;
++	dinfo->di_btop = btop;
 +
 +	return err;
 +}
@@ -12479,11 +12585,11 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +		.pin	= pin
 +	};
 +
-+	au_update_dbstart(cpg.dentry);
++	au_update_dbtop(cpg.dentry);
 +	inode = d_inode(cpg.dentry);
 +	h_inode = NULL;
-+	if (au_dbstart(cpg.dentry) <= bcpup
-+	    && au_dbend(cpg.dentry) >= bcpup) {
++	if (au_dbtop(cpg.dentry) <= bcpup
++	    && au_dbbot(cpg.dentry) >= bcpup) {
 +		h_dentry = au_h_dptr(cpg.dentry, bcpup);
 +		if (h_dentry && d_is_positive(h_dentry))
 +			h_inode = d_inode(h_dentry);
@@ -12510,7 +12616,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +int au_ready_to_write(struct file *file, loff_t len, struct au_pin *pin)
 +{
 +	int err;
-+	aufs_bindex_t dbstart;
++	aufs_bindex_t dbtop;
 +	struct dentry *parent;
 +	struct inode *inode;
 +	struct super_block *sb;
@@ -12526,7 +12632,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +
 +	sb = cpg.dentry->d_sb;
 +	inode = d_inode(cpg.dentry);
-+	cpg.bsrc = au_fbstart(file);
++	cpg.bsrc = au_fbtop(file);
 +	err = au_test_ro(sb, cpg.bsrc, inode);
 +	if (!err && (au_hf_top(file)->f_mode & FMODE_WRITE)) {
 +		err = au_pin(pin, cpg.dentry, cpg.bsrc, AuOpt_UDBA_NONE,
@@ -12554,11 +12660,11 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	if (unlikely(err))
 +		goto out_dgrade;
 +
-+	dbstart = au_dbstart(cpg.dentry);
-+	if (dbstart <= cpg.bdst)
++	dbtop = au_dbtop(cpg.dentry);
++	if (dbtop <= cpg.bdst)
 +		cpg.bsrc = cpg.bdst;
 +
-+	if (dbstart <= cpg.bdst		/* just reopen */
++	if (dbtop <= cpg.bdst		/* just reopen */
 +	    || !d_unhashed(cpg.dentry)	/* copyup and reopen */
 +		) {
 +		h_file = au_h_open_pre(cpg.dentry, cpg.bsrc, /*force_wr*/0);
@@ -12566,7 +12672,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +			err = PTR_ERR(h_file);
 +		else {
 +			di_downgrade_lock(parent, AuLock_IR);
-+			if (dbstart > cpg.bdst)
++			if (dbtop > cpg.bdst)
 +				err = au_sio_cpup_simple(&cpg);
 +			if (!err)
 +				err = au_reopen_nondir(file);
@@ -12647,7 +12753,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	finfo = au_fi(file);
 +	sb = cpg.dentry->d_sb;
 +	inode = d_inode(cpg.dentry);
-+	cpg.bdst = au_ibstart(inode);
++	cpg.bdst = au_ibtop(inode);
 +	if (cpg.bdst == finfo->fi_btop || IS_ROOT(cpg.dentry))
 +		goto out;
 +
@@ -12668,7 +12774,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	    && au_opt_test(au_mntflags(sb), PLINK)
 +	    && au_plink_test(inode)
 +	    && !d_unhashed(cpg.dentry)
-+	    && cpg.bdst < au_dbstart(cpg.dentry)) {
++	    && cpg.bdst < au_dbtop(cpg.dentry)) {
 +		err = au_test_and_cpup_dirs(cpg.dentry, cpg.bdst);
 +		if (unlikely(err))
 +			goto out_unlock;
@@ -12696,7 +12802,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +
 +static void au_do_refresh_dir(struct file *file)
 +{
-+	aufs_bindex_t bindex, bend, new_bindex, brid;
++	aufs_bindex_t bindex, bbot, new_bindex, brid;
 +	struct au_hfile *p, tmp, *q;
 +	struct au_finfo *finfo;
 +	struct super_block *sb;
@@ -12710,8 +12816,8 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	AuDebugOn(!fidir);
 +	p = fidir->fd_hfile + finfo->fi_btop;
 +	brid = p->hf_br->br_id;
-+	bend = fidir->fd_bbot;
-+	for (bindex = finfo->fi_btop; bindex <= bend; bindex++, p++) {
++	bbot = fidir->fd_bbot;
++	for (bindex = finfo->fi_btop; bindex <= bbot; bindex++, p++) {
 +		if (!p->hf_file)
 +			continue;
 +
@@ -12736,8 +12842,8 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +
 +	p = fidir->fd_hfile;
 +	if (!au_test_mmapped(file) && !d_unlinked(file->f_path.dentry)) {
-+		bend = au_sbend(sb);
-+		for (finfo->fi_btop = 0; finfo->fi_btop <= bend;
++		bbot = au_sbbot(sb);
++		for (finfo->fi_btop = 0; finfo->fi_btop <= bbot;
 +		     finfo->fi_btop++, p++)
 +			if (p->hf_file) {
 +				if (file_inode(p->hf_file))
@@ -12745,16 +12851,16 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +				au_hfput(p, file);
 +			}
 +	} else {
-+		bend = au_br_index(sb, brid);
-+		for (finfo->fi_btop = 0; finfo->fi_btop < bend;
++		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, file);
-+		bend = au_sbend(sb);
++		bbot = au_sbbot(sb);
 +	}
 +
-+	p = fidir->fd_hfile + bend;
-+	for (fidir->fd_bbot = bend; fidir->fd_bbot >= finfo->fi_btop;
++	p = fidir->fd_hfile + bbot;
++	for (fidir->fd_bbot = bbot; fidir->fd_bbot >= finfo->fi_btop;
 +	     fidir->fd_bbot--, p--)
 +		if (p->hf_file) {
 +			if (file_inode(p->hf_file))
@@ -12770,7 +12876,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +static int refresh_file(struct file *file, int (*reopen)(struct file *file))
 +{
 +	int err, need_reopen;
-+	aufs_bindex_t bend, bindex;
++	aufs_bindex_t bbot, bindex;
 +	struct dentry *dentry;
 +	struct au_finfo *finfo;
 +	struct au_hfile *hfile;
@@ -12783,9 +12889,9 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +		bindex = au_br_index(dentry->d_sb, hfile->hf_br->br_id);
 +		AuDebugOn(bindex < 0);
 +		if (bindex != finfo->fi_btop)
-+			au_set_fbstart(file, bindex);
++			au_set_fbtop(file, bindex);
 +	} else {
-+		err = au_fidir_realloc(finfo, au_sbend(dentry->d_sb) + 1);
++		err = au_fidir_realloc(finfo, au_sbbot(dentry->d_sb) + 1);
 +		if (unlikely(err))
 +			goto out;
 +		au_do_refresh_dir(file);
@@ -12804,8 +12910,8 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +
 +	/* error, close all lower files */
 +	if (finfo->fi_hdir) {
-+		bend = au_fbend_dir(file);
-+		for (bindex = au_fbstart(file); bindex <= bend; bindex++)
++		bbot = au_fbbot_dir(file);
++		for (bindex = au_fbtop(file); bindex <= bbot; bindex++)
 +			au_set_h_fptr(file, bindex, NULL);
 +	}
 +
@@ -12819,7 +12925,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +{
 +	int err;
 +	unsigned int sigen, figen;
-+	aufs_bindex_t bstart;
++	aufs_bindex_t btop;
 +	unsigned char pseudo_link;
 +	struct dentry *dentry;
 +	struct inode *inode;
@@ -12831,9 +12937,9 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	fi_write_lock(file);
 +	figen = au_figen(file);
 +	di_write_lock_child(dentry);
-+	bstart = au_dbstart(dentry);
-+	pseudo_link = (bstart != au_ibstart(inode));
-+	if (sigen == figen && !pseudo_link && au_fbstart(file) == bstart) {
++	btop = au_dbtop(dentry);
++	pseudo_link = (btop != au_ibtop(inode));
++	if (sigen == figen && !pseudo_link && au_fbtop(file) == btop) {
 +		if (!wlock) {
 +			di_downgrade_lock(dentry, AuLock_IR);
 +			fi_downgrade_lock(file);
@@ -12874,8 +12980,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +}
 +
 +/* it will never be called, but necessary to support O_DIRECT */
-+static ssize_t aufs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
-+			      loff_t offset)
++static ssize_t aufs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 +{ BUG(); return 0; }
 +
 +/* they will never be called. */
@@ -12947,7 +13052,7 @@ 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	2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/file.h	2016-07-25 19:05:34.814493242 +0200
 @@ -0,0 +1,291 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -13108,13 +13213,13 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
 +/* ---------------------------------------------------------------------- */
 +
 +/* todo: hard/soft set? */
-+static inline aufs_bindex_t au_fbstart(struct file *file)
++static inline aufs_bindex_t au_fbtop(struct file *file)
 +{
 +	FiMustAnyLock(file);
 +	return au_fi(file)->fi_btop;
 +}
 +
-+static inline aufs_bindex_t au_fbend_dir(struct file *file)
++static inline aufs_bindex_t au_fbbot_dir(struct file *file)
 +{
 +	FiMustAnyLock(file);
 +	AuDebugOn(!au_fi(file)->fi_hdir);
@@ -13128,13 +13233,13 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
 +	return au_fi(file)->fi_hdir->fd_vdir_cache;
 +}
 +
-+static inline void au_set_fbstart(struct file *file, aufs_bindex_t bindex)
++static inline void au_set_fbtop(struct file *file, aufs_bindex_t bindex)
 +{
 +	FiMustWriteLock(file);
 +	au_fi(file)->fi_btop = bindex;
 +}
 +
-+static inline void au_set_fbend_dir(struct file *file, aufs_bindex_t bindex)
++static inline void au_set_fbbot_dir(struct file *file, aufs_bindex_t bindex)
 +{
 +	FiMustWriteLock(file);
 +	AuDebugOn(!au_fi(file)->fi_hdir);
@@ -13242,8 +13347,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	2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,156 @@
++++ linux/fs/aufs/finfo.c	2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,149 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
 + *
@@ -13274,7 +13379,7 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 +		allow_write_access(hf->hf_file);
 +	fput(hf->hf_file);
 +	hf->hf_file = NULL;
-+	atomic_dec(&hf->hf_br->br_count);
++	au_br_put(hf->hf_br);
 +	hf->hf_br = NULL;
 +}
 +
@@ -13314,7 +13419,7 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 +	struct au_fidir *fidir;
 +	int nbr;
 +
-+	nbr = au_sbend(sb) + 1;
++	nbr = au_sbbot(sb) + 1;
 +	if (nbr < 2)
 +		nbr = 2; /* initial allocate for 2 branches */
 +	fidir = kzalloc(au_fidir_sz(nbr), GFP_NOFS);
@@ -13364,10 +13469,8 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 +void au_fi_init_once(void *_finfo)
 +{
 +	struct au_finfo *finfo = _finfo;
-+	static struct lock_class_key aufs_fi;
 +
 +	au_rw_init(&finfo->fi_rwsem);
-+	au_rw_class(&finfo->fi_rwsem, &aufs_fi);
 +}
 +
 +int au_finfo_init(struct file *file, struct au_fidir *fidir)
@@ -13384,11 +13487,6 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 +
 +	err = 0;
 +	au_nfiles_inc(dentry->d_sb);
-+	/* verbose coding for lock class name */
-+	if (!fidir)
-+		au_rw_class(&finfo->fi_rwsem, au_lc_key + AuLcNonDir_FIINFO);
-+	else
-+		au_rw_class(&finfo->fi_rwsem, au_lc_key + AuLcDir_FIINFO);
 +	au_rw_write_lock(&finfo->fi_rwsem);
 +	finfo->fi_btop = -1;
 +	finfo->fi_hdir = fidir;
@@ -13402,7 +13500,7 @@ 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	2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/f_op.c	2016-07-25 19:05:34.811159821 +0200
 @@ -0,0 +1,770 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -13447,7 +13545,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +	finfo = au_fi(file);
 +	memset(&finfo->fi_htop, 0, sizeof(finfo->fi_htop));
 +	atomic_set(&finfo->fi_mmapped, 0);
-+	bindex = au_dbstart(dentry);
++	bindex = au_dbtop(dentry);
 +	if (!h_file) {
 +		h_dentry = au_h_dptr(dentry, bindex);
 +		err = vfsub_test_mntns(file->f_path.mnt, h_dentry->d_sb);
@@ -13471,7 +13569,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +			h_inode->i_state |= I_LINKABLE;
 +			spin_unlock(&h_inode->i_lock);
 +		}
-+		au_set_fbstart(file, bindex);
++		au_set_fbtop(file, bindex);
 +		au_set_h_fptr(file, bindex, h_file);
 +		au_update_figen(file);
 +		/* todo: necessary? */
@@ -13573,7 +13671,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +
 +struct au_write_pre {
 +	blkcnt_t blks;
-+	aufs_bindex_t bstart;
++	aufs_bindex_t btop;
 +};
 +
 +/*
@@ -13606,7 +13704,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +
 +	di_downgrade_lock(dentry, /*flags*/0);
 +	if (wpre)
-+		wpre->bstart = au_fbstart(file);
++		wpre->btop = au_fbtop(file);
 +	h_file = au_hf_top(file);
 +	get_file(h_file);
 +	if (wpre)
@@ -13627,7 +13725,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +	struct inode *h_inode;
 +
 +	au_cpup_attr_timesizes(inode);
-+	AuDebugOn(au_ibstart(inode) != wpre->bstart);
++	AuDebugOn(au_ibtop(inode) != wpre->btop);
 +	h_inode = file_inode(h_file);
 +	inode->i_mode = h_inode->i_mode;
 +	ii_write_unlock(inode);
@@ -13635,7 +13733,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +
 +	/* AuDbg("blks %llu, %llu\n", (u64)blks, (u64)h_inode->i_blocks); */
 +	if (written > 0)
-+		au_fhsm_wrote(inode->i_sb, wpre->bstart,
++		au_fhsm_wrote(inode->i_sb, wpre->btop,
 +			      /*force*/h_inode->i_blocks > wpre->blks);
 +}
 +
<Skipped 4702 lines>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5afbbe0d2cf36a3aaa279aba8ceed469c01d3f78




More information about the pld-cvs-commit mailing list