-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"
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
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*
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@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;
}
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.
*/
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);
{
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.
*/
{
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.
*/
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;
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);
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);
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);
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
+ 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) {
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)
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;
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
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 */
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;
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 \
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);
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)
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)
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);
}
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:
/* 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)
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)
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)
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)
/* 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)
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;
}
}
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)
+ 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;
}
/*
* 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);
}
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)
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 @@
#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);
}
/*
* 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);
}
/*
* 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;
}
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)
/* 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);
}
void fsnotify_destroy_marks(struct hlist_head *head, spinlock_t *lock)
{
-@@ -398,6 +400,7 @@ err:
+@@ -415,6 +417,7 @@ err:
return ret;
}
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,
}
+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)
}
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);
}
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);
}
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);
}
/*
* 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);
}
/**
* 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,
}
+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)
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);
}
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);
}
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);
}
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);
}
{
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
+ 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
+ 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
+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
+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
+ 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
+ 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
+ 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
+ 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
+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
+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
+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
+ 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
+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
+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
+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
+# 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
+#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
+ *
+ 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) {
+
+ 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++);
+ */
+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;
+ 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 */
+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) {
+
+ 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;
+ }
+ 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);
+ 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);
+ 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));
+ 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);
+}
+
+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;
+ 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,
+{
+ 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);
+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;
+ 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;
+ 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;
+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);
+}
+
+ 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);
+}
+
+/*
+ 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;
+ }
+
+ /* 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);
+ 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);
+ }
+ }
+
-+ 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);
+{
+ int err;
+ unsigned char matched, root;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct au_fidir *fidir;
+ struct au_hfile *hfile;
+
+ 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;
+{
+ 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;
+
+ /* 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)
+ 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;
+ 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;
+ }
+ 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;
+ }
+ }
+
+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 */
+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;
+ 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);
+ 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);
+ 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;
+ 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;
+ }
+ 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);
+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;
+
+
+ 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;
+ 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);
+}
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
+ *
+ 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;
+ 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)
+ 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)
+#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}
+-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
+ *
+{
+ 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);
+}
+{
+ 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)
+ * 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);
+{
+ 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;
+{
+ 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);
+ * 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);
+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;
+ }
+
+ 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;
+ 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)) {
+ 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));
+
+
+ /* revert */
+ au_set_h_dptr(dentry, cpg->bdst, NULL);
-+ au_set_dbstart(dentry, cpg->bsrc);
++ au_set_dbtop(dentry, cpg->bsrc);
+ }
+
+ return err;
+
+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);
+ 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;
+ 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;
+ 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);
+}
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
+#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
+ 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
+
+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);
+ 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);
+ 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;
+}
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
+#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
+}
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
+#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
+ *
+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);
+ }
+}
+
+{
+ 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));
+ 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;
+}
+
+ 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))
+ 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)
+ 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);
+
+ 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))
+ 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]);
+}
+
+{
+ 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;
+}
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
+#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
+ *
+#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;
+ 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 */
+ || (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)
+ * 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;
+ 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;
+
+ 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))
+
+ 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);
+ }
+
+ 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:
+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;
+
+ 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;
+
+ }
+
+ /* 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;
+ }
+
+ 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;
+ }
+ struct au_dinfo *tmp)
+{
+ int err;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct {
+ struct dentry *dentry;
+ struct inode *inode;
+ 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;
+ 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);
+ 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);
+ } 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.
+ 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));
+ 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 {
+ 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);
+ 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);
+ * 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)
+{
+ 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;
+ 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;
+ 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;
+
+ 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;
+ }
+
+ 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);
+};
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
+ *
+ 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;
+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);
+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);
+
+/* ---------------------------------------------------------------------- */
+ 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)
+}
+
+/* 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;
+}
+
+#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
+ *
+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)
+ 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;
+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);
+ } 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(); */
+ 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(); */
+ 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);
+
+ 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;
+}
+ 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);
+ }
+
+ 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) {
+
+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;
+}
+
+/* ---------------------------------------------------------------------- */
+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) {
+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;
+ 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);
+
+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
+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;
+
+ 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))
+ 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))
+ 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))
+ 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);
+ 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);
+
+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;
+ 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;
+
+{
+ 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;
+ 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)
+ 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;
+}
+ 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;
+ * 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);
+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);
+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;
+
+ 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))
+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;
+
+ 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;
+
+/* ---------------------------------------------------------------------- */
+
-+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;
+ 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);
+{
+ 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 = {
+
+ 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);
+ 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);
+ .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,
+};
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
+#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
+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;
+}
+}
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
+#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
+ *
+
+ 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;
+ 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",
+
+ /* 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;
+ dentry = ERR_PTR(-ESTALE);
+out_unlock:
+ if (br)
-+ atomic_dec(&br->br_count);
++ au_br_put(br);
+ si_read_unlock(sb);
+out:
+ AuTraceErrPtr(dentry);
+ 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))
+ 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);
+
+ 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;
+}
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
+
+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);
+{
+ 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;
+{
+ 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;
+ 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++;
+}
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
+ *
+ }
+ }
+ 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);
+ goto out; /* success */
+
+out_br:
-+ atomic_dec(&br->br_count);
++ au_br_put(br);
+out:
+ return h_file;
+}
+ err = 0;
+ if (IS_ROOT(dentry))
+ goto out;
-+ cpg.bsrc = au_dbstart(dentry);
++ cpg.bsrc = au_dbtop(dentry);
+ if (!cpg.bsrc)
+ goto out;
+
+ 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.
+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; */
+ 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;
+ 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;
+}
+ .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);
+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;
+
+ 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,
+ 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);
+ 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);
+ 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;
+
+ && 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;
+
+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;
+ 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;
+
+
+ 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))
+ 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))
+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;
+ 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);
+
+ /* 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);
+ }
+
+{
+ int err;
+ unsigned int sigen, figen;
-+ aufs_bindex_t bstart;
++ aufs_bindex_t btop;
+ unsigned char pseudo_link;
+ struct dentry *dentry;
+ struct inode *inode;
+ 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);
+}
+
+/* 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. */
+};
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
+/* ---------------------------------------------------------------------- */
+
+/* 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);
+ 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);
+#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
+ *
+ 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;
+}
+
+ 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);
+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)
+
+ 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;
+}
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
+ 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);
+ 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? */
+
+struct au_write_pre {
+ blkcnt_t blks;
-+ aufs_bindex_t bstart;
++ aufs_bindex_t btop;
+};
+
+/*
+
+ 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)
+ 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);
+
+ /* 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);
+}
+
+ sb = inode->i_sb;
+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
+
-+ h_file = au_read_pre(file, /*keep_fi*/0);
++ h_file = au_read_pre(file, /*keep_fi*/1);
+ err = PTR_ERR(h_file);
+ if (IS_ERR(h_file))
+ goto out;
+
++ if (au_test_loopback_kthread()) {
++ au_warn_loopback(h_file->f_path.dentry->d_sb);
++ if (file->f_mapping != h_file->f_mapping) {
++ file->f_mapping = h_file->f_mapping;
++ smp_mb(); /* unnecessary? */
++ }
++ }
++ fi_read_unlock(file);
++
+ err = au_do_iter(h_file, MAY_READ, kio, iov_iter);
+ /* todo: necessary? */
+ /* file->f_ra = h_file->f_ra; */
+ sb = inode->i_sb;
+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
+
-+ h_file = au_read_pre(file, /*keep_fi*/1);
++ h_file = au_read_pre(file, /*keep_fi*/0);
+ err = PTR_ERR(h_file);
+ if (IS_ERR(h_file))
+ goto out;
+
-+ if (au_test_loopback_kthread()) {
-+ au_warn_loopback(h_file->f_path.dentry->d_sb);
-+ if (file->f_mapping != h_file->f_mapping) {
-+ file->f_mapping = h_file->f_mapping;
-+ smp_mb(); /* unnecessary? */
-+ }
-+ }
-+ fi_read_unlock(file);
-+
+ err = vfsub_splice_to(h_file, ppos, pipe, len, flags);
+ /* todo: necessasry? */
+ /* file->f_ra = h_file->f_ra; */
+};
diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
--- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/fstype.h 2016-07-25 19:05:34.814493242 +0200
@@ -0,0 +1,400 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+#endif /* __AUFS_FSTYPE_H__ */
diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
--- /usr/share/empty/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsnotify.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,288 @@
++++ linux/fs/aufs/hfsnotify.c 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+{
+ struct au_hnotify *hn = container_of(mark, struct au_hnotify,
+ hn_mark);
-+ AuDbg("here\n");
++ /* AuDbg("here\n"); */
+ au_cache_free_hnotify(hn);
+ smp_mb__before_atomic();
+ if (atomic64_dec_and_test(&au_hfsn_ifree))
+ lockdep_off();
+ err = fsnotify_add_mark(mark, br->br_hfsn->hfsn_group, hinode->hi_inode,
+ /*mnt*/NULL, /*allow_dups*/1);
-+ /* even if err */
-+ fsnotify_put_mark(mark);
+ lockdep_on();
+
+ return err;
+ spin_unlock(&mark->lock);
+ lockdep_off();
+ fsnotify_destroy_mark(mark, group);
++ fsnotify_put_mark(mark);
+ fsnotify_put_group(group);
+ lockdep_on();
+
+{
+ struct au_br_hfsnotify *hfsn = group->private;
+
-+ AuDbg("here\n");
++ /* AuDbg("here\n"); */
+ kfree(hfsn);
+}
+
+};
diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
--- /usr/share/empty/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsplus.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/hfsplus.c 2016-07-25 19:05:34.814493242 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010-2016 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
--- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/hnotify.c 2016-07-25 19:05:34.814493242 +0200
@@ -0,0 +1,710 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+
+void au_hn_reset(struct inode *inode, unsigned int flags)
+{
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct inode *hi;
+ struct dentry *iwhdentry;
+
-+ bend = au_ibend(inode);
-+ for (bindex = au_ibstart(inode); bindex <= bend; bindex++) {
++ bbot = au_ibbot(inode);
++ for (bindex = au_ibtop(inode); bindex <= bbot; bindex++) {
+ hi = au_h_iptr(inode, bindex);
+ if (!hi)
+ continue;
+static int hn_xino(struct inode *inode, struct inode *h_inode)
+{
+ int err;
-+ aufs_bindex_t bindex, bend, bfound, bstart;
++ aufs_bindex_t bindex, bbot, bfound, btop;
+ struct inode *h_i;
+
+ err = 0;
+ }
+
+ bfound = -1;
-+ bend = au_ibend(inode);
-+ bstart = au_ibstart(inode);
++ bbot = au_ibbot(inode);
++ btop = au_ibtop(inode);
+#if 0 /* reserved for future use */
-+ if (bindex == bend) {
++ if (bindex == bbot) {
+ /* keep this ino in rename case */
+ goto out;
+ }
+#endif
-+ for (bindex = bstart; bindex <= bend; bindex++)
++ for (bindex = btop; bindex <= bbot; bindex++)
+ if (au_h_iptr(inode, bindex) == h_inode) {
+ bfound = bindex;
+ break;
+ if (bfound < 0)
+ goto out;
+
-+ for (bindex = bstart; bindex <= bend; bindex++) {
++ for (bindex = btop; bindex <= bbot; bindex++) {
+ h_i = au_h_iptr(inode, bindex);
+ if (!h_i)
+ continue;
+{
+ struct au_hnotify_args *a = _args;
+ struct super_block *sb;
-+ aufs_bindex_t bindex, bend, bfound;
++ aufs_bindex_t bindex, bbot, bfound;
+ unsigned char xino, try_iput;
+ int err;
+ struct inode *inode;
+
+ ii_read_lock_parent(a->dir);
+ bfound = -1;
-+ bend = au_ibend(a->dir);
-+ for (bindex = au_ibstart(a->dir); bindex <= bend; bindex++)
++ bbot = au_ibbot(a->dir);
++ for (bindex = au_ibtop(a->dir); bindex <= bbot; bindex++)
+ if (au_h_iptr(a->dir, bindex) == a->h_dir) {
+ bfound = bindex;
+ break;
+}
diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
--- /usr/share/empty/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/iinfo.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,277 @@
++++ linux/fs/aufs/iinfo.c 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex)
+{
+ struct inode *h_inode;
++ struct au_hinode *hinode;
+
+ IiMustAnyLock(inode);
+
-+ h_inode = au_ii(inode)->ii_hinode[0 + bindex].hi_inode;
++ hinode = au_hinode(au_ii(inode), bindex);
++ h_inode = hinode->hi_inode;
+ AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0);
+ return h_inode;
+}
+
+ IiMustWriteLock(inode);
+
-+ hinode = iinfo->ii_hinode + bindex;
++ hinode = au_hinode(iinfo, bindex);
+ hi = hinode->hi_inode;
+ AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0);
+
+ AuDebugOn(inode->i_mode
+ && (h_inode->i_mode & S_IFMT)
+ != (inode->i_mode & S_IFMT));
-+ if (bindex == iinfo->ii_bstart)
++ if (bindex == iinfo->ii_btop)
+ au_cpup_igen(inode, h_inode);
+ br = au_sbr(sb, bindex);
+ hinode->hi_id = br->br_id;
+
+ IiMustWriteLock(inode);
+
-+ hinode = au_ii(inode)->ii_hinode + bindex;
++ hinode = au_hinode(au_ii(inode), bindex);
+ AuDebugOn(hinode->hi_whdentry);
+ hinode->hi_whdentry = h_wh;
+}
+void au_update_ibrange(struct inode *inode, int do_put_zero)
+{
+ struct au_iinfo *iinfo;
-+ aufs_bindex_t bindex, bend;
-+
-+ iinfo = au_ii(inode);
-+ if (!iinfo)
-+ return;
++ aufs_bindex_t bindex, bbot;
+
++ AuDebugOn(au_is_bad_inode(inode));
+ IiMustWriteLock(inode);
+
-+ if (do_put_zero && iinfo->ii_bstart >= 0) {
-+ for (bindex = iinfo->ii_bstart; bindex <= iinfo->ii_bend;
++ iinfo = au_ii(inode);
++ if (do_put_zero && iinfo->ii_btop >= 0) {
++ for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot;
+ bindex++) {
+ struct inode *h_i;
+
-+ h_i = iinfo->ii_hinode[0 + bindex].hi_inode;
++ h_i = au_hinode(iinfo, bindex)->hi_inode;
+ if (h_i
+ && !h_i->i_nlink
+ && !(h_i->i_state & I_LINKABLE))
+ }
+ }
+
-+ iinfo->ii_bstart = -1;
-+ iinfo->ii_bend = -1;
-+ bend = au_sbend(inode->i_sb);
-+ for (bindex = 0; bindex <= bend; bindex++)
-+ if (iinfo->ii_hinode[0 + bindex].hi_inode) {
-+ iinfo->ii_bstart = bindex;
++ iinfo->ii_btop = -1;
++ iinfo->ii_bbot = -1;
++ bbot = au_sbbot(inode->i_sb);
++ for (bindex = 0; bindex <= bbot; bindex++)
++ if (au_hinode(iinfo, bindex)->hi_inode) {
++ iinfo->ii_btop = bindex;
+ break;
+ }
-+ if (iinfo->ii_bstart >= 0)
-+ for (bindex = bend; bindex >= iinfo->ii_bstart; bindex--)
-+ if (iinfo->ii_hinode[0 + bindex].hi_inode) {
-+ iinfo->ii_bend = bindex;
++ if (iinfo->ii_btop >= 0)
++ for (bindex = bbot; bindex >= iinfo->ii_btop; bindex--)
++ if (au_hinode(iinfo, bindex)->hi_inode) {
++ iinfo->ii_bbot = bindex;
+ break;
+ }
-+ AuDebugOn(iinfo->ii_bstart > iinfo->ii_bend);
++ AuDebugOn(iinfo->ii_btop > iinfo->ii_bbot);
+}
+
+/* ---------------------------------------------------------------------- */
+{
+ struct au_icntnr *c = _c;
+ struct au_iinfo *iinfo = &c->iinfo;
-+ static struct lock_class_key aufs_ii;
+
+ spin_lock_init(&iinfo->ii_generation.ig_spin);
+ au_rw_init(&iinfo->ii_rwsem);
-+ au_rw_class(&iinfo->ii_rwsem, &aufs_ii);
+ inode_init_once(&c->vfs_inode);
+}
+
++void au_hinode_init(struct au_hinode *hinode)
++{
++ hinode->hi_inode = NULL;
++ hinode->hi_id = -1;
++ au_hn_init(hinode);
++ hinode->hi_whdentry = NULL;
++}
++
+int au_iinfo_init(struct inode *inode)
+{
+ struct au_iinfo *iinfo;
+ struct super_block *sb;
++ struct au_hinode *hi;
+ int nbr, i;
+
+ sb = inode->i_sb;
+ iinfo = &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo);
-+ nbr = au_sbend(sb) + 1;
++ nbr = au_sbbot(sb) + 1;
+ if (unlikely(nbr <= 0))
+ nbr = 1;
-+ iinfo->ii_hinode = kcalloc(nbr, sizeof(*iinfo->ii_hinode), GFP_NOFS);
-+ if (iinfo->ii_hinode) {
++ hi = kmalloc_array(nbr, sizeof(*iinfo->ii_hinode), GFP_NOFS);
++ if (hi) {
+ au_ninodes_inc(sb);
-+ for (i = 0; i < nbr; i++)
-+ iinfo->ii_hinode[i].hi_id = -1;
++
++ iinfo->ii_hinode = hi;
++ for (i = 0; i < nbr; i++, hi++)
++ au_hinode_init(hi);
+
+ iinfo->ii_generation.ig_generation = au_sigen(sb);
-+ iinfo->ii_bstart = -1;
-+ iinfo->ii_bend = -1;
++ iinfo->ii_btop = -1;
++ iinfo->ii_bbot = -1;
+ iinfo->ii_vdir = NULL;
+ return 0;
+ }
+ return -ENOMEM;
+}
+
-+int au_ii_realloc(struct au_iinfo *iinfo, int nbr)
++int au_hinode_realloc(struct au_iinfo *iinfo, int nbr)
+{
-+ int err, sz;
++ int err, i;
+ struct au_hinode *hip;
+
+ AuRwMustWriteLock(&iinfo->ii_rwsem);
+
+ err = -ENOMEM;
-+ sz = sizeof(*hip) * (iinfo->ii_bend + 1);
-+ if (!sz)
-+ sz = sizeof(*hip);
-+ hip = au_kzrealloc(iinfo->ii_hinode, sz, sizeof(*hip) * nbr, GFP_NOFS);
++ hip = krealloc(iinfo->ii_hinode, sizeof(*hip) * nbr, GFP_NOFS);
+ if (hip) {
+ iinfo->ii_hinode = hip;
++ i = iinfo->ii_bbot + 1;
++ hip += i;
++ for (; i < nbr; i++, hip++)
++ au_hinode_init(hip);
+ err = 0;
+ }
+
+ struct au_iinfo *iinfo;
+ struct au_hinode *hi;
+ struct super_block *sb;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ const unsigned char unlinked = !inode->i_nlink;
+
-+ iinfo = au_ii(inode);
-+ /* bad_inode case */
-+ if (!iinfo)
-+ return;
++ AuDebugOn(au_is_bad_inode(inode));
+
+ sb = inode->i_sb;
+ au_ninodes_dec(sb);
+ lockdep_on();
+ }
+
++ iinfo = au_ii(inode);
+ if (iinfo->ii_vdir)
+ au_vdir_free(iinfo->ii_vdir);
+
-+ bindex = iinfo->ii_bstart;
++ bindex = iinfo->ii_btop;
+ if (bindex >= 0) {
-+ hi = iinfo->ii_hinode + bindex;
-+ bend = iinfo->ii_bend;
-+ while (bindex++ <= bend) {
++ hi = au_hinode(iinfo, bindex);
++ bbot = iinfo->ii_bbot;
++ while (bindex++ <= bbot) {
+ if (hi->hi_inode)
+ au_hiput(hi);
+ hi++;
+ }
+ }
+ kfree(iinfo->ii_hinode);
-+ iinfo->ii_hinode = NULL;
+ AuRwDestroy(&iinfo->ii_rwsem);
+}
diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
--- /usr/share/empty/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,527 @@
++++ linux/fs/aufs/inode.c 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,517 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+ struct au_iinfo *iinfo;
+ struct au_hinode *p, *q, tmp;
+
++ AuDebugOn(au_is_bad_inode(inode));
+ IiMustWriteLock(inode);
+
+ *update = 0;
+ sb = inode->i_sb;
+ type = inode->i_mode & S_IFMT;
+ iinfo = au_ii(inode);
-+ err = au_ii_realloc(iinfo, au_sbend(sb) + 1);
++ err = au_hinode_realloc(iinfo, au_sbbot(sb) + 1);
+ if (unlikely(err))
+ goto out;
+
-+ AuDebugOn(iinfo->ii_bstart < 0);
-+ p = iinfo->ii_hinode + iinfo->ii_bstart;
-+ for (bindex = iinfo->ii_bstart; bindex <= iinfo->ii_bend;
++ AuDebugOn(iinfo->ii_btop < 0);
++ p = au_hinode(iinfo, iinfo->ii_btop);
++ for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot;
+ bindex++, p++) {
+ if (!p->hi_inode)
+ continue;
+ continue;
+ }
+
-+ if (new_bindex < iinfo->ii_bstart)
-+ iinfo->ii_bstart = new_bindex;
-+ if (iinfo->ii_bend < new_bindex)
-+ iinfo->ii_bend = new_bindex;
++ if (new_bindex < iinfo->ii_btop)
++ iinfo->ii_btop = new_bindex;
++ if (iinfo->ii_bbot < new_bindex)
++ iinfo->ii_bbot = new_bindex;
+ /* swap two lower inode, and loop again */
-+ q = iinfo->ii_hinode + new_bindex;
++ q = au_hinode(iinfo, new_bindex);
+ tmp = *q;
+ *q = *p;
+ *p = tmp;
+ int err, e, update;
+ unsigned int flags;
+ umode_t mode;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ unsigned char isdir;
+ struct au_hinode *p;
+ struct au_iinfo *iinfo;
+
+ update = 0;
+ iinfo = au_ii(inode);
-+ p = iinfo->ii_hinode + iinfo->ii_bstart;
++ p = au_hinode(iinfo, iinfo->ii_btop);
+ mode = (inode->i_mode & S_IFMT);
+ isdir = S_ISDIR(mode);
+ flags = au_hi_flags(inode, isdir);
-+ bend = au_dbend(dentry);
-+ for (bindex = au_dbstart(dentry); bindex <= bend; bindex++) {
++ bbot = au_dbbot(dentry);
++ for (bindex = au_dbtop(dentry); bindex <= bbot; bindex++) {
+ struct inode *h_i, *h_inode;
+ struct dentry *h_d;
+
+
+ h_inode = d_inode(h_d);
+ AuDebugOn(mode != (h_inode->i_mode & S_IFMT));
-+ if (iinfo->ii_bstart <= bindex && bindex <= iinfo->ii_bend) {
++ if (iinfo->ii_btop <= bindex && bindex <= iinfo->ii_bbot) {
+ h_i = au_h_iptr(inode, bindex);
+ if (h_i) {
+ if (h_i == h_inode)
+ break;
+ }
+ }
-+ if (bindex < iinfo->ii_bstart)
-+ iinfo->ii_bstart = bindex;
-+ if (iinfo->ii_bend < bindex)
-+ iinfo->ii_bend = bindex;
++ if (bindex < iinfo->ii_btop)
++ iinfo->ii_btop = bindex;
++ if (iinfo->ii_bbot < bindex)
++ iinfo->ii_bbot = bindex;
+ au_set_h_iptr(inode, bindex, au_igrab(h_inode), flags);
+ update = 1;
+ }
+ int err;
+ unsigned int flags;
+ umode_t mode;
-+ aufs_bindex_t bindex, bstart, btail;
++ aufs_bindex_t bindex, btop, btail;
+ unsigned char isdir;
+ struct dentry *h_dentry;
+ struct inode *h_inode;
+ err = 0;
+ isdir = 0;
+ iop = au_sbi(inode->i_sb)->si_iop_array;
-+ bstart = au_dbstart(dentry);
-+ h_dentry = au_h_dptr(dentry, bstart);
++ btop = au_dbtop(dentry);
++ h_dentry = au_h_dptr(dentry, btop);
+ h_inode = d_inode(h_dentry);
+ mode = h_inode->i_mode;
+ switch (mode & S_IFMT) {
+ btail = au_dbtail(dentry);
+ inode->i_op = iop + AuIop_OTHER;
+ inode->i_fop = &aufs_file_fop;
-+ err = au_dy_iaop(inode, bstart, h_inode);
++ err = au_dy_iaop(inode, btop, h_inode);
+ if (unlikely(err))
+ goto out;
+ break;
+ && !memcmp(dentry->d_name.name, AUFS_WH_PFX, AUFS_WH_PFX_LEN))
+ au_fclr_hi(flags, HNOTIFY);
+ iinfo = au_ii(inode);
-+ iinfo->ii_bstart = bstart;
-+ iinfo->ii_bend = btail;
-+ for (bindex = bstart; bindex <= btail; bindex++) {
++ iinfo->ii_btop = btop;
++ iinfo->ii_bbot = btail;
++ for (bindex = btop; bindex <= btail; bindex++) {
+ h_dentry = au_h_dptr(dentry, bindex);
+ if (h_dentry)
+ au_set_h_iptr(inode, bindex,
+{
+ int err;
+ unsigned int gen, igflags;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct inode *h_inode, *h_dinode;
+ struct dentry *h_dentry;
+
+
+ err = 1;
+ ii_write_lock_new_child(inode);
-+ h_dentry = au_h_dptr(dentry, au_dbstart(dentry));
++ h_dentry = au_h_dptr(dentry, au_dbtop(dentry));
+ h_dinode = d_inode(h_dentry);
-+ bend = au_ibend(inode);
-+ for (bindex = au_ibstart(inode); bindex <= bend; bindex++) {
++ bbot = au_ibbot(inode);
++ for (bindex = au_ibtop(inode); bindex <= bbot; bindex++) {
+ h_inode = au_h_iptr(inode, bindex);
+ if (!h_inode || h_inode != h_dinode)
+ continue;
+ struct mutex *mtx;
+ ino_t h_ino, ino;
+ int err;
-+ aufs_bindex_t bstart;
++ aufs_bindex_t btop;
+
+ sb = dentry->d_sb;
-+ bstart = au_dbstart(dentry);
-+ h_dentry = au_h_dptr(dentry, bstart);
++ btop = au_dbtop(dentry);
++ h_dentry = au_h_dptr(dentry, btop);
+ h_inode = d_inode(h_dentry);
+ h_ino = h_inode->i_ino;
+
+ */
+ mtx = NULL;
+ if (!d_is_dir(h_dentry))
-+ mtx = &au_sbr(sb, bstart)->br_xino.xi_nondir_mtx;
++ mtx = &au_sbr(sb, btop)->br_xino.xi_nondir_mtx;
+
+new_ino:
+ if (mtx)
+ mutex_lock(mtx);
-+ err = au_xino_read(sb, bstart, h_ino, &ino);
++ err = au_xino_read(sb, btop, h_ino, &ino);
+ inode = ERR_PTR(err);
+ if (unlikely(err))
+ goto out;
+
+ AuDbg("%lx, new %d\n", inode->i_state, !!(inode->i_state & I_NEW));
+ if (inode->i_state & I_NEW) {
-+ /* verbose coding for lock class name */
-+ if (unlikely(d_is_symlink(h_dentry)))
-+ au_rw_class(&au_ii(inode)->ii_rwsem,
-+ au_lc_key + AuLcSymlink_IIINFO);
-+ else if (unlikely(d_is_dir(h_dentry)))
-+ au_rw_class(&au_ii(inode)->ii_rwsem,
-+ au_lc_key + AuLcDir_IIINFO);
-+ else /* likely */
-+ au_rw_class(&au_ii(inode)->ii_rwsem,
-+ au_lc_key + AuLcNonDir_IIINFO);
-+
+ ii_write_lock_new_child(inode);
+ err = set_inode(inode, dentry);
+ if (!err) {
+ atomic_inc(&inode->i_count);
+ iget_failed(inode);
+ ii_write_unlock(inode);
-+ au_xino_write(sb, bstart, h_ino, /*ino*/0);
++ au_xino_write(sb, btop, h_ino, /*ino*/0);
+ /* ignore this error */
+ goto out_iput;
+ } else if (!must_new && !IS_DEADDIR(inode) && inode->i_nlink) {
+ if (unlikely(au_test_fs_unique_ino(h_inode)))
+ AuWarn1("Warning: Un-notified UDBA or repeatedly renamed dir,"
+ " b%d, %s, %pd, hi%lu, i%lu.\n",
-+ bstart, au_sbtype(h_dentry->d_sb), dentry,
++ btop, au_sbtype(h_dentry->d_sb), dentry,
+ (unsigned long)h_ino, (unsigned long)ino);
+ ino = 0;
-+ err = au_xino_write(sb, bstart, h_ino, /*ino*/0);
++ err = au_xino_write(sb, btop, h_ino, /*ino*/0);
+ if (!err) {
+ iput(inode);
+ if (mtx)
+ /* pseudo-link after flushed may happen out of bounds */
+ if (!err
+ && inode
-+ && au_ibstart(inode) <= bindex
-+ && bindex <= au_ibend(inode)) {
++ && au_ibtop(inode) <= bindex
++ && bindex <= au_ibbot(inode)) {
+ /*
+ * permission check is unnecessary since vfsub routine
+ * will be called later
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,685 @@
++++ linux/fs/aufs/inode.h 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,694 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+ struct super_block *ii_hsb1; /* no get/put */
+
+ struct au_rwsem ii_rwsem;
-+ aufs_bindex_t ii_bstart, ii_bend;
++ aufs_bindex_t ii_btop, ii_bbot;
+ __u32 ii_higen;
+ struct au_hinode *ii_hinode;
+ struct au_vdir *ii_vdir;
+struct au_icntnr {
+ struct au_iinfo iinfo;
+ struct inode vfs_inode;
++ struct hlist_node plink;
+} ____cacheline_aligned_in_smp;
+
+/* au_pin flags */
+void au_pin_hdir_unlock(struct au_pin *p);
+int au_pin_hdir_lock(struct au_pin *p);
+int au_pin_hdir_relock(struct au_pin *p);
-+void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task);
+void au_pin_hdir_acquire_nest(struct au_pin *p);
+void au_pin_hdir_release(struct au_pin *p);
+
+
+static inline struct au_iinfo *au_ii(struct inode *inode)
+{
-+ struct au_iinfo *iinfo;
-+
-+ iinfo = &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo);
-+ if (iinfo->ii_hinode)
-+ return iinfo;
-+ return NULL; /* debugging bad_inode case */
++ BUG_ON(is_bad_inode(inode));
++ return &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo);
+}
+
+/* ---------------------------------------------------------------------- */
+void au_update_ibrange(struct inode *inode, int do_put_zero);
+
+void au_icntnr_init_once(void *_c);
++void au_hinode_init(struct au_hinode *hinode);
+int au_iinfo_init(struct inode *inode);
+void au_iinfo_fin(struct inode *inode);
-+int au_ii_realloc(struct au_iinfo *iinfo, int nbr);
++int au_hinode_realloc(struct au_iinfo *iinfo, int nbr);
+
+#ifdef CONFIG_PROC_FS
+/* plink.c */
+int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags,
+ unsigned int verbose);
+ssize_t aufs_listxattr(struct dentry *dentry, char *list, size_t size);
-+ssize_t aufs_getxattr(struct dentry *dentry, const char *name, void *value,
-+ size_t size);
-+int aufs_setxattr(struct dentry *dentry, const char *name, const void *value,
-+ size_t size, int flags);
++ssize_t aufs_getxattr(struct dentry *dentry, struct inode *inode,
++ const char *name, void *value, size_t size);
++int aufs_setxattr(struct dentry *dentry, struct inode *inode, const char *name,
++ const void *value, size_t size, int flags);
+int aufs_removexattr(struct dentry *dentry, const char *name);
+
+/* void au_xattr_init(struct super_block *sb); */
+ } acl_set;
+ } u;
+};
-+ssize_t au_srxattr(struct dentry *dentry, struct au_srxattr *arg);
++ssize_t au_srxattr(struct dentry *dentry, struct inode *inode,
++ struct au_srxattr *arg);
+#endif
+
+/* ---------------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------------- */
+
++static inline struct au_hinode *au_hinode(struct au_iinfo *iinfo,
++ aufs_bindex_t bindex)
++{
++ return iinfo->ii_hinode + bindex;
++}
++
++static inline int au_is_bad_inode(struct inode *inode)
++{
++ return !!(is_bad_inode(inode) || !au_hinode(au_ii(inode), 0));
++}
++
+static inline aufs_bindex_t au_ii_br_id(struct inode *inode,
+ aufs_bindex_t bindex)
+{
+ IiMustAnyLock(inode);
-+ return au_ii(inode)->ii_hinode[0 + bindex].hi_id;
++ return au_hinode(au_ii(inode), bindex)->hi_id;
+}
+
-+static inline aufs_bindex_t au_ibstart(struct inode *inode)
++static inline aufs_bindex_t au_ibtop(struct inode *inode)
+{
+ IiMustAnyLock(inode);
-+ return au_ii(inode)->ii_bstart;
++ return au_ii(inode)->ii_btop;
+}
+
-+static inline aufs_bindex_t au_ibend(struct inode *inode)
++static inline aufs_bindex_t au_ibbot(struct inode *inode)
+{
+ IiMustAnyLock(inode);
-+ return au_ii(inode)->ii_bend;
++ return au_ii(inode)->ii_bbot;
+}
+
+static inline struct au_vdir *au_ivdir(struct inode *inode)
+static inline struct dentry *au_hi_wh(struct inode *inode, aufs_bindex_t bindex)
+{
+ IiMustAnyLock(inode);
-+ return au_ii(inode)->ii_hinode[0 + bindex].hi_whdentry;
++ return au_hinode(au_ii(inode), bindex)->hi_whdentry;
+}
+
-+static inline void au_set_ibstart(struct inode *inode, aufs_bindex_t bindex)
++static inline void au_set_ibtop(struct inode *inode, aufs_bindex_t bindex)
+{
+ IiMustWriteLock(inode);
-+ au_ii(inode)->ii_bstart = bindex;
++ au_ii(inode)->ii_btop = bindex;
+}
+
-+static inline void au_set_ibend(struct inode *inode, aufs_bindex_t bindex)
++static inline void au_set_ibbot(struct inode *inode, aufs_bindex_t bindex)
+{
+ IiMustWriteLock(inode);
-+ au_ii(inode)->ii_bend = bindex;
++ au_ii(inode)->ii_bbot = bindex;
+}
+
+static inline void au_set_ivdir(struct inode *inode, struct au_vdir *vdir)
+static inline struct au_hinode *au_hi(struct inode *inode, aufs_bindex_t bindex)
+{
+ IiMustAnyLock(inode);
-+ return au_ii(inode)->ii_hinode + bindex;
++ return au_hinode(au_ii(inode), bindex);
+}
+
+/* ---------------------------------------------------------------------- */
+ au_hn_ctl(hdir, /*do_set*/1);
+}
+
-+static inline void au_hn_imtx_lock(struct au_hinode *hdir)
++static inline void au_hn_inode_lock(struct au_hinode *hdir)
+{
+ inode_lock(hdir->hi_inode);
+ au_hn_suspend(hdir);
+}
+
-+static inline void au_hn_imtx_lock_nested(struct au_hinode *hdir,
++static inline void au_hn_inode_lock_nested(struct au_hinode *hdir,
+ unsigned int sc __maybe_unused)
+{
+ inode_lock_nested(hdir->hi_inode, sc);
+ au_hn_suspend(hdir);
+}
+
-+static inline void au_hn_imtx_unlock(struct au_hinode *hdir)
++static inline void au_hn_inode_unlock(struct au_hinode *hdir)
+{
+ au_hn_resume(hdir);
+ inode_unlock(hdir->hi_inode);
+#endif /* __AUFS_INODE_H__ */
diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
--- /usr/share/empty/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/ioctl.c 2016-07-25 19:05:34.814493242 +0200
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+static int au_wbr_fd(struct path *path, struct aufs_wbr_fd __user *arg)
+{
+ int err, fd;
-+ aufs_bindex_t wbi, bindex, bend;
++ aufs_bindex_t wbi, bindex, bbot;
+ struct file *h_file;
+ struct super_block *sb;
+ struct dentry *root;
+ sb = path->dentry->d_sb;
+ root = sb->s_root;
+ aufs_read_lock(root, AuLock_IR);
-+ bend = au_sbend(sb);
++ bbot = au_sbbot(sb);
+ if (wbrfd.brid >= 0) {
+ wbi = au_br_index(sb, wbrfd.brid);
-+ if (unlikely(wbi < 0 || wbi > bend))
++ if (unlikely(wbi < 0 || wbi > bbot))
+ goto out_unlock;
+ }
+
+
+ bindex = wbi + 1;
+ wbi = -1;
-+ for (; bindex <= bend; bindex++) {
++ for (; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ if (au_br_writable(br->br_perm)) {
+ wbi = bindex;
+ if (IS_ERR(h_file))
+ goto out_fd;
+
-+ atomic_dec(&br->br_count); /* cf. au_h_open() */
++ au_br_put(br); /* cf. au_h_open() */
+ fd_install(fd, h_file);
+ err = fd;
+ goto out; /* success */
+#endif
diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
--- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,932 @@
++++ linux/fs/aufs/i_op_add.c 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,924 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+
+ h_parent = au_pinned_h_parent(pin);
+ if (udba != AuOpt_UDBA_NONE
-+ && au_dbstart(dentry) == bcpup)
++ && au_dbtop(dentry) == bcpup)
+ err = au_may_add(dentry, bcpup, h_parent,
+ au_ftest_wrdir(wr_dir_args->flags, ISDIR));
+ else if (unlikely(dentry->d_name.len > AUFS_MAX_NAMELEN))
+ struct simple_arg *arg)
+{
+ int err, rerr;
-+ aufs_bindex_t bstart;
++ aufs_bindex_t btop;
+ unsigned char created;
+ const unsigned char try_aopen
+ = (arg->type == Creat && arg->u.c.try_aopen);
+ if (IS_ERR(wh_dentry))
+ goto out_parent;
+
-+ bstart = au_dbstart(dentry);
++ btop = au_dbtop(dentry);
+ sb = dentry->d_sb;
-+ br = au_sbr(sb, bstart);
-+ a->h_path.dentry = au_h_dptr(dentry, bstart);
++ br = au_sbr(sb, btop);
++ a->h_path.dentry = au_h_dptr(dentry, btop);
+ a->h_path.mnt = au_br_mnt(br);
+ h_dir = au_pinned_h_dir(&a->pin);
+ switch (arg->type) {
+ }
+ created = !err;
+ if (!err)
-+ err = epilog(dir, bstart, wh_dentry, dentry);
++ err = epilog(dir, btop, wh_dentry, dentry);
+
+ /* revert */
+ if (unlikely(created && err && d_is_positive(a->h_path.dentry))) {
+ di_write_unlock(parent);
+out_unlock:
+ if (unlikely(err)) {
-+ au_update_dbstart(dentry);
++ au_update_dbtop(dentry);
+ d_drop(dentry);
+ }
+ if (!try_aopen)
+ if (unlikely(err))
+ goto out_parent;
+
-+ bindex = au_dbstart(parent);
-+ au_set_dbstart(dentry, bindex);
-+ au_set_dbend(dentry, bindex);
++ bindex = au_dbtop(parent);
++ au_set_dbtop(dentry, bindex);
++ au_set_dbbot(dentry, bindex);
+ err = au_wr_dir(dentry, /*src_dentry*/NULL, &wr_dir_args);
+ bindex = err;
+ if (unlikely(err < 0))
+ if (unlikely(err))
+ goto out_dentry;
+
-+ au_set_dbstart(dentry, bindex);
-+ au_set_dbend(dentry, bindex);
++ au_set_dbtop(dentry, bindex);
++ au_set_dbbot(dentry, bindex);
+ au_set_h_dptr(dentry, bindex, dget(h_dentry));
+ inode = au_new_inode(dentry, /*must_new*/1);
+ if (IS_ERR(inode)) {
+ err = PTR_ERR(inode);
+ au_set_h_dptr(dentry, bindex, NULL);
-+ au_set_dbstart(dentry, -1);
-+ au_set_dbend(dentry, -1);
++ au_set_dbtop(dentry, -1);
++ au_set_dbbot(dentry, -1);
+ } else {
+ if (!inode->i_nlink)
+ set_nlink(inode, 1);
+ au_di(dentry)->di_tmpfile = 1;
+
+ /* update without i_mutex */
-+ if (au_ibstart(dir) == au_dbstart(dentry))
++ if (au_ibtop(dir) == au_dbtop(dentry))
+ au_cpup_attr_timesizes(dir);
+ }
+
+ di_write_unlock(parent);
+ dput(parent);
+ di_write_unlock(dentry);
-+ if (!err)
-+#if 0
-+ /* verbose coding for lock class name */
-+ au_rw_class(&au_di(dentry)->di_rwsem,
-+ au_lc_key + AuLcNonDir_DIINFO);
-+#else
-+ ;
-+#endif
-+ else {
++ if (unlikely(err)) {
+ au_di_fin(dentry);
+ dentry->d_fsdata = NULL;
+ }
+{
+ int err;
+ unsigned char plink;
-+ aufs_bindex_t bend;
++ aufs_bindex_t bbot;
+ struct dentry *h_src_dentry;
+ struct inode *h_inode, *inode, *delegated;
+ struct super_block *sb;
+ h_inode = NULL;
+ sb = src_dentry->d_sb;
+ inode = d_inode(src_dentry);
-+ if (au_ibstart(inode) <= a->bdst)
++ if (au_ibtop(inode) <= a->bdst)
+ h_inode = au_h_iptr(inode, a->bdst);
+ if (!h_inode || !h_inode->i_nlink) {
+ /* copyup src_dentry as the name of dentry. */
-+ bend = au_dbend(dentry);
-+ if (bend < a->bsrc)
-+ au_set_dbend(dentry, a->bsrc);
++ bbot = au_dbbot(dentry);
++ if (bbot < a->bsrc)
++ au_set_dbbot(dentry, a->bsrc);
+ au_set_h_dptr(dentry, a->bsrc,
+ dget(au_h_dptr(src_dentry, a->bsrc)));
+ dget(a->h_path.dentry);
+ spin_unlock(&dentry->d_lock);
+ AuDbg("temporary d_inode...done\n");
+ au_set_h_dptr(dentry, a->bsrc, NULL);
-+ au_set_dbend(dentry, bend);
++ au_set_dbbot(dentry, bbot);
+ } else {
+ /* the inode of src_dentry already exists on a.bdst branch */
+ h_src_dentry = d_find_alias(h_inode);
+ goto out_unlock;
+
+ a->src_parent = dget_parent(src_dentry);
-+ wr_dir_args.force_btgt = au_ibstart(inode);
++ wr_dir_args.force_btgt = au_ibtop(inode);
+
+ di_write_lock_parent(a->parent);
+ wr_dir_args.force_btgt = au_wbr(dentry, wr_dir_args.force_btgt);
+
+ err = 0;
+ sb = dentry->d_sb;
-+ a->bdst = au_dbstart(dentry);
++ a->bdst = au_dbtop(dentry);
+ a->h_path.dentry = au_h_dptr(dentry, a->bdst);
+ a->h_path.mnt = au_sbr_mnt(sb, a->bdst);
-+ a->bsrc = au_ibstart(inode);
++ a->bsrc = au_ibtop(inode);
+ h_src_dentry = au_h_d_alias(src_dentry, a->bsrc);
+ if (!h_src_dentry && au_di(src_dentry)->di_tmpfile)
+ h_src_dentry = dget(au_hi_wh(inode, a->bsrc));
+ if (!h_src_dentry) {
-+ a->bsrc = au_dbstart(src_dentry);
++ a->bsrc = au_dbtop(src_dentry);
+ h_src_dentry = au_h_d_alias(src_dentry, a->bsrc);
+ AuDebugOn(!h_src_dentry);
+ } else if (IS_ERR(h_src_dentry)) {
+ dput(a->src_parent);
+out_unlock:
+ if (unlikely(err)) {
-+ au_update_dbstart(dentry);
++ au_update_dbtop(dentry);
+ d_drop(dentry);
+ }
+ aufs_read_and_write_unlock2(dentry, src_dentry);
+ goto out_parent;
+
+ sb = dentry->d_sb;
-+ bindex = au_dbstart(dentry);
++ bindex = au_dbtop(dentry);
+ h_path.dentry = au_h_dptr(dentry, bindex);
+ h_path.mnt = au_sbr_mnt(sb, bindex);
+ err = vfsub_mkdir(au_pinned_h_dir(&a->pin), &h_path, mode);
+ di_write_unlock(parent);
+out_unlock:
+ if (unlikely(err)) {
-+ au_update_dbstart(dentry);
++ au_update_dbtop(dentry);
+ d_drop(dentry);
+ }
+ aufs_read_unlock(dentry, AuLock_DW);
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,1419 @@
++++ linux/fs/aufs/i_op.c 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,1414 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+static int aufs_permission(struct inode *inode, int mask)
+{
+ int err;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ const unsigned char isdir = !!S_ISDIR(inode->i_mode),
+ write_mask = !!(mask & (MAY_WRITE | MAY_APPEND));
+ struct inode *h_inode;
+ || write_mask
+ || au_opt_test(au_mntflags(sb), DIRPERM1)) {
+ err = au_busy_or_stale();
-+ h_inode = au_h_iptr(inode, au_ibstart(inode));
++ h_inode = au_h_iptr(inode, au_ibtop(inode));
+ if (unlikely(!h_inode
+ || (h_inode->i_mode & S_IFMT)
+ != (inode->i_mode & S_IFMT)))
+ goto out;
+
+ err = 0;
-+ bindex = au_ibstart(inode);
++ bindex = au_ibtop(inode);
+ br = au_sbr(sb, bindex);
+ err = h_permission(h_inode, mask, &br->br_path, br->br_perm);
+ if (write_mask
+
+ /* non-write to dir */
+ err = 0;
-+ bend = au_ibend(inode);
-+ for (bindex = au_ibstart(inode); !err && bindex <= bend; bindex++) {
++ bbot = au_ibbot(inode);
++ for (bindex = au_ibtop(inode); !err && bindex <= bbot; bindex++) {
+ h_inode = au_h_iptr(inode, bindex);
+ if (h_inode) {
+ err = au_busy_or_stale();
+ if (!err)
+ err = au_digen_test(parent, au_sigen(sb));
+ if (!err) {
-+ npositive = au_lkup_dentry(dentry, au_dbstart(parent),
-+ /*type*/0);
++ /* regardless LOOKUP_CREATE, always ALLOW_NEG */
++ npositive = au_lkup_dentry(dentry, au_dbtop(parent),
++ AuLkup_ALLOW_NEG);
+ err = npositive;
+ }
+ di_read_unlock(parent, AuLock_IR);
+
+out_unlock:
+ di_write_unlock(dentry);
-+ if (inode) {
-+ /* verbose coding for lock class name */
-+ if (unlikely(S_ISLNK(inode->i_mode)))
-+ au_rw_class(&au_di(dentry)->di_rwsem,
-+ au_lc_key + AuLcSymlink_DIINFO);
-+ else if (unlikely(S_ISDIR(inode->i_mode)))
-+ au_rw_class(&au_di(dentry)->di_rwsem,
-+ au_lc_key + AuLcDir_DIINFO);
-+ else /* likely */
-+ au_rw_class(&au_di(dentry)->di_rwsem,
-+ au_lc_key + AuLcNonDir_DIINFO);
-+ }
+out_si:
+ si_read_unlock(sb);
+out:
+ umode_t create_mode, int *opened)
+{
+ int err, h_opened = *opened;
++ unsigned int lkup_flags;
+ struct dentry *parent;
+ struct dentry *d;
+ struct au_sphlhead *aopen;
+ };
+
+ IMustLock(dir);
-+ AuDbg("open_flag 0x%x\n", open_flag);
++ AuDbg("open_flag 0%o\n", open_flag);
+ AuDbgDentry(dentry);
+
+ err = 0;
+ if (!au_di(dentry)) {
-+ d = aufs_lookup(dir, dentry, /*flags*/0);
++ lkup_flags = LOOKUP_OPEN;
++ if (open_flag & O_CREAT)
++ lkup_flags |= LOOKUP_CREATE;
++ d = aufs_lookup(dir, dentry, lkup_flags);
+ if (IS_ERR(d)) {
+ err = PTR_ERR(d);
++ AuTraceErr(err);
+ goto out;
+ } else if (d) {
+ /*
+ * another error will be returned later.
+ */
+ d_drop(d);
-+ dput(d);
+ AuDbgDentry(d);
++ dput(d);
+ }
+ AuDbgDentry(dentry);
+ }
+
+ parent = dentry->d_parent; /* dir is locked */
+ di_write_lock_parent(parent);
-+ err = au_lkup_dentry(dentry, /*bstart*/0, /*type*/0);
++ err = au_lkup_dentry(dentry, /*btop*/0, AuLkup_ALLOW_NEG);
+ if (unlikely(err))
+ goto out_unlock;
+
+
+static int au_wr_dir_cpup(struct dentry *dentry, struct dentry *parent,
+ const unsigned char add_entry, aufs_bindex_t bcpup,
-+ aufs_bindex_t bstart)
++ aufs_bindex_t btop)
+{
+ int err;
+ struct dentry *h_parent;
+
+ err = 0;
+ if (!au_h_dptr(parent, bcpup)) {
-+ if (bstart > bcpup)
++ if (btop > bcpup)
+ err = au_cpup_dirs(dentry, bcpup);
-+ else if (bstart < bcpup)
++ else if (btop < bcpup)
+ err = au_cpdown_dirs(dentry, bcpup);
+ else
+ BUG();
+ AuDbg("bcpup %d\n", bcpup);
+ if (!err) {
+ if (d_really_is_negative(dentry))
-+ au_set_h_dptr(dentry, bstart, NULL);
++ au_set_h_dptr(dentry, btop, NULL);
+ au_update_dbrange(dentry, /*do_put_zero*/0);
+ }
+ }
+{
+ int err;
+ unsigned int flags;
-+ aufs_bindex_t bcpup, bstart, src_bstart;
++ aufs_bindex_t bcpup, btop, src_btop;
+ const unsigned char add_entry
+ = au_ftest_wrdir(args->flags, ADD_ENTRY)
+ | au_ftest_wrdir(args->flags, TMPFILE);
+ sb = dentry->d_sb;
+ sbinfo = au_sbi(sb);
+ parent = dget_parent(dentry);
-+ bstart = au_dbstart(dentry);
-+ bcpup = bstart;
++ btop = au_dbtop(dentry);
++ bcpup = btop;
+ if (args->force_btgt < 0) {
+ if (src_dentry) {
-+ src_bstart = au_dbstart(src_dentry);
-+ if (src_bstart < bstart)
-+ bcpup = src_bstart;
++ src_btop = au_dbtop(src_dentry);
++ if (src_btop < btop)
++ bcpup = src_btop;
+ } else if (add_entry) {
+ flags = 0;
+ if (au_ftest_wrdir(args->flags, ISDIR))
+ AuDebugOn(au_test_ro(sb, bcpup, d_inode(dentry)));
+ }
+
-+ AuDbg("bstart %d, bcpup %d\n", bstart, bcpup);
++ AuDbg("btop %d, bcpup %d\n", btop, bcpup);
+ err = bcpup;
-+ if (bcpup == bstart)
++ if (bcpup == btop)
+ goto out; /* success */
+
+ /* copyup the new parent into the branch we process */
-+ err = au_wr_dir_cpup(dentry, parent, add_entry, bcpup, bstart);
++ err = au_wr_dir_cpup(dentry, parent, add_entry, bcpup, btop);
+ if (err >= 0) {
+ if (d_really_is_negative(dentry)) {
-+ au_set_h_dptr(dentry, bstart, NULL);
-+ au_set_dbstart(dentry, bcpup);
-+ au_set_dbend(dentry, bcpup);
++ au_set_h_dptr(dentry, btop, NULL);
++ au_set_dbtop(dentry, bcpup);
++ au_set_dbbot(dentry, bcpup);
+ }
+ AuDebugOn(add_entry
+ && !au_ftest_wrdir(args->flags, TMPFILE)
+void au_pin_hdir_unlock(struct au_pin *p)
+{
+ if (p->hdir)
-+ au_hn_imtx_unlock(p->hdir);
++ au_hn_inode_unlock(p->hdir);
+}
+
+int au_pin_hdir_lock(struct au_pin *p)
+ goto out;
+
+ /* even if an error happens later, keep this lock */
-+ au_hn_imtx_lock_nested(p->hdir, p->lsc_hi);
++ au_hn_inode_lock_nested(p->hdir, p->lsc_hi);
+
+ err = -EBUSY;
+ if (unlikely(p->hdir->hi_inode != d_inode(p->h_parent)))
+ return err;
+}
+
-+void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task)
++static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task)
+{
-+#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
-+ p->hdir->hi_inode->i_mutex.owner = task;
++#if !defined(CONFIG_RWSEM_GENERIC_SPINLOCK) && defined(CONFIG_RWSEM_SPIN_ON_OWNER)
++ p->hdir->hi_inode->i_rwsem.owner = task;
+#endif
+}
+
+void au_pin_hdir_acquire_nest(struct au_pin *p)
+{
+ if (p->hdir) {
-+ mutex_acquire_nest(&p->hdir->hi_inode->i_mutex.dep_map,
++ rwsem_acquire_nest(&p->hdir->hi_inode->i_rwsem.dep_map,
+ p->lsc_hi, 0, NULL, _RET_IP_);
+ au_pin_hdir_set_owner(p, current);
+ }
+{
+ if (p->hdir) {
+ au_pin_hdir_set_owner(p, p->task);
-+ mutex_release(&p->hdir->hi_inode->i_mutex.dep_map, 1, _RET_IP_);
++ rwsem_release(&p->hdir->hi_inode->i_rwsem.dep_map, 1, _RET_IP_);
+ }
+}
+
+ }
+
+ p->h_dentry = NULL;
-+ if (p->bindex <= au_dbend(p->dentry))
++ if (p->bindex <= au_dbbot(p->dentry))
+ p->h_dentry = au_h_dptr(p->dentry, p->bindex);
+
+ p->parent = dget_parent(p->dentry);
+{
+ int err;
+ loff_t sz;
-+ aufs_bindex_t bstart, ibstart;
++ aufs_bindex_t btop, ibtop;
+ struct dentry *hi_wh, *parent;
+ struct inode *inode;
+ struct au_wr_dir_args wr_dir_args = {
+ if (d_is_dir(dentry))
+ au_fset_wrdir(wr_dir_args.flags, ISDIR);
+ /* plink or hi_wh() case */
-+ bstart = au_dbstart(dentry);
++ btop = au_dbtop(dentry);
+ inode = d_inode(dentry);
-+ ibstart = au_ibstart(inode);
-+ if (bstart != ibstart && !au_test_ro(inode->i_sb, ibstart, inode))
-+ wr_dir_args.force_btgt = ibstart;
++ ibtop = au_ibtop(inode);
++ if (btop != ibtop && !au_test_ro(inode->i_sb, ibtop, inode))
++ wr_dir_args.force_btgt = ibtop;
+ err = au_wr_dir(dentry, /*src_dentry*/NULL, &wr_dir_args);
+ if (unlikely(err < 0))
+ goto out;
+ a->btgt = err;
-+ if (err != bstart)
++ if (err != btop)
+ au_fset_icpup(a->flags, DID_CPUP);
+
+ err = 0;
+ if (unlikely(err))
+ goto out_parent;
+
-+ a->h_path.dentry = au_h_dptr(dentry, bstart);
+ sz = -1;
++ a->h_path.dentry = au_h_dptr(dentry, btop);
+ a->h_inode = d_inode(a->h_path.dentry);
+ if (ia && (ia->ia_valid & ATTR_SIZE)) {
+ inode_lock_nested(a->h_inode, AuLsc_I_CHILD);
+ struct au_cp_generic cpg = {
+ .dentry = dentry,
+ .bdst = a->btgt,
-+ .bsrc = bstart,
++ .bsrc = btop,
+ .len = sz,
+ .pin = &a->pin,
+ .flags = AuCpup_DTIME | AuCpup_HOPEN
+ inode_unlock(a->h_inode);
+ au_unpin(&a->pin);
+ if (unlikely(err))
-+ au_update_dbstart(dentry);
++ au_update_dbtop(dentry);
+out_dentry:
+ di_write_unlock(dentry);
+ if (file) {
+ return err;
+}
+
-+ssize_t au_srxattr(struct dentry *dentry, struct au_srxattr *arg)
++ssize_t au_srxattr(struct dentry *dentry, struct inode *inode,
++ struct au_srxattr *arg)
+{
+ int err;
+ struct path h_path;
+ struct super_block *sb;
+ struct au_icpup_args *a;
-+ struct inode *inode, *h_inode;
++ struct inode *h_inode;
+
-+ inode = d_inode(dentry);
+ IMustLock(inode);
+
+ err = -ENOMEM;
+ inode_unlock(a->h_inode);
+ switch (arg->type) {
+ case AU_XATTR_SET:
++ AuDebugOn(d_is_negative(h_path.dentry));
+ err = vfsub_setxattr(h_path.dentry,
+ arg->u.set.name, arg->u.set.value,
+ arg->u.set.size, arg->u.set.flags);
+
+ au_unpin(&a->pin);
+ if (unlikely(err))
-+ au_update_dbstart(dentry);
++ au_update_dbtop(dentry);
+
+out_di:
+ di_write_unlock(dentry);
+ di_read_lock_child(dentry, AuLock_IR);
+
+ inode = d_inode(dentry);
-+ bindex = au_ibstart(inode);
++ bindex = au_ibtop(inode);
+ h_path->mnt = au_sbr_mnt(sb, bindex);
+ h_sb = h_path->mnt->mnt_sb;
+ if (!force
+ && udba_none)
+ goto out; /* success */
+
-+ if (au_dbstart(dentry) == bindex)
++ if (au_dbtop(dentry) == bindex)
+ h_path->dentry = au_h_dptr(dentry, bindex);
+ else if (au_opt_test(mnt_flags, PLINK) && au_plink_test(inode)) {
+ h_path->dentry = au_plink_lkup(inode, bindex);
+
+ err = -EINVAL;
+ inode = d_inode(dentry);
-+ bindex = au_ibstart(inode);
++ bindex = au_ibtop(inode);
+ h_inode = au_h_iptr(inode, bindex);
+ if (unlikely(!h_inode->i_op->get_link))
+ goto out_unlock;
+
+ err = -EBUSY;
+ h_dentry = NULL;
-+ if (au_dbstart(dentry) <= bindex) {
++ if (au_dbtop(dentry) <= bindex) {
+ h_dentry = au_h_dptr(dentry, bindex);
+ if (h_dentry)
+ dget(h_dentry);
+ si_read_lock(sb, AuLock_FLUSH);
+ ii_write_lock_child(inode);
+ lockdep_on();
-+ h_inode = au_h_iptr(inode, au_ibstart(inode));
++ h_inode = au_h_iptr(inode, au_ibtop(inode));
+ err = vfsub_update_time(h_inode, ts, flags);
+ lockdep_off();
+ if (!err)
+};
diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
--- /usr/share/empty/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_del.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,510 @@
++++ linux/fs/aufs/i_op_del.c 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,511 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup)
+{
+ int need_wh, err;
-+ aufs_bindex_t bstart;
++ aufs_bindex_t btop;
+ struct super_block *sb;
+
+ sb = dentry->d_sb;
-+ bstart = au_dbstart(dentry);
++ btop = au_dbtop(dentry);
+ if (*bcpup < 0) {
-+ *bcpup = bstart;
-+ if (au_test_ro(sb, bstart, d_inode(dentry))) {
++ *bcpup = btop;
++ if (au_test_ro(sb, btop, d_inode(dentry))) {
+ err = AuWbrCopyup(au_sbi(sb), dentry);
+ *bcpup = err;
+ if (unlikely(err < 0))
+ goto out;
+ }
+ } else
-+ AuDebugOn(bstart < *bcpup
++ AuDebugOn(btop < *bcpup
+ || au_test_ro(sb, *bcpup, d_inode(dentry)));
-+ AuDbg("bcpup %d, bstart %d\n", *bcpup, bstart);
++ AuDbg("bcpup %d, btop %d\n", *bcpup, btop);
+
-+ if (*bcpup != bstart) {
++ if (*bcpup != btop) {
+ err = au_cpup_dirs(dentry, *bcpup);
+ if (unlikely(err))
+ goto out;
+ au_di_cp(tmp, dinfo);
+ au_di_swap(tmp, dinfo);
+ /* returns the number of positive dentries */
-+ need_wh = au_lkup_dentry(dentry, bstart + 1, /*type*/0);
++ need_wh = au_lkup_dentry(dentry, btop + 1,
++ /* AuLkup_IGNORE_PERM */ 0);
+ au_di_swap(tmp, dinfo);
+ au_rw_write_unlock(&tmp->di_rwsem);
+ au_di_free(tmp);
+
+ h_path.dentry = au_pinned_h_parent(pin);
+ if (udba != AuOpt_UDBA_NONE
-+ && au_dbstart(dentry) == bcpup) {
++ && au_dbtop(dentry) == bcpup) {
+ err = au_may_del(dentry, bcpup, h_path.dentry, isdir);
+ wh_dentry = ERR_PTR(err);
+ if (unlikely(err))
+int aufs_unlink(struct inode *dir, struct dentry *dentry)
+{
+ int err;
-+ aufs_bindex_t bwh, bindex, bstart;
++ aufs_bindex_t bwh, bindex, btop;
+ struct inode *inode, *h_dir, *delegated;
+ struct dentry *parent, *wh_dentry;
+ /* to reuduce stack size */
+ if (unlikely(d_is_dir(dentry)))
+ goto out_unlock; /* possible? */
+
-+ bstart = au_dbstart(dentry);
++ btop = au_dbtop(dentry);
+ bwh = au_dbwh(dentry);
+ bindex = -1;
+ parent = dentry->d_parent; /* dir inode is locked */
+ if (IS_ERR(wh_dentry))
+ goto out_parent;
+
-+ a->h_path.mnt = au_sbr_mnt(dentry->d_sb, bstart);
-+ a->h_path.dentry = au_h_dptr(dentry, bstart);
++ a->h_path.mnt = au_sbr_mnt(dentry->d_sb, btop);
++ a->h_path.dentry = au_h_dptr(dentry, btop);
+ dget(a->h_path.dentry);
-+ if (bindex == bstart) {
++ if (bindex == btop) {
+ h_dir = au_pinned_h_dir(&a->pin);
+ delegated = NULL;
+ err = vfsub_unlink(h_dir, &a->h_path, &delegated, /*force*/0);
+ epilog(dir, dentry, bindex);
+
+ /* update target timestamps */
-+ if (bindex == bstart) {
++ if (bindex == btop) {
+ vfsub_update_h_iattr(&a->h_path, /*did*/NULL);
+ /*ignore*/
+ inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime;
+int aufs_rmdir(struct inode *dir, struct dentry *dentry)
+{
+ int err, rmdir_later;
-+ aufs_bindex_t bwh, bindex, bstart;
++ aufs_bindex_t bwh, bindex, btop;
+ struct inode *inode;
+ struct dentry *parent, *wh_dentry, *h_dentry;
+ struct au_whtmp_rmdir *args;
+ if (unlikely(err))
+ goto out_parent;
+
-+ bstart = au_dbstart(dentry);
++ btop = au_dbtop(dentry);
+ bwh = au_dbwh(dentry);
+ bindex = -1;
+ wh_dentry = lock_hdir_create_wh(dentry, /*isdir*/1, &bindex, &a->dt,
+ if (IS_ERR(wh_dentry))
+ goto out_parent;
+
-+ h_dentry = au_h_dptr(dentry, bstart);
++ h_dentry = au_h_dptr(dentry, btop);
+ dget(h_dentry);
+ rmdir_later = 0;
-+ if (bindex == bstart) {
-+ err = renwh_and_rmdir(dentry, bstart, &args->whlist, dir);
++ if (bindex == btop) {
++ err = renwh_and_rmdir(dentry, btop, &args->whlist, dir);
+ if (err > 0) {
+ rmdir_later = err;
+ err = 0;
+ }
+ } else {
+ /* stop monitoring */
-+ au_hn_free(au_hi(inode, bstart));
++ au_hn_free(au_hi(inode, btop));
+
+ /* dir inode is locked */
+ IMustLock(d_inode(wh_dentry->d_parent));
+ epilog(dir, dentry, bindex);
+
+ if (rmdir_later) {
-+ au_whtmp_kick_rmdir(dir, bstart, h_dentry, args);
++ au_whtmp_kick_rmdir(dir, btop, h_dentry, args);
+ args = NULL;
+ }
+
+}
diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
--- /usr/share/empty/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/i_op_ren.c 2016-07-25 19:05:34.814493242 +0200
@@ -0,0 +1,1015 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ struct inode *dir, *inode;
+ struct au_hinode *hdir;
+ struct au_dtime dt[AuParentChild];
-+ aufs_bindex_t bstart;
++ aufs_bindex_t btop;
+ } sd[AuSrcDst];
+
+#define src_dentry sd[AuSRC].dentry
+#define src_hdir sd[AuSRC].hdir
+#define src_h_dir sd[AuSRC].hdir->hi_inode
+#define src_dt sd[AuSRC].dt
-+#define src_bstart sd[AuSRC].bstart
++#define src_btop sd[AuSRC].btop
+
+#define dst_dentry sd[AuDST].dentry
+#define dst_dir sd[AuDST].dir
+#define dst_hdir sd[AuDST].hdir
+#define dst_h_dir sd[AuDST].hdir->hi_inode
+#define dst_dt sd[AuDST].dt
-+#define dst_bstart sd[AuDST].bstart
++#define dst_btop sd[AuDST].btop
+
+ struct dentry *h_trap;
+ struct au_branch *br;
+{
+ int rerr;
+
-+ au_hn_imtx_lock_nested(a->src_hinode, AuLsc_I_CHILD);
++ au_hn_inode_lock_nested(a->src_hinode, AuLsc_I_CHILD);
+ rerr = au_diropq_remove(a->src_dentry, a->btgt);
-+ au_hn_imtx_unlock(a->src_hinode);
++ au_hn_inode_unlock(a->src_hinode);
+ au_set_dbdiropq(a->src_dentry, a->src_bdiropq);
+ if (rerr)
+ RevertFailure("remove diropq %pd", a->src_dentry);
+ struct inode *delegated;
+
+ d = a->src_dentry;
-+ if (au_dbstart(d) == a->btgt) {
++ if (au_dbtop(d) == a->btgt) {
+ a->h_path.dentry = a->dst_h_dentry;
+ if (au_ftest_ren(a->flags, DIROPQ)
+ && au_dbdiropq(d) == a->btgt)
+ au_fclr_ren(a->flags, DIROPQ);
-+ AuDebugOn(au_dbstart(d) != a->btgt);
++ AuDebugOn(au_dbtop(d) != a->btgt);
+ delegated = NULL;
+ err = vfsub_rename(a->src_h_dir, au_h_dptr(d, a->btgt),
+ a->dst_h_dir, &a->h_path, &delegated);
+ err = 0;
+ a->src_bdiropq = au_dbdiropq(a->src_dentry);
+ a->src_hinode = au_hi(a->src_inode, a->btgt);
-+ au_hn_imtx_lock_nested(a->src_hinode, AuLsc_I_CHILD);
++ au_hn_inode_lock_nested(a->src_hinode, AuLsc_I_CHILD);
+ diropq = au_diropq_create(a->src_dentry, a->btgt);
-+ au_hn_imtx_unlock(a->src_hinode);
++ au_hn_inode_unlock(a->src_hinode);
+ if (IS_ERR(diropq))
+ err = PTR_ERR(diropq);
+ else
+ a->dst_h_dentry = au_h_dptr(d, a->btgt);
+ }
+
-+ BUG_ON(d_is_positive(a->dst_h_dentry) && a->src_bstart != a->btgt);
++ BUG_ON(d_is_positive(a->dst_h_dentry) && a->src_btop != a->btgt);
+
+ /* rename by vfs_rename or cpup */
+ d = a->dst_dentry;
+ && (a->dst_wh_dentry
+ || au_dbdiropq(d) == a->btgt
+ /* hide the lower to keep xino */
-+ || a->btgt < au_dbend(d)
++ || a->btgt < au_dbbot(d)
+ || au_opt_test(au_mntflags(d->d_sb), ALWAYS_DIROPQ)))
+ au_fset_ren(a->flags, DIROPQ);
+ err = au_ren_or_cpup(a);
+ }
+
+ /* update target timestamps */
-+ AuDebugOn(au_dbstart(a->src_dentry) != a->btgt);
++ AuDebugOn(au_dbtop(a->src_dentry) != a->btgt);
+ a->h_path.dentry = au_h_dptr(a->src_dentry, a->btgt);
+ vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/
+ a->src_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime;
+{
+ int err;
+ unsigned int rdhash;
-+ aufs_bindex_t bstart;
++ aufs_bindex_t btop;
+
-+ bstart = au_dbstart(dentry);
-+ if (bstart != btgt) {
++ btop = au_dbtop(dentry);
++ if (btop != btgt) {
+ struct au_nhash whlist;
+
+ SiMustAnyLock(dentry->d_sb);
+ goto out;
+ }
+
-+ if (bstart == au_dbtaildir(dentry))
++ if (btop == au_dbtaildir(dentry))
+ return 0; /* success */
+
+ err = au_test_empty_lower(dentry);
+ if (unlikely(err))
+ goto out;
+
-+ au_set_dbstart(d, a->dst_bstart);
++ au_set_dbtop(d, a->dst_btop);
+ err = may_rename_dstdir(d, &a->whlist);
-+ au_set_dbstart(d, a->btgt);
++ au_set_dbtop(d, a->btgt);
+ }
-+ a->dst_h_dentry = au_h_dptr(d, au_dbstart(d));
++ a->dst_h_dentry = au_h_dptr(d, au_dbtop(d));
+ if (unlikely(err))
+ goto out;
+
+ d = a->src_dentry;
-+ a->src_h_dentry = au_h_dptr(d, au_dbstart(d));
++ a->src_h_dentry = au_h_dptr(d, au_dbtop(d));
+ if (au_ftest_ren(a->flags, ISDIR)) {
+ err = may_rename_srcdir(d, a->btgt);
+ if (unlikely(err)) {
+ int err, isdir;
+ struct inode *h_inode;
+
-+ if (a->src_bstart == a->btgt) {
++ if (a->src_btop == a->btgt) {
+ err = au_may_del(a->src_dentry, a->btgt, a->src_h_parent,
+ au_ftest_ren(a->flags, ISDIR));
+ if (unlikely(err))
+ }
+
+ err = 0;
-+ if (a->dst_bstart != a->btgt)
++ if (a->dst_btop != a->btgt)
+ goto out;
+
+ err = -ENOTEMPTY;
+ if (unlikely(a->src_hdir->hi_inode != d_inode(a->src_h_parent)
+ || a->dst_hdir->hi_inode != d_inode(a->dst_h_parent)))
+ err = au_busy_or_stale();
-+ if (!err && au_dbstart(a->src_dentry) == a->btgt)
++ if (!err && au_dbtop(a->src_dentry) == a->btgt)
+ err = au_h_verify(a->src_h_dentry, udba,
+ d_inode(a->src_h_parent), a->src_h_parent,
+ a->br);
-+ if (!err && au_dbstart(a->dst_dentry) == a->btgt)
++ if (!err && au_dbtop(a->dst_dentry) == a->btgt)
+ err = au_h_verify(a->dst_h_dentry, udba,
+ d_inode(a->dst_h_parent), a->dst_h_parent,
+ a->br);
+
+static void au_ren_refresh(struct au_ren_args *a)
+{
-+ aufs_bindex_t bend, bindex;
++ aufs_bindex_t bbot, bindex;
+ struct dentry *d, *h_d;
+ struct inode *i, *h_i;
+ struct super_block *sb;
+ }
+ au_update_dbrange(d, /*do_put_zero*/1);
+ } else {
-+ bend = a->btgt;
-+ for (bindex = au_dbstart(d); bindex < bend; bindex++)
++ bbot = a->btgt;
++ for (bindex = au_dbtop(d); bindex < bbot; bindex++)
+ au_set_h_dptr(d, bindex, NULL);
-+ bend = au_dbend(d);
-+ for (bindex = a->btgt + 1; bindex <= bend; bindex++)
++ bbot = au_dbbot(d);
++ for (bindex = a->btgt + 1; bindex <= bbot; bindex++)
+ au_set_h_dptr(d, bindex, NULL);
+ au_update_dbrange(d, /*do_put_zero*/0);
+ }
+
+ d = a->src_dentry;
+ au_set_dbwh(d, -1);
-+ bend = au_dbend(d);
-+ for (bindex = a->btgt + 1; bindex <= bend; bindex++) {
++ bbot = au_dbbot(d);
++ for (bindex = a->btgt + 1; bindex <= bbot; bindex++) {
+ h_d = au_h_dptr(d, bindex);
+ if (h_d)
+ au_set_h_dptr(d, bindex, NULL);
+ }
-+ au_set_dbend(d, a->btgt);
++ au_set_dbbot(d, a->btgt);
+
+ sb = d->d_sb;
+ i = a->src_inode;
+ if (au_opt_test(au_mntflags(sb), PLINK) && au_plink_test(i))
+ return; /* success */
+
-+ bend = au_ibend(i);
-+ for (bindex = a->btgt + 1; bindex <= bend; bindex++) {
++ bbot = au_ibbot(i);
++ for (bindex = a->btgt + 1; bindex <= bbot; bindex++) {
+ h_i = au_h_iptr(i, bindex);
+ if (h_i) {
+ au_xino_write(sb, bindex, h_i->i_ino, /*ino*/0);
+ au_set_h_iptr(i, bindex, NULL, 0);
+ }
+ }
-+ au_set_ibend(i, a->btgt);
++ au_set_ibbot(i, a->btgt);
+}
+
+/* ---------------------------------------------------------------------- */
+ return btgt;
+}
+
-+/* sets src_bstart, dst_bstart and btgt */
++/* sets src_btop, dst_btop and btgt */
+static int au_ren_wbr(struct au_ren_args *a)
+{
+ int err;
+ .flags = AuWrDir_ADD_ENTRY
+ };
+
-+ a->src_bstart = au_dbstart(a->src_dentry);
-+ a->dst_bstart = au_dbstart(a->dst_dentry);
++ a->src_btop = au_dbtop(a->src_dentry);
++ a->dst_btop = au_dbtop(a->dst_dentry);
+ if (au_ftest_ren(a->flags, ISDIR))
+ au_fset_wrdir(wr_dir_args.flags, ISDIR);
-+ wr_dir_args.force_btgt = a->src_bstart;
-+ if (a->dst_inode && a->dst_bstart < a->src_bstart)
-+ wr_dir_args.force_btgt = a->dst_bstart;
++ wr_dir_args.force_btgt = a->src_btop;
++ if (a->dst_inode && a->dst_btop < a->src_btop)
++ wr_dir_args.force_btgt = a->dst_btop;
+ wr_dir_args.force_btgt = au_wbr(a->dst_dentry, wr_dir_args.force_btgt);
+ err = au_wr_dir(a->dst_dentry, a->src_dentry, &wr_dir_args);
+ a->btgt = err;
+ goto out_children;
+
+ /* prepare the writable parent dir on the same branch */
-+ if (a->dst_bstart == a->btgt) {
++ if (a->dst_btop == a->btgt) {
+ au_fset_ren(a->flags, WHDST);
+ } else {
+ err = au_cpup_dirs(a->dst_dentry, a->btgt);
+ au_fset_ren(a->flags, WHSRC);
+
+ /* cpup src */
-+ if (a->src_bstart != a->btgt) {
++ if (a->src_btop != a->btgt) {
+ struct au_pin pin;
+
+ err = au_pin(&pin, a->src_dentry, a->btgt,
+ struct au_cp_generic cpg = {
+ .dentry = a->src_dentry,
+ .bdst = a->btgt,
-+ .bsrc = a->src_bstart,
++ .bsrc = a->src_btop,
+ .len = -1,
+ .pin = &pin,
+ .flags = AuCpup_DTIME | AuCpup_HOPEN
+ };
-+ AuDebugOn(au_dbstart(a->src_dentry) != a->src_bstart);
++ AuDebugOn(au_dbtop(a->src_dentry) != a->src_btop);
+ err = au_sio_cpup_simple(&cpg);
+ au_unpin(&pin);
+ }
+ if (unlikely(err))
+ goto out_children;
-+ a->src_bstart = a->btgt;
++ a->src_btop = a->btgt;
+ a->src_h_dentry = au_h_dptr(a->src_dentry, a->btgt);
+ au_fset_ren(a->flags, WHSRC);
+ }
+ au_ren_unlock(a);
+out_children:
+ au_nhash_wh_free(&a->whlist);
-+ if (err && a->dst_inode && a->dst_bstart != a->btgt) {
-+ AuDbg("bstart %d, btgt %d\n", a->dst_bstart, a->btgt);
++ if (err && a->dst_inode && a->dst_btop != a->btgt) {
++ AuDbg("btop %d, btgt %d\n", a->dst_btop, a->btgt);
+ au_set_h_dptr(a->dst_dentry, a->btgt, NULL);
-+ au_set_dbstart(a->dst_dentry, a->dst_bstart);
++ au_set_dbtop(a->dst_dentry, a->dst_btop);
+ }
+out_parent:
+ if (!err)
+ d_move(a->src_dentry, a->dst_dentry);
+ else {
-+ au_update_dbstart(a->dst_dentry);
++ au_update_dbtop(a->dst_dentry);
+ if (!a->dst_inode)
+ d_drop(a->dst_dentry);
+ }
+}
diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
--- /usr/share/empty/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Kconfig 2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/Kconfig 2015-09-24 10:47:58.248052907 +0200
@@ -0,0 +1,185 @@
+config AUFS_FS
+ tristate "Aufs (Advanced multi layered unification filesystem) support"
+endif
diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
--- /usr/share/empty/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/loop.c 2016-07-25 19:05:34.814493242 +0200
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
--- /usr/share/empty/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.h 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/loop.h 2016-07-25 19:05:34.814493242 +0200
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+#endif /* __AUFS_LOOP_H__ */
diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
--- /usr/share/empty/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/magic.mk 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/magic.mk 2015-09-24 10:47:58.254719746 +0200
@@ -0,0 +1,30 @@
+
+# defined in ${srctree}/fs/fuse/inode.c
+endif
diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
--- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile 2016-04-24 18:32:51.390353525 +0200
++++ linux/fs/aufs/Makefile 2015-09-24 10:47:58.248052907 +0200
@@ -0,0 +1,44 @@
+
+include ${src}/magic.mk
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
--- /usr/share/empty/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,221 @@
++++ linux/fs/aufs/module.c 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+/*
+ * aufs caches
+ */
-+struct kmem_cache *au_cachep[AuCache_Last];
++struct kmem_cache *au_cachep[AuCache_Last] = {
++ [0] = NULL
++};
++
++static void au_cache_fin(void)
++{
++ int i;
++
++ /*
++ * Make sure all delayed rcu free inodes are flushed before we
++ * destroy cache.
++ */
++ rcu_barrier();
++
++ /* excluding AuCache_HNOTIFY */
++ BUILD_BUG_ON(AuCache_HNOTIFY + 1 != AuCache_Last);
++ for (i = 0; i < AuCache_HNOTIFY; i++) {
++ kmem_cache_destroy(au_cachep[i]);
++ au_cachep[i] = NULL;
++ }
++}
++
+static int __init au_cache_init(void)
+{
+ au_cachep[AuCache_DINFO] = AuCacheCtor(au_dinfo, au_di_init_once);
+ if (au_cachep[AuCache_DEHSTR])
+ return 0;
+
++ au_cache_fin();
+ return -ENOMEM;
+}
+
-+static void au_cache_fin(void)
-+{
-+ int i;
-+
-+ /*
-+ * Make sure all delayed rcu free inodes are flushed before we
-+ * destroy cache.
-+ */
-+ rcu_barrier();
-+
-+ /* excluding AuCache_HNOTIFY */
-+ BUILD_BUG_ON(AuCache_HNOTIFY + 1 != AuCache_Last);
-+ for (i = 0; i < AuCache_HNOTIFY; i++) {
-+ kmem_cache_destroy(au_cachep[i]);
-+ au_cachep[i] = NULL;
-+ }
-+}
-+
+/* ---------------------------------------------------------------------- */
+
+int au_dir_roflags;
+ * iterate_supers_type() doesn't protect us from
+ * remounting (branch management)
+ */
-+struct au_splhead au_sbilist;
++struct au_sphlhead au_sbilist;
+#endif
+
-+struct lock_class_key au_lc_key[AuLcKey_Last];
-+
+/*
+ * functions for module interface.
+ */
+module_exit(aufs_exit);
diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
--- /usr/share/empty/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,105 @@
++++ linux/fs/aufs/module.h 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+
+extern int au_dir_roflags;
+
-+enum {
-+ AuLcNonDir_FIINFO,
-+ AuLcNonDir_DIINFO,
-+ AuLcNonDir_IIINFO,
-+
-+ AuLcDir_FIINFO,
-+ AuLcDir_DIINFO,
-+ AuLcDir_IIINFO,
-+
-+ AuLcSymlink_DIINFO,
-+ AuLcSymlink_IIINFO,
-+
-+ AuLcKey_Last
-+};
-+extern struct lock_class_key au_lc_key[AuLcKey_Last];
-+
+void *au_kzrealloc(void *p, unsigned int nused, unsigned int new_sz, gfp_t gfp);
+int au_seq_path(struct seq_file *seq, struct path *path);
+
+#endif /* __AUFS_MODULE_H__ */
diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
--- /usr/share/empty/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,703 @@
++++ linux/fs/aufs/mvdown.c 2016-07-25 19:05:34.814493242 +0200
+@@ -0,0 +1,704 @@
+/*
+ * Copyright (C) 2011-2016 Junjiro R. Okajima
+ *
+static int find_lower_writable(struct au_mvd_args *a)
+{
+ struct super_block *sb;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct au_branch *br;
+
+ sb = a->sb;
+ bindex = a->mvd_bsrc;
-+ bend = au_sbend(sb);
++ bbot = au_sbbot(sb);
+ if (a->mvdown.flags & AUFS_MVDOWN_FHSM_LOWER)
-+ for (bindex++; bindex <= bend; bindex++) {
++ for (bindex++; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ if (au_br_fhsm(br->br_perm)
+ && (!(au_br_sb(br)->s_flags & MS_RDONLY)))
+ return bindex;
+ }
+ else if (!(a->mvdown.flags & AUFS_MVDOWN_ROLOWER))
-+ for (bindex++; bindex <= bend; bindex++) {
++ for (bindex++; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ if (!au_br_rdonly(br))
+ return bindex;
+ }
+ else
-+ for (bindex++; bindex <= bend; bindex++) {
++ for (bindex++; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ if (!(au_br_sb(br)->s_flags & MS_RDONLY)) {
+ if (au_br_rdonly(br))
+ a->mvd_hdir_dst = au_hi(a->dir, a->mvd_bdst);
+ a->mvd_h_src_parent = au_h_dptr(a->parent, a->mvd_bsrc);
+ a->mvd_h_dst_parent = NULL;
-+ if (au_dbend(a->parent) >= a->mvd_bdst)
++ if (au_dbbot(a->parent) >= a->mvd_bdst)
+ a->mvd_h_dst_parent = au_h_dptr(a->parent, a->mvd_bdst);
+ if (!a->mvd_h_dst_parent) {
+ err = au_cpdown_dirs(a->dentry, a->mvd_bdst);
+ /* maintain internal array */
+ if (!(a->mvdown.flags & AUFS_MVDOWN_KUPPER)) {
+ au_set_h_dptr(a->dentry, a->mvd_bsrc, NULL);
-+ au_set_dbstart(a->dentry, a->mvd_bdst);
++ au_set_dbtop(a->dentry, a->mvd_bdst);
+ au_set_h_iptr(a->inode, a->mvd_bsrc, NULL, /*flags*/0);
-+ au_set_ibstart(a->inode, a->mvd_bdst);
++ au_set_ibtop(a->inode, a->mvd_bdst);
+ } else {
+ /* hide the lower */
+ au_set_h_dptr(a->dentry, a->mvd_bdst, NULL);
-+ au_set_dbend(a->dentry, a->mvd_bsrc);
++ au_set_dbbot(a->dentry, a->mvd_bsrc);
+ au_set_h_iptr(a->inode, a->mvd_bdst, NULL, /*flags*/0);
-+ au_set_ibend(a->inode, a->mvd_bsrc);
++ au_set_ibbot(a->inode, a->mvd_bsrc);
+ }
-+ if (au_dbend(a->dentry) < a->mvd_bdst)
-+ au_set_dbend(a->dentry, a->mvd_bdst);
-+ if (au_ibend(a->inode) < a->mvd_bdst)
-+ au_set_ibend(a->inode, a->mvd_bdst);
++ if (au_dbbot(a->dentry) < a->mvd_bdst)
++ au_set_dbbot(a->dentry, a->mvd_bdst);
++ if (au_ibbot(a->inode) < a->mvd_bdst)
++ au_set_ibbot(a->inode, a->mvd_bdst);
+
+out_unlock:
+ au_do_unlock(dmsg, a);
+
+ err = 0;
+ plinked = !!au_opt_test(au_mntflags(a->sb), PLINK);
-+ if (au_dbstart(a->dentry) == a->mvd_bsrc
++ if (au_dbtop(a->dentry) == a->mvd_bsrc
+ && au_dcount(a->dentry) == 1
+ && atomic_read(&a->inode->i_count) == 1
+ /* && a->mvd_h_src_inode->i_nlink == 1 */
+ err = -EBUSY;
+ AU_MVD_PR(dmsg,
+ "b%d, d{b%d, c%d?}, i{c%d?, l%u}, hi{l%u}, p{%d, %d}\n",
-+ a->mvd_bsrc, au_dbstart(a->dentry), au_dcount(a->dentry),
++ a->mvd_bsrc, au_dbtop(a->dentry), au_dcount(a->dentry),
+ atomic_read(&a->inode->i_count), a->inode->i_nlink,
+ a->mvd_h_src_inode->i_nlink,
+ plinked, plinked ? au_plink_test(a->inode) : 0);
+ au_di_swap(tmp, dinfo);
+
+ /* returns the number of positive dentries */
-+ err = au_lkup_dentry(a->dentry, a->mvd_bsrc + 1, /*type*/0);
++ err = au_lkup_dentry(a->dentry, a->mvd_bsrc + 1,
++ /* AuLkup_IGNORE_PERM */ 0);
+ if (!err)
+ a->bwh = au_dbwh(a->dentry);
+ else if (err > 0)
-+ a->bfound = au_dbstart(a->dentry);
++ a->bfound = au_dbtop(a->dentry);
+
+ au_di_swap(tmp, dinfo);
+ au_rw_write_unlock(&tmp->di_rwsem);
+
+ err = -EINVAL;
+ if (!(a->mvdown.flags & AUFS_MVDOWN_BRID_UPPER))
-+ a->mvd_bsrc = au_ibstart(a->inode);
++ a->mvd_bsrc = au_ibtop(a->inode);
+ else {
+ a->mvd_bsrc = au_br_index(a->sb, a->mvd_src_brid);
+ if (unlikely(a->mvd_bsrc < 0
-+ || (a->mvd_bsrc < au_dbstart(a->dentry)
-+ || au_dbend(a->dentry) < a->mvd_bsrc
++ || (a->mvd_bsrc < au_dbtop(a->dentry)
++ || au_dbbot(a->dentry) < a->mvd_bsrc
+ || !au_h_dptr(a->dentry, a->mvd_bsrc))
-+ || (a->mvd_bsrc < au_ibstart(a->inode)
-+ || au_ibend(a->inode) < a->mvd_bsrc
++ || (a->mvd_bsrc < au_ibtop(a->inode)
++ || au_ibbot(a->inode) < a->mvd_bsrc
+ || !au_h_iptr(a->inode, a->mvd_bsrc)))) {
+ a->mvd_errno = EAU_MVDOWN_NOUPPER;
+ AU_MVD_PR(dmsg, "no upper\n");
+ goto out;
+ }
+ }
-+ if (unlikely(a->mvd_bsrc == au_sbend(a->sb))) {
++ if (unlikely(a->mvd_bsrc == au_sbbot(a->sb))) {
+ a->mvd_errno = EAU_MVDOWN_BOTTOM;
+ AU_MVD_PR(dmsg, "on the bottom\n");
+ goto out;
+ } else {
+ a->mvd_bdst = au_br_index(a->sb, a->mvd_dst_brid);
+ if (unlikely(a->mvd_bdst < 0
-+ || au_sbend(a->sb) < a->mvd_bdst)) {
++ || au_sbbot(a->sb) < a->mvd_bdst)) {
+ a->mvd_errno = EAU_MVDOWN_NOLOWERBR;
+ AU_MVD_PR(dmsg, "no lower brid\n");
+ goto out;
+}
diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
--- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/opts.c 2016-07-25 19:05:34.814493242 +0200
@@ -0,0 +1,1859 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ err = -EINVAL;
+ root = sb->s_root;
+ aufs_read_lock(root, AuLock_FLUSH);
-+ if (bindex < 0 || au_sbend(sb) < bindex) {
++ if (bindex < 0 || au_sbbot(sb) < bindex) {
+ pr_err("out of bounds, %d\n", bindex);
+ goto out;
+ }
+ err = -EINVAL;
+ root = sb->s_root;
+ aufs_read_lock(root, AuLock_FLUSH);
-+ if (bindex < 0 || au_sbend(sb) < bindex) {
++ if (bindex < 0 || au_sbbot(sb) < bindex) {
+ pr_err("out of bounds, %d\n", bindex);
+ goto out;
+ }
+ substring_t args[])
+{
+ int err;
-+ aufs_bindex_t bend, bindex;
++ aufs_bindex_t bbot, bindex;
+ struct path path;
+ struct dentry *root;
+
+ xino_itrunc->bindex = -1;
+ root = sb->s_root;
+ aufs_read_lock(root, AuLock_FLUSH);
-+ bend = au_sbend(sb);
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ if (au_h_dptr(root, bindex) == path.dentry) {
+ xino_itrunc->bindex = bindex;
+ break;
+ }
+ u.xino_itrunc->bindex = n;
+ aufs_read_lock(root, AuLock_FLUSH);
-+ if (n < 0 || au_sbend(sb) < n) {
++ if (n < 0 || au_sbbot(sb) < n) {
+ pr_err("out of bounds, %d\n", n);
+ aufs_read_unlock(root, !AuLock_IR);
+ break;
+ err = 0;
+ switch (opt->type) {
+ case Opt_append:
-+ opt->add.bindex = au_sbend(sb) + 1;
++ opt->add.bindex = au_sbbot(sb) + 1;
+ if (opt->add.bindex < 0)
+ opt->add.bindex = 0;
+ goto add;
+ struct au_opts *opts)
+{
+ int err;
-+ aufs_bindex_t bend, bindex;
++ aufs_bindex_t bbot, bindex;
+ struct dentry *root, *parent, *h_root;
+
+ err = 0;
+ /* safe d_parent access */
+ parent = opt->xino.file->f_path.dentry->d_parent;
+ root = sb->s_root;
-+ bend = au_sbend(sb);
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ h_root = au_h_dptr(root, bindex);
+ if (h_root == parent) {
+ au_xino_brid_set(sb, au_sbr_id(sb, bindex));
+ unsigned int pending)
+{
+ int err, fhsm;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ unsigned char do_plink, skip, do_free, can_no_dreval;
+ struct au_branch *br;
+ struct au_wbr *wbr;
+ do_plink = !!au_opt_test(sbinfo->si_mntflags, PLINK);
+ can_no_dreval = !!au_opt_test((sbinfo->si_mntflags | pending),
+ UDBA_NONE);
-+ bend = au_sbend(sb);
-+ for (bindex = 0; !err && bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (bindex = 0; !err && bindex <= bbot; bindex++) {
+ skip = 0;
+ h_dir = au_h_iptr(dir, bindex);
+ br = au_sbr(sb, bindex);
+ continue;
+
+ hdir = au_hi(dir, bindex);
-+ au_hn_imtx_lock_nested(hdir, AuLsc_I_PARENT);
++ au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT);
+ if (wbr)
+ wbr_wh_write_lock(wbr);
+ err = au_wh_init(br, sb);
+ if (wbr)
+ wbr_wh_write_unlock(wbr);
-+ au_hn_imtx_unlock(hdir);
++ au_hn_inode_unlock(hdir);
+
+ if (!err && do_free) {
+ kfree(wbr);
+
+ if (fhsm >= 2) {
+ au_fset_si(sbinfo, FHSM);
-+ for (bindex = bend; bindex >= 0; bindex--) {
++ for (bindex = bbot; bindex >= 0; bindex--) {
+ br = au_sbr(sb, bindex);
+ if (au_br_fhsm(br->br_perm)) {
+ au_fhsm_set_bottom(sb, bindex);
+{
+ int err;
+ unsigned int tmp;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct au_opt *opt;
+ struct au_opt_xino *opt_xino, xino;
+ struct au_sbinfo *sbinfo;
+ else if (unlikely(err < 0))
+ goto out;
+
-+ bend = au_sbend(sb);
-+ if (unlikely(bend < 0)) {
++ bbot = au_sbbot(sb);
++ if (unlikely(bbot < 0)) {
+ err = -EINVAL;
+ pr_err("no branches\n");
+ goto out;
+ tmp &= AuOptMask_UDBA;
+ sbinfo->si_mntflags &= ~AuOptMask_UDBA;
+ sbinfo->si_mntflags |= tmp;
-+ bend = au_sbend(sb);
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ err = au_hnotify_reset_br(tmp, br, br->br_perm);
+ if (unlikely(err))
+}
diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
--- /usr/share/empty/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/opts.h 2016-07-25 19:05:34.814493242 +0200
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+#endif /* __AUFS_OPTS_H__ */
diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
--- /usr/share/empty/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/plink.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,528 @@
++++ linux/fs/aufs/plink.c 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,502 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+ int i;
+ struct au_sbinfo *sbinfo;
+ struct hlist_head *plink_hlist;
-+ struct pseudo_link *plink;
++ struct au_icntnr *icntnr;
+
+ SiMustAnyLock(sb);
+
+ for (i = 0; i < AuPlink_NHASH; i++) {
+ plink_hlist = &sbinfo->si_plink[i].head;
+ rcu_read_lock();
-+ hlist_for_each_entry_rcu(plink, plink_hlist, hlist)
-+ AuDbg("%lu\n", plink->inode->i_ino);
++ hlist_for_each_entry_rcu(icntnr, plink_hlist, plink)
++ AuDbg("%lu\n", icntnr->vfs_inode.i_ino);
+ rcu_read_unlock();
+ }
+}
+ int found, i;
+ struct au_sbinfo *sbinfo;
+ struct hlist_head *plink_hlist;
-+ struct pseudo_link *plink;
++ struct au_icntnr *icntnr;
+
+ sbinfo = au_sbi(inode->i_sb);
+ AuRwMustAnyLock(&sbinfo->si_rwsem);
+ i = au_plink_hash(inode->i_ino);
+ plink_hlist = &sbinfo->si_plink[i].head;
+ rcu_read_lock();
-+ hlist_for_each_entry_rcu(plink, plink_hlist, hlist)
-+ if (plink->inode == inode) {
++ hlist_for_each_entry_rcu(icntnr, plink_hlist, plink)
++ if (&icntnr->vfs_inode == inode) {
+ found = 1;
+ break;
+ }
+ return err;
+}
+
-+/* free a single plink */
-+static void do_put_plink(struct pseudo_link *plink, int do_del)
-+{
-+ if (do_del)
-+ hlist_del(&plink->hlist);
-+ iput(plink->inode);
-+ kfree(plink);
-+}
-+
-+static void do_put_plink_rcu(struct rcu_head *rcu)
-+{
-+ struct pseudo_link *plink;
-+
-+ plink = container_of(rcu, struct pseudo_link, rcu);
-+ iput(plink->inode);
-+ kfree(plink);
-+}
-+
+/*
+ * create a new pseudo-link for @h_dentry on @bindex.
+ * the linked inode is held in aufs @inode.
+ struct super_block *sb;
+ struct au_sbinfo *sbinfo;
+ struct hlist_head *plink_hlist;
-+ struct pseudo_link *plink, *tmp;
++ struct au_icntnr *icntnr;
+ struct au_sphlhead *sphl;
+ int found, err, cnt, i;
+
+ i = au_plink_hash(inode->i_ino);
+ sphl = sbinfo->si_plink + i;
+ plink_hlist = &sphl->head;
-+ tmp = kmalloc(sizeof(*plink), GFP_NOFS);
-+ if (tmp)
-+ tmp->inode = au_igrab(inode);
-+ else {
-+ err = -ENOMEM;
-+ goto out;
-+ }
++ au_igrab(inode);
+
+ spin_lock(&sphl->spin);
-+ hlist_for_each_entry(plink, plink_hlist, hlist) {
-+ if (plink->inode == inode) {
++ hlist_for_each_entry(icntnr, plink_hlist, plink) {
++ if (&icntnr->vfs_inode == inode) {
+ found = 1;
+ break;
+ }
+ }
-+ if (!found)
-+ hlist_add_head_rcu(&tmp->hlist, plink_hlist);
++ if (!found) {
++ icntnr = container_of(inode, struct au_icntnr, vfs_inode);
++ hlist_add_head_rcu(&icntnr->plink, plink_hlist);
++ }
+ spin_unlock(&sphl->spin);
+ if (!found) {
+ cnt = au_sphl_count(sphl);
+ AuWarn1(msg ", %d\n", cnt);
+#undef msg
+ err = whplink(h_dentry, inode, bindex, au_sbr(sb, bindex));
-+ } else {
-+ do_put_plink(tmp, 0);
-+ return;
-+ }
-+
-+out:
-+ if (unlikely(err)) {
-+ pr_warn("err %d, damaged pseudo link.\n", err);
-+ if (tmp) {
-+ au_sphl_del_rcu(&tmp->hlist, sphl);
-+ call_rcu(&tmp->rcu, do_put_plink_rcu);
++ if (unlikely(err)) {
++ pr_warn("err %d, damaged pseudo link.\n", err);
++ au_sphl_del_rcu(&icntnr->plink, sphl);
++ iput(&icntnr->vfs_inode);
+ }
-+ }
++ } else
++ iput(&icntnr->vfs_inode);
+}
+
+/* free all plinks */
+ struct au_sbinfo *sbinfo;
+ struct hlist_head *plink_hlist;
+ struct hlist_node *tmp;
-+ struct pseudo_link *plink;
++ struct au_icntnr *icntnr;
+
+ SiMustWriteLock(sb);
+
+ pr_warn("pseudo-link is not flushed");
+ warned = 1;
+ }
-+ hlist_for_each_entry_safe(plink, tmp, plink_hlist, hlist)
-+ do_put_plink(plink, 0);
++ hlist_for_each_entry_safe(icntnr, tmp, plink_hlist, plink)
++ iput(&icntnr->vfs_inode);
+ INIT_HLIST_HEAD(plink_hlist);
+ }
+}
+static int au_plink_do_half_refresh(struct inode *inode, aufs_bindex_t br_id)
+{
+ int do_put;
-+ aufs_bindex_t bstart, bend, bindex;
++ aufs_bindex_t btop, bbot, bindex;
+
+ do_put = 0;
-+ bstart = au_ibstart(inode);
-+ bend = au_ibend(inode);
-+ if (bstart >= 0) {
-+ for (bindex = bstart; bindex <= bend; bindex++) {
++ btop = au_ibtop(inode);
++ bbot = au_ibbot(inode);
++ if (btop >= 0) {
++ for (bindex = btop; bindex <= bbot; bindex++) {
+ if (!au_h_iptr(inode, bindex)
+ || au_ii_br_id(inode, bindex) != br_id)
+ continue;
+ break;
+ }
+ if (do_put)
-+ for (bindex = bstart; bindex <= bend; bindex++)
++ for (bindex = btop; bindex <= bbot; bindex++)
+ if (au_h_iptr(inode, bindex)) {
+ do_put = 0;
+ break;
+ struct au_sbinfo *sbinfo;
+ struct hlist_head *plink_hlist;
+ struct hlist_node *tmp;
-+ struct pseudo_link *plink;
++ struct au_icntnr *icntnr;
+ struct inode *inode;
+ int i, do_put;
+
+ /* no spin_lock since sbinfo is write-locked */
+ for (i = 0; i < AuPlink_NHASH; i++) {
+ plink_hlist = &sbinfo->si_plink[i].head;
-+ hlist_for_each_entry_safe(plink, tmp, plink_hlist, hlist) {
-+ inode = au_igrab(plink->inode);
++ hlist_for_each_entry_safe(icntnr, tmp, plink_hlist, plink) {
++ inode = au_igrab(&icntnr->vfs_inode);
+ ii_write_lock_child(inode);
+ do_put = au_plink_do_half_refresh(inode, br_id);
-+ if (do_put)
-+ do_put_plink(plink, 1);
++ if (do_put) {
++ hlist_del(&icntnr->plink);
++ iput(inode);
++ }
+ ii_write_unlock(inode);
+ iput(inode);
+ }
+}
diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
--- /usr/share/empty/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/poll.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/poll.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
--- /usr/share/empty/fs/aufs/posix_acl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/posix_acl.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/posix_acl.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2014-2016 Junjiro R. Okajima
+ if (!(sb->s_flags & MS_POSIXACL))
+ goto out;
+
-+ bindex = au_ibstart(inode);
++ bindex = au_ibtop(inode);
+ h_inode = au_h_iptr(inode, bindex);
+ if (unlikely(!h_inode
+ || ((h_inode->i_mode & S_IFMT)
+ },
+ };
+
-+ inode_lock(inode);
++ IMustLock(inode);
++
+ if (inode->i_ino == AUFS_ROOT_INO)
+ dentry = dget(inode->i_sb->s_root);
+ else {
+ }
+ }
+
-+ ssz = au_srxattr(dentry, &arg);
++ ssz = au_srxattr(dentry, inode, &arg);
+ dput(dentry);
+ err = ssz;
+ if (ssz >= 0)
+ err = 0;
+
+out:
-+ inode_unlock(inode);
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
--- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/procfs.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2010-2016 Junjiro R. Okajima
+ sb = NULL;
+ /* don't use au_sbilist_lock() here */
+ spin_lock(&au_sbilist.spin);
-+ list_for_each_entry(sbinfo, &au_sbilist.head, si_list)
++ hlist_for_each_entry(sbinfo, &au_sbilist.head, si_list)
+ if (id == sysaufs_si_id(sbinfo)) {
+ kobject_get(&sbinfo->si_kobj);
+ sb = sbinfo->si_sb;
+}
diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
--- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,389 @@
++++ linux/fs/aufs/rdu.c 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,381 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+static int au_rdu(struct file *file, struct aufs_rdu *rdu)
+{
+ int err;
-+ aufs_bindex_t bend;
++ aufs_bindex_t bbot;
+ struct au_rdu_arg arg = {
+ .ctx = {
+ .actor = au_rdu_fill
+ arg.end += rdu->sz;
+
+ err = -ENOTDIR;
-+ if (unlikely(!file->f_op->iterate))
++ if (unlikely(!file->f_op->iterate && !file->f_op->iterate_shared))
+ goto out;
+
+ err = security_file_permission(file, MAY_READ);
+
+ dentry = file->f_path.dentry;
+ inode = d_inode(dentry);
-+#if 1
-+ inode_lock(inode);
-+#else
-+ /* todo: create a new inline func inode_lock_killable() */
-+ err = mutex_lock_killable(&inode->i_mutex);
-+ AuTraceErr(err);
-+ if (unlikely(err))
-+ goto out;
-+#endif
++ inode_lock_shared(inode);
+
+ arg.sb = inode->i_sb;
+ err = si_read_lock(arg.sb, AuLock_FLUSH | AuLock_NOPLM);
+ if (!rdu->blk)
+ rdu->blk = au_dir_size(file, /*dentry*/NULL);
+ }
-+ bend = au_fbstart(file);
-+ if (cookie->bindex < bend)
-+ cookie->bindex = bend;
-+ bend = au_fbend_dir(file);
-+ /* AuDbg("b%d, b%d\n", cookie->bindex, bend); */
-+ for (; !err && cookie->bindex <= bend;
++ bbot = au_fbtop(file);
++ if (cookie->bindex < bbot)
++ cookie->bindex = bbot;
++ bbot = au_fbbot_dir(file);
++ /* AuDbg("b%d, b%d\n", cookie->bindex, bbot); */
++ for (; !err && cookie->bindex <= bbot;
+ cookie->bindex++, cookie->h_pos = 0) {
+ h_file = au_hf_dir(file, cookie->bindex);
+ if (!h_file)
+ }
+
+ ii_read_lock_child(inode);
-+ fsstack_copy_attr_atime(inode, au_h_iptr(inode, au_ibstart(inode)));
++ fsstack_copy_attr_atime(inode, au_h_iptr(inode, au_ibtop(inode)));
+ ii_read_unlock(inode);
+
+out_unlock:
+out_si:
+ si_read_unlock(arg.sb);
+out_mtx:
-+ inode_unlock(inode);
++ inode_unlock_shared(inode);
+out:
+ AuTraceErr(err);
+ return err;
+#endif
diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
--- /usr/share/empty/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,191 @@
++++ linux/fs/aufs/rwsem.h 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+#endif
+};
+
++#ifdef CONFIG_LOCKDEP
++#define au_lockdep_set_name(rw) \
++ lockdep_set_class_and_name(&(rw)->rwsem, \
++ /*original key*/(rw)->rwsem.dep_map.key, \
++ /*name*/#rw)
++#else
++#define au_lockdep_set_name(rw) do {} while (0)
++#endif
++
+#ifdef CONFIG_AUFS_DEBUG
+#define AuDbgCntInit(rw) do { \
+ atomic_set(&(rw)->rcnt, 0); \
+ smp_mb(); /* atomic set */ \
+} while (0)
+
-+#define AuDbgRcntInc(rw) atomic_inc(&(rw)->rcnt)
-+#define AuDbgRcntDec(rw) WARN_ON(atomic_dec_return(&(rw)->rcnt) < 0)
-+#define AuDbgWcntInc(rw) atomic_inc(&(rw)->wcnt)
-+#define AuDbgWcntDec(rw) WARN_ON(atomic_dec_return(&(rw)->wcnt) < 0)
++#define AuDbgCnt(rw, cnt) atomic_read(&(rw)->cnt)
++#define AuDbgCntInc(rw, cnt) atomic_inc(&(rw)->cnt)
++#define AuDbgCntDec(rw, cnt) WARN_ON(atomic_dec_return(&(rw)->cnt) < 0)
++#define AuDbgRcntInc(rw) AuDbgCntInc(rw, rcnt)
++#define AuDbgRcntDec(rw) AuDbgCntDec(rw, rcnt)
++#define AuDbgWcntInc(rw) AuDbgCntInc(rw, wcnt)
++#define AuDbgWcntDec(rw) AuDbgCntDec(rw, wcnt)
+#else
++#define AuDbgCnt(rw, cnt) 0
+#define AuDbgCntInit(rw) do {} while (0)
+#define AuDbgRcntInc(rw) do {} while (0)
+#define AuDbgRcntDec(rw) do {} while (0)
+#endif /* CONFIG_AUFS_DEBUG */
+
+/* to debug easier, do not make them inlined functions */
-+#define AuRwMustNoWaiters(rw) AuDebugOn(!list_empty(&(rw)->rwsem.wait_list))
++#define AuRwMustNoWaiters(rw) AuDebugOn(rwsem_is_contended(&(rw)->rwsem))
+/* rwsem_is_locked() is unusable */
-+#define AuRwMustReadLock(rw) AuDebugOn(atomic_read(&(rw)->rcnt) <= 0)
-+#define AuRwMustWriteLock(rw) AuDebugOn(atomic_read(&(rw)->wcnt) <= 0)
-+#define AuRwMustAnyLock(rw) AuDebugOn(atomic_read(&(rw)->rcnt) <= 0 \
-+ && atomic_read(&(rw)->wcnt) <= 0)
-+#define AuRwDestroy(rw) AuDebugOn(atomic_read(&(rw)->rcnt) \
-+ || atomic_read(&(rw)->wcnt))
-+
-+#define au_rw_class(rw, key) lockdep_set_class(&(rw)->rwsem, key)
-+
-+static inline void au_rw_init(struct au_rwsem *rw)
-+{
-+ AuDbgCntInit(rw);
-+ init_rwsem(&rw->rwsem);
-+}
++#define AuRwMustReadLock(rw) AuDebugOn(AuDbgCnt(rw, rcnt) <= 0)
++#define AuRwMustWriteLock(rw) AuDebugOn(AuDbgCnt(rw, wcnt) <= 0)
++#define AuRwMustAnyLock(rw) AuDebugOn(AuDbgCnt(rw, rcnt) <= 0 \
++ && AuDbgCnt(rw, wcnt) <= 0)
++#define AuRwDestroy(rw) AuDebugOn(AuDbgCnt(rw, rcnt) \
++ || AuDbgCnt(rw, wcnt))
++
++#define au_rw_init(rw) do { \
++ AuDbgCntInit(rw); \
++ init_rwsem(&(rw)->rwsem); \
++ au_lockdep_set_name(rw); \
++ } while (0)
+
-+static inline void au_rw_init_wlock(struct au_rwsem *rw)
-+{
-+ au_rw_init(rw);
-+ down_write(&rw->rwsem);
-+ AuDbgWcntInc(rw);
-+}
++#define au_rw_init_wlock(rw) do { \
++ au_rw_init(rw); \
++ down_write(&(rw)->rwsem); \
++ AuDbgWcntInc(rw); \
++ } while (0)
+
-+static inline void au_rw_init_wlock_nested(struct au_rwsem *rw,
-+ unsigned int lsc)
-+{
-+ au_rw_init(rw);
-+ down_write_nested(&rw->rwsem, lsc);
-+ AuDbgWcntInc(rw);
-+}
++#define au_rw_init_wlock_nested(rw, lsc) do { \
++ au_rw_init(rw); \
++ down_write_nested(&(rw)->rwsem, lsc); \
++ AuDbgWcntInc(rw); \
++ } while (0)
+
+static inline void au_rw_read_lock(struct au_rwsem *rw)
+{
+ return ret;
+}
+
-+#undef AuDbgCntInit
++#undef AuDbgCntDec
+#undef AuDbgRcntInc
+#undef AuDbgRcntDec
-+#undef AuDbgWcntInc
+#undef AuDbgWcntDec
+
+#define AuSimpleLockRwsemFuncs(prefix, param, rwsem) \
+#endif /* __AUFS_RWSEM_H__ */
diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
--- /usr/share/empty/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sbinfo.c 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,350 @@
++++ linux/fs/aufs/sbinfo.c 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,353 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+ sbinfo = container_of(kobj, struct au_sbinfo, si_kobj);
+ for (i = 0; i < AuPlink_NHASH; i++)
+ AuDebugOn(!hlist_empty(&sbinfo->si_plink[i].head));
-+ AuDebugOn(atomic_read(&sbinfo->si_nowait.nw_len));
++ au_nwt_fin(&sbinfo->si_nowait);
++
++ AuDebugOn(percpu_counter_sum(&sbinfo->si_ninodes));
++ percpu_counter_destroy(&sbinfo->si_ninodes);
++ AuDebugOn(percpu_counter_sum(&sbinfo->si_nfiles));
++ percpu_counter_destroy(&sbinfo->si_nfiles);
+
+ au_rw_write_lock(&sbinfo->si_rwsem);
+ au_br_free(sbinfo);
+{
+ int err, i;
+ struct au_sbinfo *sbinfo;
-+ static struct lock_class_key aufs_si;
+
+ err = -ENOMEM;
+ sbinfo = kzalloc(sizeof(*sbinfo), GFP_NOFS);
+
+ au_nwt_init(&sbinfo->si_nowait);
+ au_rw_init_wlock(&sbinfo->si_rwsem);
-+ au_rw_class(&sbinfo->si_rwsem, &aufs_si);
+ mutex_init(&sbinfo->au_si_pid.pid_mtx);
+
-+ atomic_long_set(&sbinfo->si_ninodes, 0);
-+ atomic_long_set(&sbinfo->si_nfiles, 0);
++ percpu_counter_init(&sbinfo->si_ninodes, 0, GFP_NOFS);
++ percpu_counter_init(&sbinfo->si_nfiles, 0, GFP_NOFS);
+
-+ sbinfo->si_bend = -1;
++ sbinfo->si_bbot = -1;
+ sbinfo->si_last_br_id = AUFS_BRANCH_MAX / 2;
+
+ sbinfo->si_wbr_copyup = AuWbrCopyup_Def;
+ AuRwMustWriteLock(&sbinfo->si_rwsem);
+
+ err = -ENOMEM;
-+ sz = sizeof(*brp) * (sbinfo->si_bend + 1);
++ sz = sizeof(*brp) * (sbinfo->si_bbot + 1);
+ if (unlikely(!sz))
+ sz = sizeof(*brp);
+ brp = au_kzrealloc(sbinfo->si_branch, sz, sizeof(*brp) * nbr, GFP_NOFS);
+}
diff -urN /usr/share/empty/fs/aufs/spl.h linux/fs/aufs/spl.h
--- /usr/share/empty/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/spl.h 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/spl.h 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+#endif /* __AUFS_SPL_H__ */
diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
--- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/super.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,1039 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+
+static void aufs_destroy_inode(struct inode *inode)
+{
-+ au_iinfo_fin(inode);
++ if (!au_is_bad_inode(inode))
++ au_iinfo_fin(inode);
+ call_rcu(&inode->i_rcu, aufs_destroy_inode_cb);
+}
+
+static int au_show_brs(struct seq_file *seq, struct super_block *sb)
+{
+ int err;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct path path;
+ struct au_hdentry *hdp;
+ struct au_branch *br;
+ au_br_perm_str_t perm;
+
+ err = 0;
-+ bend = au_sbend(sb);
-+ hdp = au_di(sb->s_root)->di_hdentry;
-+ for (bindex = 0; !err && bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ bindex = 0;
++ hdp = au_hdentry(au_di(sb->s_root), bindex);
++ for (; !err && bindex <= bbot; bindex++, hdp++) {
+ br = au_sbr(sb, bindex);
+ path.mnt = au_br_mnt(br);
-+ path.dentry = hdp[bindex].hd_dentry;
++ path.dentry = hdp->hd_dentry;
+ err = au_seq_path(seq, &path);
+ if (!err) {
+ au_optstr_br_perm(&perm, br->br_perm);
+ seq_printf(seq, "=%s", perm.a);
-+ if (bindex != bend)
++ if (bindex != bbot)
+ seq_putc(seq, ':');
+ }
+ }
+ struct qstr *name;
+ struct file *f;
+ struct dentry *d, *h_root;
-+ struct au_hdentry *hdp;
+
+ AuRwMustAnyLock(&sbinfo->si_rwsem);
+
+ brid = au_xino_brid(sb);
+ if (brid >= 0) {
+ bindex = au_br_index(sb, brid);
-+ hdp = au_di(sb->s_root)->di_hdentry;
-+ h_root = hdp[0 + bindex].hd_dentry;
++ h_root = au_hdentry(au_di(sb->s_root), bindex)->hd_dentry;
+ }
+ d = f->f_path.dentry;
+ name = &d->d_name;
+ int err;
+ long bsize, factor;
+ u64 blocks, bfree, bavail, files, ffree;
-+ aufs_bindex_t bend, bindex, i;
++ aufs_bindex_t bbot, bindex, i;
+ unsigned char shared;
+ struct path h_path;
+ struct super_block *h_sb;
+ blocks = 0;
+ bfree = 0;
+ bavail = 0;
-+ bend = au_sbend(sb);
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ h_path.mnt = au_sbr_mnt(sb, bindex);
+ h_sb = h_path.mnt->mnt_sb;
+ shared = 0;
+static int aufs_sync_fs(struct super_block *sb, int wait)
+{
+ int err, e;
-+ aufs_bindex_t bend, bindex;
++ aufs_bindex_t bbot, bindex;
+ struct au_branch *br;
+ struct super_block *h_sb;
+
+ err = 0;
+ si_noflush_read_lock(sb);
-+ bend = au_sbend(sb);
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ if (!au_br_writable(br->br_perm))
+ continue;
+ head = arg;
+ spin_lock(&sb->s_inode_list_lock);
+ list_for_each_entry(inode, head, i_sb_list) {
-+ if (!is_bad_inode(inode)
-+ && au_ii(inode)->ii_bstart >= 0) {
++ if (!au_is_bad_inode(inode)
++ && au_ii(inode)->ii_btop >= 0) {
+ spin_lock(&inode->i_lock);
+ if (atomic_read(&inode->i_count)) {
+ au_igrab(inode);
+
+struct inode **au_iarray_alloc(struct super_block *sb, unsigned long long *max)
+{
-+ *max = atomic_long_read(&au_sbi(sb)->si_ninodes);
++ *max = au_ninodes(sb);
+ return au_array_alloc(max, au_iarray_cb, sb, &sb->s_inodes);
+}
+
+{
+ int err, e;
+ unsigned int udba;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct dentry *root;
+ struct inode *inode;
+ struct au_branch *br;
+ IiMustNoWaiters(inode);
+
+ udba = au_opt_udba(sb);
-+ bend = au_sbend(sb);
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ err = au_hnotify_reset_br(udba, br, br->br_perm);
+ if (unlikely(err))
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2016-04-24 18:32:51.393686895 +0200
-@@ -0,0 +1,632 @@
++++ linux/fs/aufs/super.h 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,638 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+ unsigned long long mfsrr_watermark;
+};
+
-+struct pseudo_link {
-+ union {
-+ struct hlist_node hlist;
-+ struct rcu_head rcu;
-+ };
-+ struct inode *inode;
-+};
-+
+#define AuPlink_NHASH 100
+static inline int au_plink_hash(ino_t ino)
+{
+ * dirty approach to protect sb->sb_inodes and ->s_files (gone) from
+ * remount.
+ */
-+ atomic_long_t si_ninodes, si_nfiles;
++ struct percpu_counter si_ninodes, si_nfiles;
+
+ /* branch management */
+ unsigned int si_generation;
+ /* see AuSi_ flags */
+ unsigned char au_si_status;
+
-+ aufs_bindex_t si_bend;
++ aufs_bindex_t si_bbot;
+
+ /* dirty trick to keep br_id plus */
+ unsigned int si_last_br_id :
+#endif
+
+#ifdef CONFIG_AUFS_SBILIST
-+ struct list_head si_list;
++ struct hlist_node si_list;
+#endif
+
+ /* dirty, necessary for unmounting, sysfs and sysrq */
+extern struct au_wbr_create_operations au_wbr_create_ops[];
+int au_cpdown_dirs(struct dentry *dentry, aufs_bindex_t bdst);
+int au_wbr_nonopq(struct dentry *dentry, aufs_bindex_t bindex);
-+int au_wbr_do_copyup_bu(struct dentry *dentry, aufs_bindex_t bstart);
++int au_wbr_do_copyup_bu(struct dentry *dentry, aufs_bindex_t btop);
+
+/* mvdown.c */
+int au_mvdown(struct dentry *dentry, struct aufs_mvdown __user *arg);
+
+#ifdef CONFIG_AUFS_SBILIST
+/* module.c */
-+extern struct au_splhead au_sbilist;
++extern struct au_sphlhead au_sbilist;
+
+static inline void au_sbilist_init(void)
+{
-+ au_spl_init(&au_sbilist);
++ au_sphl_init(&au_sbilist);
+}
+
+static inline void au_sbilist_add(struct super_block *sb)
+{
-+ au_spl_add(&au_sbi(sb)->si_list, &au_sbilist);
++ au_sphl_add(&au_sbi(sb)->si_list, &au_sbilist);
+}
+
+static inline void au_sbilist_del(struct super_block *sb)
+{
-+ au_spl_del(&au_sbi(sb)->si_list, &au_sbilist);
++ au_sphl_del(&au_sbi(sb)->si_list, &au_sbilist);
+}
+
+#ifdef CONFIG_AUFS_MAGIC_SYSRQ
+
+/* ---------------------------------------------------------------------- */
+
-+static inline aufs_bindex_t au_sbend(struct super_block *sb)
++static inline aufs_bindex_t au_sbbot(struct super_block *sb)
+{
+ SiMustAnyLock(sb);
-+ return au_sbi(sb)->si_bend;
++ return au_sbi(sb)->si_bbot;
+}
+
+static inline unsigned int au_mntflags(struct super_block *sb)
+ return au_sbi(sb)->si_generation;
+}
+
++static inline unsigned long long au_ninodes(struct super_block *sb)
++{
++ s64 n = percpu_counter_sum(&au_sbi(sb)->si_ninodes);
++
++ BUG_ON(n < 0);
++ return n;
++}
++
+static inline void au_ninodes_inc(struct super_block *sb)
+{
-+ atomic_long_inc(&au_sbi(sb)->si_ninodes);
++ percpu_counter_inc(&au_sbi(sb)->si_ninodes);
+}
+
+static inline void au_ninodes_dec(struct super_block *sb)
+{
-+ AuDebugOn(!atomic_long_read(&au_sbi(sb)->si_ninodes));
-+ atomic_long_dec(&au_sbi(sb)->si_ninodes);
++ percpu_counter_dec(&au_sbi(sb)->si_ninodes);
++}
++
++static inline unsigned long long au_nfiles(struct super_block *sb)
++{
++ s64 n = percpu_counter_sum(&au_sbi(sb)->si_nfiles);
++
++ BUG_ON(n < 0);
++ return n;
+}
+
+static inline void au_nfiles_inc(struct super_block *sb)
+{
-+ atomic_long_inc(&au_sbi(sb)->si_nfiles);
++ percpu_counter_inc(&au_sbi(sb)->si_nfiles);
+}
+
+static inline void au_nfiles_dec(struct super_block *sb)
+{
-+ AuDebugOn(!atomic_long_read(&au_sbi(sb)->si_nfiles));
-+ atomic_long_dec(&au_sbi(sb)->si_nfiles);
++ percpu_counter_dec(&au_sbi(sb)->si_nfiles);
+}
+
+static inline struct au_branch *au_sbr(struct super_block *sb,
+#endif /* __AUFS_SUPER_H__ */
diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
--- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/sysaufs.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+}
diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
--- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.h 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/sysaufs.h 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+#endif /* __SYSAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
--- /usr/share/empty/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysfs.c 2016-04-24 18:32:51.393686895 +0200
++++ linux/fs/aufs/sysfs.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,376 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ ssize_t err;
+ int idx;
+ long l;
-+ aufs_bindex_t bend;
++ aufs_bindex_t bbot;
+ struct au_sbinfo *sbinfo;
+ struct super_block *sb;
+ struct seq_file *seq;
+
+ err = kstrtol(name, 10, &l);
+ if (!err) {
-+ bend = au_sbend(sb);
-+ if (l <= bend)
++ bbot = au_sbbot(sb);
++ if (l <= bbot)
+ err = sysaufs_si_br(seq, sb, (aufs_bindex_t)l, idx);
+ else
+ err = -ENOENT;
+{
+ int err;
+ int16_t brid;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ size_t sz;
+ char *buf;
+ struct seq_file *seq;
+ struct au_branch *br;
+
+ si_read_lock(sb, AuLock_FLUSH);
-+ bend = au_sbend(sb);
-+ err = bend + 1;
++ bbot = au_sbbot(sb);
++ err = bbot + 1;
+ if (!arg)
+ goto out;
+
+ goto out_buf;
+
+ sz = sizeof(*arg) - offsetof(union aufs_brinfo, path);
-+ for (bindex = 0; bindex <= bend; bindex++, arg++) {
++ for (bindex = 0; bindex <= bbot; bindex++, arg++) {
+ err = !access_ok(VERIFY_WRITE, arg, sizeof(*arg));
+ if (unlikely(err))
+ break;
+ struct kobject *kobj;
+ struct au_brsysfs *br_sysfs;
+ int i;
-+ aufs_bindex_t bend;
++ aufs_bindex_t bbot;
+
+ dbgaufs_brs_del(sb, bindex);
+
+ return;
+
+ kobj = &au_sbi(sb)->si_kobj;
-+ bend = au_sbend(sb);
-+ for (; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ br_sysfs = br->br_sysfs;
+ for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) {
+void sysaufs_brs_add(struct super_block *sb, aufs_bindex_t bindex)
+{
+ int err, i;
-+ aufs_bindex_t bend;
++ aufs_bindex_t bbot;
+ struct kobject *kobj;
+ struct au_branch *br;
+ struct au_brsysfs *br_sysfs;
+ return;
+
+ kobj = &au_sbi(sb)->si_kobj;
-+ bend = au_sbend(sb);
-+ for (; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ br_sysfs = br->br_sysfs;
+ snprintf(br_sysfs[AuBrSysfs_BR].name, sizeof(br_sysfs->name),
+}
diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
--- /usr/share/empty/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysrq.c 2016-04-24 18:32:51.397020264 +0200
++++ linux/fs/aufs/sysrq.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+
+ lockdep_off();
+ au_sbilist_lock();
-+ list_for_each_entry(sbinfo, &au_sbilist.head, si_list)
++ hlist_for_each_entry(sbinfo, &au_sbilist.head, si_list)
+ sysrq_sb(sbinfo->si_sb);
+ au_sbilist_unlock();
+ lockdep_on();
+}
diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
--- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c 2016-04-24 18:32:51.397020264 +0200
-@@ -0,0 +1,888 @@
++++ linux/fs/aufs/vdir.c 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,889 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+ int err;
+ unsigned int rdhash;
+ loff_t offset;
-+ aufs_bindex_t bend, bindex, bstart;
++ aufs_bindex_t bbot, bindex, btop;
+ unsigned char shwh;
+ struct file *hf, *file;
+ struct super_block *sb;
+ shwh = 1;
+ au_fset_fillvdir(arg->flags, SHWH);
+ }
-+ bstart = au_fbstart(file);
-+ bend = au_fbend_dir(file);
-+ for (bindex = bstart; !err && bindex <= bend; bindex++) {
++ btop = au_fbtop(file);
++ bbot = au_fbbot_dir(file);
++ for (bindex = btop; !err && bindex <= bbot; bindex++) {
+ hf = au_hf_dir(file, bindex);
+ if (!hf)
+ continue;
+ arg->bindex = bindex;
+ au_fclr_fillvdir(arg->flags, WHABLE);
+ if (shwh
-+ || (bindex != bend
++ || (bindex != bbot
+ && au_br_whable(au_sbr_perm(sb, bindex))))
+ au_fset_fillvdir(arg->flags, WHABLE);
+ do {
+ err = 0;
+ inode = file_inode(file);
+ IMustLock(inode);
++ IiMustWriteLock(inode);
+ SiMustAnyLock(inode->i_sb);
+
+ allocated = NULL;
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2016-04-24 18:32:51.397020264 +0200
++++ linux/fs/aufs/vfsub.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,884 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ goto out;
+ }
+
-+ atomic_inc(&br->br_count);
++ au_br_get(br);
+ fsnotify_open(file);
+
+out:
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2016-04-24 18:32:51.397020264 +0200
++++ linux/fs/aufs/vfsub.h 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,310 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+static inline int vfsub_update_time(struct inode *h_inode, struct timespec *ts,
+ int flags)
+{
-+ return generic_update_time(h_inode, ts, flags);
++ return update_time(h_inode, ts, flags);
+ /* no vfsub_update_h_iattr() since we don't have struct path */
+}
+
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2016-04-24 18:32:51.397020264 +0200
++++ linux/fs/aufs/wbr_policy.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,765 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ struct dentry *h_parent, void *arg)
+{
+ int err, rerr;
-+ aufs_bindex_t bopq, bstart;
++ aufs_bindex_t bopq, btop;
+ struct path h_path;
+ struct dentry *parent;
+ struct inode *h_dir, *h_inode, *inode, *dir;
+ unsigned int *flags = arg;
+
-+ bstart = au_dbstart(dentry);
++ btop = au_dbtop(dentry);
+ /* dentry is di-locked */
+ parent = dget_parent(dentry);
+ dir = d_inode(parent);
+ }
+ }
+
-+ err = au_cpdown_attr(&h_path, au_h_dptr(dentry, bstart));
++ err = au_cpdown_attr(&h_path, au_h_dptr(dentry, btop));
+ inode_unlock(h_inode);
+ if (unlikely(err))
+ goto out_opq;
+ }
+
+ inode = d_inode(dentry);
-+ if (au_ibend(inode) < bdst)
-+ au_set_ibend(inode, bdst);
++ if (au_ibbot(inode) < bdst)
++ au_set_ibbot(inode, bdst);
+ au_set_h_iptr(inode, bdst, au_igrab(h_inode),
+ au_hi_flags(inode, /*isdir*/1));
+ au_fhsm_wrote(dentry->d_sb, bdst, /*force*/0);
+ }
+out_put:
+ au_set_h_dptr(dentry, bdst, NULL);
-+ if (au_dbend(dentry) == bdst)
-+ au_update_dbend(dentry);
++ if (au_dbbot(dentry) == bdst)
++ au_update_dbbot(dentry);
+out:
+ dput(parent);
+ return err;
+ unsigned int flags __maybe_unused)
+{
+ int err;
-+ aufs_bindex_t bstart, bindex;
++ aufs_bindex_t btop, bindex;
+ struct super_block *sb;
+ struct dentry *parent, *h_parent;
+
+ sb = dentry->d_sb;
-+ bstart = au_dbstart(dentry);
-+ err = bstart;
-+ if (!au_br_rdonly(au_sbr(sb, bstart)))
++ btop = au_dbtop(dentry);
++ err = btop;
++ if (!au_br_rdonly(au_sbr(sb, btop)))
+ goto out;
+
+ err = -EROFS;
+ parent = dget_parent(dentry);
-+ for (bindex = au_dbstart(parent); bindex < bstart; bindex++) {
++ for (bindex = au_dbtop(parent); bindex < btop; bindex++) {
+ h_parent = au_h_dptr(parent, bindex);
+ if (!h_parent || d_is_negative(h_parent))
+ continue;
+
+ /* bottom up here */
+ if (unlikely(err < 0)) {
-+ err = au_wbr_bu(sb, bstart - 1);
++ err = au_wbr_bu(sb, btop - 1);
+ if (err >= 0)
+ err = au_wbr_nonopq(dentry, err);
+ }
+{
+ int err;
+
-+ err = au_wbr_bu(sb, au_sbend(sb));
++ err = au_wbr_bu(sb, au_sbbot(sb));
+ atomic_set(&au_sbi(sb)->si_wbr_rr_next, -err); /* less important */
+ /* smp_mb(); */
+
+{
+ int err, nbr;
+ unsigned int u;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct super_block *sb;
+ atomic_t *next;
+
+
+ sb = dentry->d_sb;
+ next = &au_sbi(sb)->si_wbr_rr_next;
-+ bend = au_sbend(sb);
-+ nbr = bend + 1;
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ nbr = bbot + 1;
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ if (!au_ftest_wbr(flags, DIR)) {
+ err = atomic_dec_return(next) + 1;
+ /* modulo for 0 is meaningless */
+ struct au_branch *br;
+ struct au_wbr_mfs *mfs;
+ struct dentry *h_parent;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ int err;
+ unsigned long long b, bavail;
+ struct path h_path;
+ mfs->mfsrr_bytes = 0;
+ if (!parent) {
+ bindex = 0;
-+ bend = au_sbend(sb);
++ bbot = au_sbbot(sb);
+ } else {
-+ bindex = au_dbstart(parent);
-+ bend = au_dbtaildir(parent);
++ bindex = au_dbtop(parent);
++ bbot = au_dbtaildir(parent);
+ }
+
-+ for (; bindex <= bend; bindex++) {
++ for (; bindex <= bbot; bindex++) {
+ if (parent) {
+ h_parent = au_h_dptr(parent, bindex);
+ if (!h_parent || d_is_negative(h_parent))
+{
+ int err, e2;
+ unsigned long long b;
-+ aufs_bindex_t bindex, bstart, bend;
++ aufs_bindex_t bindex, btop, bbot;
+ struct super_block *sb;
+ struct dentry *parent, *h_parent;
+ struct au_branch *br;
+ if (unlikely(err < 0))
+ goto out;
+ parent = dget_parent(dentry);
-+ bstart = au_dbstart(parent);
-+ bend = au_dbtaildir(parent);
-+ if (bstart == bend)
++ btop = au_dbtop(parent);
++ bbot = au_dbtaildir(parent);
++ if (btop == bbot)
+ goto out_parent; /* success */
+
+ e2 = au_wbr_create_mfs(dentry, flags);
+ b = br->br_wbr->wbr_bytes;
+ AuDbg("b%d, %llu\n", err, b);
+
-+ for (bindex = bstart; bindex <= bend; bindex++) {
++ for (bindex = btop; bindex <= bbot; bindex++) {
+ h_parent = au_h_dptr(parent, bindex);
+ if (!h_parent || d_is_negative(h_parent))
+ continue;
+static int au_wbr_copyup_bup(struct dentry *dentry)
+{
+ int err;
-+ aufs_bindex_t bindex, bstart;
++ aufs_bindex_t bindex, btop;
+ struct dentry *parent, *h_parent;
+ struct super_block *sb;
+
+ err = -EROFS;
+ sb = dentry->d_sb;
+ parent = dget_parent(dentry);
-+ bstart = au_dbstart(parent);
-+ for (bindex = au_dbstart(dentry); bindex >= bstart; bindex--) {
++ btop = au_dbtop(parent);
++ for (bindex = au_dbtop(dentry); bindex >= btop; bindex--) {
+ h_parent = au_h_dptr(parent, bindex);
+ if (!h_parent || d_is_negative(h_parent))
+ continue;
+
+ /* bottom up here */
+ if (unlikely(err < 0))
-+ err = au_wbr_bu(sb, bstart - 1);
++ err = au_wbr_bu(sb, btop - 1);
+
+ AuDbg("b%d\n", err);
+ return err;
+}
+
+/* bottom up */
-+int au_wbr_do_copyup_bu(struct dentry *dentry, aufs_bindex_t bstart)
++int au_wbr_do_copyup_bu(struct dentry *dentry, aufs_bindex_t btop)
+{
+ int err;
+
-+ err = au_wbr_bu(dentry->d_sb, bstart);
++ err = au_wbr_bu(dentry->d_sb, btop);
+ AuDbg("b%d\n", err);
-+ if (err > bstart)
++ if (err > btop)
+ err = au_wbr_nonopq(dentry, err);
+
+ AuDbg("b%d\n", err);
+static int au_wbr_copyup_bu(struct dentry *dentry)
+{
+ int err;
-+ aufs_bindex_t bstart;
++ aufs_bindex_t btop;
+
-+ bstart = au_dbstart(dentry);
-+ err = au_wbr_do_copyup_bu(dentry, bstart);
++ btop = au_dbtop(dentry);
++ err = au_wbr_do_copyup_bu(dentry, btop);
+ return err;
+}
+
+};
diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2016-04-24 18:32:51.397020264 +0200
++++ linux/fs/aufs/whout.c 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,1060 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ h_root = au_h_dptr(a->sb->s_root, bindex);
+ AuDebugOn(h_root != au_br_dentry(a->br));
+
-+ au_hn_imtx_lock_nested(hdir, AuLsc_I_PARENT);
++ au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT);
+ wbr_wh_write_lock(wbr);
+ err = au_h_verify(wbr->wbr_whbase, au_opt_udba(a->sb), hdir->hi_inode,
+ h_root, a->br);
+ if (!err)
+ err = au_wh_init(a->br, a->sb);
+ wbr_wh_write_unlock(wbr);
-+ au_hn_imtx_unlock(hdir);
++ au_hn_inode_unlock(hdir);
+ di_read_unlock(a->sb->s_root, AuLock_IR);
+ if (!err)
+ au_fhsm_wrote(a->sb, bindex, /*force*/0);
+out:
+ if (wbr)
+ atomic_dec(&wbr->wbr_wh_running);
-+ atomic_dec(&a->br->br_count);
++ au_br_put(a->br);
+ si_write_unlock(a->sb);
+ au_nwt_done(&au_sbi(a->sb)->si_nowait);
+ kfree(arg);
+ */
+ arg->sb = sb;
+ arg->br = br;
-+ atomic_inc(&br->br_count);
++ au_br_get(br);
+ wkq_err = au_wkq_nowait(reinit_br_wh, arg, sb, /*flags*/0);
+ if (unlikely(wkq_err)) {
+ atomic_dec(&br->br_wbr->wbr_wh_running);
-+ atomic_dec(&br->br_count);
++ au_br_put(br);
+ kfree(arg);
+ }
+ do_dec = 0;
+void au_whtmp_rmdir_free(struct au_whtmp_rmdir *whtmp)
+{
+ if (whtmp->br)
-+ atomic_dec(&whtmp->br->br_count);
++ au_br_put(whtmp->br);
+ dput(whtmp->wh_dentry);
+ iput(whtmp->dir);
+ au_nhash_wh_free(&whtmp->whlist);
+ }
+
+ if (!err) {
-+ if (au_ibstart(dir) == bindex) {
++ if (au_ibtop(dir) == bindex) {
+ /* todo: dir->i_mutex is necessary */
+ au_cpup_attr_timesizes(dir);
+ if (h_nlink)
+ err = vfsub_mnt_want_write(au_br_mnt(a->br));
+ if (unlikely(err))
+ goto out_mnt;
-+ au_hn_imtx_lock_nested(hdir, AuLsc_I_PARENT);
++ au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT);
+ err = au_h_verify(a->wh_dentry, au_opt_udba(sb), h_dir, h_parent,
+ a->br);
+ if (!err)
+ err = au_whtmp_rmdir(a->dir, bindex, a->wh_dentry, &a->whlist);
-+ au_hn_imtx_unlock(hdir);
++ au_hn_inode_unlock(hdir);
+ vfsub_mnt_drop_write(au_br_mnt(a->br));
+
+out_mnt:
+ sb = dir->i_sb;
+ args->dir = au_igrab(dir);
+ args->br = au_sbr(sb, bindex);
-+ atomic_inc(&args->br->br_count);
++ au_br_get(args->br);
+ args->wh_dentry = dget(wh_dentry);
+ wkq_err = au_wkq_nowait(call_rmdir_whtmp, args, sb, /*flags*/0);
+ if (unlikely(wkq_err)) {
+}
diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
--- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h 2016-04-24 18:32:51.397020264 +0200
++++ linux/fs/aufs/whout.h 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+#endif /* __AUFS_WHOUT_H__ */
diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
--- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c 2016-04-24 18:32:51.397020264 +0200
-@@ -0,0 +1,213 @@
++++ linux/fs/aufs/wkq.c 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+ int err;
+ struct au_wkinfo *wkinfo;
+
-+ atomic_inc(&au_sbi(sb)->si_nowait.nw_len);
++ percpu_counter_inc(&au_sbi(sb)->si_nowait.nw_len);
+
+ /*
+ * wkq_func() must free this wkinfo.
+
+void au_nwt_init(struct au_nowait_tasks *nwt)
+{
-+ atomic_set(&nwt->nw_len, 0);
-+ /* smp_mb(); */ /* atomic_set */
++ percpu_counter_init(&nwt->nw_len, 0, GFP_NOFS);
+ init_waitqueue_head(&nwt->nw_wq);
+}
+
++void au_nwt_fin(struct au_nowait_tasks *nwt)
++{
++ AuDebugOn(percpu_counter_sum(&nwt->nw_len));
++ percpu_counter_destroy(&nwt->nw_len);
++}
++
+void au_wkq_fin(void)
+{
+ destroy_workqueue(au_wkq);
+}
diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
--- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h 2016-04-24 18:32:51.397020264 +0200
-@@ -0,0 +1,91 @@
++++ linux/fs/aufs/wkq.h 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+
+#ifdef __KERNEL__
+
++#include <linux/percpu_counter.h>
++
+struct super_block;
+
+/* ---------------------------------------------------------------------- */
+ * in the next operation, wait for the 'nowait' tasks in system-wide workqueue
+ */
+struct au_nowait_tasks {
-+ atomic_t nw_len;
++ struct percpu_counter nw_len;
+ wait_queue_head_t nw_wq;
+};
+
+int au_wkq_nowait(au_wkq_func_t func, void *args, struct super_block *sb,
+ unsigned int flags);
+void au_nwt_init(struct au_nowait_tasks *nwt);
++void au_nwt_fin(struct au_nowait_tasks *nwt);
+int __init au_wkq_init(void);
+void au_wkq_fin(void);
+
+
+static inline void au_nwt_done(struct au_nowait_tasks *nwt)
+{
-+ if (atomic_dec_and_test(&nwt->nw_len))
++ percpu_counter_dec(&nwt->nw_len);
++ if (!percpu_counter_sum(&nwt->nw_len))
+ wake_up_all(&nwt->nw_wq);
+}
+
+static inline int au_nwt_flush(struct au_nowait_tasks *nwt)
+{
-+ wait_event(nwt->nw_wq, !atomic_read(&nwt->nw_len));
++ wait_event(nwt->nw_wq, !percpu_counter_sum(&nwt->nw_len));
+ return 0;
+}
+
+#endif /* __AUFS_WKQ_H__ */
diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
--- /usr/share/empty/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c 2016-04-24 18:32:51.397020264 +0200
-@@ -0,0 +1,344 @@
++++ linux/fs/aufs/xattr.c 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,345 @@
+/*
+ * Copyright (C) 2014-2016 Junjiro R. Okajima
+ *
+ arg->u.list.list, arg->u.list.size);
+ break;
+ case AU_XATTR_GET:
++ AuDebugOn(d_is_negative(h_path.dentry));
+ err = vfs_getxattr(h_path.dentry,
+ arg->u.get.name, arg->u.get.value,
+ arg->u.get.size);
+ return au_lgxattr(dentry, &arg);
+}
+
-+ssize_t aufs_getxattr(struct dentry *dentry, const char *name, void *value,
-+ size_t size)
++ssize_t aufs_getxattr(struct dentry *dentry, struct inode *inode __maybe_unused,
++ const char *name, void *value, size_t size)
+{
+ struct au_lgxattr arg = {
+ .type = AU_XATTR_GET,
+ return au_lgxattr(dentry, &arg);
+}
+
-+int aufs_setxattr(struct dentry *dentry, const char *name, const void *value,
-+ size_t size, int flags)
++int aufs_setxattr(struct dentry *dentry, struct inode *inode, const char *name,
++ const void *value, size_t size, int flags)
+{
+ struct au_srxattr arg = {
+ .type = AU_XATTR_SET,
+ },
+ };
+
-+ return au_srxattr(dentry, &arg);
++ return au_srxattr(dentry, inode, &arg);
+}
+
+int aufs_removexattr(struct dentry *dentry, const char *name)
+ },
+ };
+
-+ return au_srxattr(dentry, &arg);
++ return au_srxattr(dentry, d_inode(dentry), &arg);
+}
+
+/* ---------------------------------------------------------------------- */
+#endif
diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
--- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c 2016-04-24 18:32:51.397020264 +0200
-@@ -0,0 +1,1318 @@
++++ linux/fs/aufs/xino.c 2016-07-25 19:05:34.817826663 +0200
+@@ -0,0 +1,1317 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+ *
+ bindex = au_br_index(sb, brid);
+ if (bindex >= 0) {
+ ldir->hdir = au_hi(d_inode(sb->s_root), bindex);
-+ au_hn_imtx_lock_nested(ldir->hdir, AuLsc_I_PARENT);
++ au_hn_inode_lock_nested(ldir->hdir, AuLsc_I_PARENT);
+ } else {
+ ldir->parent = dget_parent(xino->f_path.dentry);
+ ldir->dir = d_inode(ldir->parent);
+static void au_xino_unlock_dir(struct au_xino_lock_dir *ldir)
+{
+ if (ldir->hdir)
-+ au_hn_imtx_unlock(ldir->hdir);
++ au_hn_inode_unlock(ldir->hdir);
+ else {
+ inode_unlock(ldir->dir);
+ dput(ldir->parent);
+ int err;
+ unsigned long jiffy;
+ blkcnt_t blocks;
-+ aufs_bindex_t bi, bend;
++ aufs_bindex_t bi, bbot;
+ struct kstatfs *st;
+ struct au_branch *br;
+ struct file *new_xino, *file;
+ goto out;
+
+ err = -EINVAL;
-+ bend = au_sbend(sb);
-+ if (unlikely(bindex < 0 || bend < bindex))
++ bbot = au_sbbot(sb);
++ if (unlikely(bindex < 0 || bbot < bindex))
+ goto out_st;
+ br = au_sbr(sb, bindex);
+ file = br->br_xino.xi_file;
+ br->br_xino.xi_file = new_xino;
+
+ h_sb = au_br_sb(br);
-+ for (bi = 0; bi <= bend; bi++) {
++ for (bi = 0; bi <= bbot; bi++) {
+ if (unlikely(bi == bindex))
+ continue;
+ br = au_sbr(sb, bi);
+ if (unlikely(err))
+ pr_warn("err b%d, (%d)\n", bindex, err);
+ atomic_dec(&br->br_xino_running);
-+ atomic_dec(&br->br_count);
++ au_br_put(br);
+ si_write_unlock(sb);
+ au_nwt_done(&au_sbi(sb)->si_nowait);
+ kfree(args);
+ goto out_args;
+ }
+
-+ atomic_inc(&br->br_count);
++ au_br_get(br);
+ args->sb = sb;
+ args->br = br;
+ wkq_err = au_wkq_nowait(xino_do_trunc, args, sb, /*flags*/0);
+ return; /* success */
+
+ pr_err("wkq %d\n", wkq_err);
-+ atomic_dec(&br->br_count);
++ au_br_put(br);
+
+out_args:
+ kfree(args);
+{
+ int err;
+ unsigned int mnt_flags;
-+ aufs_bindex_t bindex, bend, bi;
++ aufs_bindex_t bindex, bbot, bi;
+ unsigned char try_trunc;
+ struct au_iinfo *iinfo;
+ struct super_block *sb;
+ struct au_branch *br;
+ vfs_writef_t xwrite;
+
++ AuDebugOn(au_is_bad_inode(inode));
++
+ sb = inode->i_sb;
+ mnt_flags = au_mntflags(sb);
+ if (!au_opt_test(mnt_flags, XINO)
+ }
+
+ iinfo = au_ii(inode);
-+ if (!iinfo)
-+ return;
-+
-+ bindex = iinfo->ii_bstart;
++ bindex = iinfo->ii_btop;
+ if (bindex < 0)
+ return;
+
+ xwrite = au_sbi(sb)->si_xwrite;
+ try_trunc = !!au_opt_test(mnt_flags, TRUNC_XINO);
-+ hi = iinfo->ii_hinode + bindex;
-+ bend = iinfo->ii_bend;
-+ for (; bindex <= bend; bindex++, hi++) {
++ hi = au_hinode(iinfo, bindex);
++ bbot = iinfo->ii_bbot;
++ for (; bindex <= bbot; bindex++, hi++) {
+ h_inode = hi->hi_inode;
+ if (!h_inode
+ || (!unlinked && h_inode->i_nlink))
+
+/*
+ * find another branch who is on the same filesystem of the specified
-+ * branch{@btgt}. search until @bend.
++ * branch{@btgt}. search until @bbot.
+ */
+static int is_sb_shared(struct super_block *sb, aufs_bindex_t btgt,
-+ aufs_bindex_t bend)
++ aufs_bindex_t bbot)
+{
+ aufs_bindex_t bindex;
+ struct super_block *tgt_sb = au_sbr_sb(sb, btgt);
+ for (bindex = 0; bindex < btgt; bindex++)
+ if (unlikely(tgt_sb == au_sbr_sb(sb, bindex)))
+ return bindex;
-+ for (bindex++; bindex <= bend; bindex++)
++ for (bindex++; bindex <= bbot; bindex++)
+ if (unlikely(tgt_sb == au_sbr_sb(sb, bindex)))
+ return bindex;
+ return -1;
+{
+ int err;
+ ino_t ino;
-+ aufs_bindex_t bend, bindex;
++ aufs_bindex_t bbot, bindex;
+ struct au_branch *shared_br, *b;
+ struct file *file;
+ struct super_block *tgt_sb;
+
+ shared_br = NULL;
-+ bend = au_sbend(sb);
++ bbot = au_sbbot(sb);
+ if (do_test) {
+ tgt_sb = au_br_sb(br);
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ b = au_sbr(sb, bindex);
+ if (tgt_sb == au_br_sb(b)) {
+ shared_br = b;
+static int xib_restore(struct super_block *sb)
+{
+ int err;
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ void *page;
+
+ err = -ENOMEM;
+ goto out;
+
+ err = 0;
-+ bend = au_sbend(sb);
-+ for (bindex = 0; !err && bindex <= bend; bindex++)
++ bbot = au_sbbot(sb);
++ for (bindex = 0; !err && bindex <= bbot; bindex++)
+ if (!bindex || is_sb_shared(sb, bindex, bindex - 1) < 0)
+ err = do_xib_restore
+ (sb, au_sbr(sb, bindex)->br_xino.xi_file, page);
+/* xino for each branch */
+static void xino_clear_br(struct super_block *sb)
+{
-+ aufs_bindex_t bindex, bend;
++ aufs_bindex_t bindex, bbot;
+ struct au_branch *br;
+
-+ bend = au_sbend(sb);
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ bbot = au_sbbot(sb);
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ if (!br || !br->br_xino.xi_file)
+ continue;
+{
+ int err;
+ ino_t ino;
-+ aufs_bindex_t bindex, bend, bshared;
++ aufs_bindex_t bindex, bbot, bshared;
+ struct {
+ struct file *old, *new;
+ } *fpair, *p;
+ SiMustWriteLock(sb);
+
+ err = -ENOMEM;
-+ bend = au_sbend(sb);
-+ fpair = kcalloc(bend + 1, sizeof(*fpair), GFP_NOFS);
++ bbot = au_sbbot(sb);
++ fpair = kcalloc(bbot + 1, sizeof(*fpair), GFP_NOFS);
+ if (unlikely(!fpair))
+ goto out;
+
+ inode = d_inode(sb->s_root);
+ ino = AUFS_ROOT_INO;
+ writef = au_sbi(sb)->si_xwrite;
-+ for (bindex = 0, p = fpair; bindex <= bend; bindex++, p++) {
-+ br = au_sbr(sb, bindex);
++ for (bindex = 0, p = fpair; bindex <= bbot; bindex++, p++) {
+ bshared = is_sb_shared(sb, bindex, bindex - 1);
+ if (bshared >= 0) {
+ /* shared xino */
+
+ if (!p->new) {
+ /* new xino */
++ br = au_sbr(sb, bindex);
+ p->old = br->br_xino.xi_file;
+ p->new = au_xino_create2(base, br->br_xino.xi_file);
+ err = PTR_ERR(p->new);
+ goto out_pair;
+ }
+
-+ for (bindex = 0, p = fpair; bindex <= bend; bindex++, p++) {
++ for (bindex = 0, p = fpair; bindex <= bbot; bindex++, p++) {
+ br = au_sbr(sb, bindex);
+ if (br->br_xino.xi_file)
+ fput(br->br_xino.xi_file);
+ }
+
+out_pair:
-+ for (bindex = 0, p = fpair; bindex <= bend; bindex++, p++)
++ for (bindex = 0, p = fpair; bindex <= bbot; bindex++, p++)
+ if (p->new)
+ fput(p->new);
+ else
+ struct au_branch *br;
+ struct super_block *h_sb;
+ struct path path;
-+ aufs_bindex_t bend, bindex, bwr;
++ aufs_bindex_t bbot, bindex, bwr;
+
+ br = NULL;
-+ bend = au_sbend(sb);
++ bbot = au_sbbot(sb);
+ bwr = -1;
-+ for (bindex = 0; bindex <= bend; bindex++) {
++ for (bindex = 0; bindex <= bbot; bindex++) {
+ br = au_sbr(sb, bindex);
+ if (au_br_writable(br->br_perm)
+ && !au_test_fs_bad_xino(au_br_sb(br))) {
+}
diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h 2016-04-24 18:32:51.397020264 +0200
++++ linux/include/uapi/linux/aufs_type.h 2016-07-25 19:05:34.817826663 +0200
@@ -0,0 +1,419 @@
+/*
+ * Copyright (C) 2005-2016 Junjiro R. Okajima
+
+#include <linux/limits.h>
+
-+#define AUFS_VERSION "4.5-20160328"
++#define AUFS_VERSION "4.x-rcN-20160704"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
+#define AUFS_CTL_FHSM_FD _IOW(AuCtlType, AuCtl_FHSM_FD, int)
+
+#endif /* __AUFS_TYPE_H__ */
-aufs4.5 loopback patch
+aufs4.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 0b816b2..86dd454 100644
+index 7339e65..76e5da4 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -556,7 +556,7 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
+@@ -562,7 +562,7 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
}
struct switch_request {
struct completion wait;
};
-@@ -582,6 +582,7 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
+@@ -588,6 +588,7 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
mapping = file->f_mapping;
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
lo->lo_backing_file = file;
lo->lo_blocksize = S_ISBLK(mapping->host->i_mode) ?
mapping->host->i_bdev->bd_block_size : PAGE_SIZE;
lo->old_gfp_mask = mapping_gfp_mask(mapping);
-@@ -594,11 +595,13 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
+@@ -600,11 +601,13 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p)
* First it needs to flush existing IO, it does this by sending a magic
* BIO down the pipe. The completion of this BIO does the actual switch.
*/
/* freeze queue and wait for completion of scheduled requests */
blk_mq_freeze_queue(lo->lo_queue);
-@@ -617,7 +620,16 @@ static int loop_switch(struct loop_device *lo, struct file *file)
+@@ -623,7 +626,16 @@ static int loop_switch(struct loop_device *lo, struct file *file)
*/
static int loop_flush(struct loop_device *lo)
{
}
static void loop_reread_partitions(struct loop_device *lo,
-@@ -654,6 +666,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -660,6 +672,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
unsigned int arg)
{
struct file *file, *old_file;
struct inode *inode;
int error;
-@@ -670,9 +683,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -676,9 +689,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
file = fget(arg);
if (!file)
goto out;
error = -EINVAL;
-@@ -684,17 +704,21 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -690,17 +710,21 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
goto out_putf;
/* and ... switch */
out:
return error;
}
-@@ -881,7 +905,7 @@ static int loop_prepare_queue(struct loop_device *lo)
+@@ -887,7 +911,7 @@ static int loop_prepare_queue(struct loop_device *lo)
static int loop_set_fd(struct loop_device *lo, fmode_t mode,
struct block_device *bdev, unsigned int arg)
{
struct inode *inode;
struct address_space *mapping;
unsigned lo_blocksize;
-@@ -896,6 +920,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -902,6 +926,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
file = fget(arg);
if (!file)
goto out;
error = -EBUSY;
if (lo->lo_state != Lo_unbound)
-@@ -948,6 +978,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -954,6 +984,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
lo->lo_backing_file = file;
lo->transfer = NULL;
lo->ioctl = NULL;
lo->lo_sizelimit = 0;
-@@ -980,6 +1011,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -986,6 +1017,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
out_putf:
fput(file);
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
-@@ -1026,6 +1059,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
+@@ -1032,6 +1065,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
static int loop_clr_fd(struct loop_device *lo)
{
struct file *filp = lo->lo_backing_file;
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
-@@ -1057,6 +1091,7 @@ static int loop_clr_fd(struct loop_device *lo)
+@@ -1063,6 +1097,7 @@ static int loop_clr_fd(struct loop_device *lo)
spin_lock_irq(&lo->lo_lock);
lo->lo_state = Lo_rundown;
lo->lo_backing_file = NULL;
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
-@@ -1101,6 +1136,8 @@ static int loop_clr_fd(struct loop_device *lo)
+@@ -1107,6 +1142,8 @@ static int loop_clr_fd(struct loop_device *lo)
* bd_mutex which is usually taken before lo_ctl_mutex.
*/
fput(filp);
unsigned lo_blocksize;
void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index ac1304a..0cefd8a 100644
+index 504b767..09426ad 100644
--- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c
-@@ -399,7 +399,7 @@ static ssize_t aufs_splice_read(struct file *file, loff_t *ppos,
+@@ -346,7 +346,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
if (IS_ERR(h_file))
goto out;
#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 7928a50..9466cc9 100644
+index 8bd2d9c..26581c0 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
@@ -832,7 +832,10 @@ static const struct super_operations aufs_sop = {
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 99fc2bd..842a2e0 100644
+index 33c6953..f9b06a2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1759,6 +1759,10 @@ struct super_operations {
+@@ -1805,6 +1805,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
projects / packages / kernel.git / commitdiff