-aufs3.19 kbuild patch
+aufs3.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index 664991a..1481093 100644
+index ec35851..a059d62 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -210,6 +210,7 @@ source "fs/ufs/Kconfig"
+@@ -218,6 +218,7 @@ source "fs/sysv/Kconfig"
+ source "fs/ufs/Kconfig"
source "fs/exofs/Kconfig"
source "fs/f2fs/Kconfig"
- source "fs/efivarfs/Kconfig"
+source "fs/aufs/Kconfig"
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index bedff48..9e7c0b7 100644
+index a88ac48..162500e 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -126,3 +126,4 @@ obj-y += exofs/ # Multiple modules
obj-$(CONFIG_EFIVAR_FS) += efivarfs/
+obj-$(CONFIG_AUFS_FS) += aufs/
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
-index 00b10002..f4a389c 100644
+index 68ceb97..0352fa4 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
-@@ -57,6 +57,7 @@ header-y += atmsvc.h
+@@ -58,6 +58,7 @@ header-y += atmsvc.h
header-y += atm_tcp.h
header-y += atm_zatm.h
header-y += audit.h
header-y += auto_fs4.h
header-y += auto_fs.h
header-y += auxvec.h
-aufs3.19 base patch
+aufs3.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index d66a97d..1c113a4 100644
+index efbcb50..30a1654 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -1833,6 +1833,20 @@ F: include/linux/audit.h
+@@ -1864,6 +1864,20 @@ 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 6cb1beb..30efd68 100644
+index d1f168b..a0da519 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -692,6 +692,24 @@ static inline int is_loop_device(struct file *file)
+@@ -592,6 +592,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 e368d4f..eaed72c 100644
+index c71e373..b93a9f2 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1019,7 +1019,7 @@ enum d_walk_ret {
+@@ -1130,7 +1130,7 @@ enum d_walk_ret {
*
* The @enter() and @finish() callbacks are called with d_lock held.
*/
enum d_walk_ret (*enter)(void *, struct dentry *),
void (*finish)(void *))
{
-diff --git a/fs/inode.c b/fs/inode.c
-index aa149e7..98d87de 100644
---- a/fs/inode.c
-+++ b/fs/inode.c
-@@ -1499,7 +1499,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
- * 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)
- {
- if (inode->i_op->update_time)
- return inode->i_op->update_time(inode, time, flags);
diff --git a/fs/splice.c b/fs/splice.c
-index 75c6058..619359a 100644
+index 7968da9..beb9993 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1114,8 +1114,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1099,8 +1099,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);
-@@ -1131,9 +1131,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1116,9 +1116,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/fs.h b/include/linux/fs.h
-index 42efe13..f634198 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -2690,6 +2690,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
- extern int inode_newsize_ok(const struct inode *, loff_t offset);
- extern void setattr_copy(struct inode *inode, const struct iattr *attr);
+diff --git a/include/linux/file.h b/include/linux/file.h
+index f87d308..9a290b3 100644
+--- a/include/linux/file.h
++++ b/include/linux/file.h
+@@ -19,6 +19,7 @@ struct dentry;
+ struct path;
+ extern struct file *alloc_file(struct path *, fmode_t mode,
+ const struct file_operations *fop);
++extern struct file *get_empty_filp(void);
-+extern int update_time(struct inode *, struct timespec *, int);
- extern int file_update_time(struct file *file);
-
- extern int generic_show_options(struct seq_file *m, struct dentry *root);
+ static inline void fput_light(struct file *file, int fput_needed)
+ {
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
-aufs3.19 mmap patch
+aufs3.x-rcN mmap patch
diff --git a/fs/buffer.c b/fs/buffer.c
index 20805db..363569f 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 246eae8..dfd0875 100644
+index 6dee68d..9afa35d 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
-@@ -276,7 +276,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -279,7 +279,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
const char *name = NULL;
if (file) {
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1475,7 +1478,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1479,7 +1482,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;
- struct file *file = vma->vm_file;
+ struct file *file = vma_pr_or_file(vma);
struct mm_struct *mm = vma->vm_mm;
- struct mm_walk walk = {};
- struct mempolicy *pol;
+ struct mm_walk walk = {
+ .hugetlb_entry = gather_hugetlb_stats,
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 599ec2e..de6cd6e 100644
+index 599ec2e..1740207 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -160,7 +160,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
- struct inode *inode = file_inode(vma->vm_file);
+ struct inode *inode;
+
-+ file = vma_pr_or_file(file);
++ file = vma_pr_or_file(vma);
+ inode = file_inode(file);
dev = inode->i_sb->s_dev;
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 dd5ea30..445d798 100644
+index 47a9392..c8f8b46 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1224,6 +1224,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1254,6 +1254,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
}
#endif
-+#ifdef CONFIG_MMU
+extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int);
+extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[],
+ int);
+ __LINE__)
+#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__)
+#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__)
-+#else
++
++#ifndef CONFIG_MMU
+extern struct file *vmr_do_pr_or_file(struct vm_region *, const char[], int);
+extern void vmr_do_fput(struct vm_region *, const char[], int);
+
+#define vmr_pr_or_file(region) vmr_do_pr_or_file(region, __func__, \
+ __LINE__)
+#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__)
-+#endif /* CONFIG_MMU */
++#endif /* !CONFIG_MMU */
+
extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
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 6d34aa2..f13dd51 100644
+index 199a03a..ed38ea3 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -233,6 +233,7 @@ struct vm_region {
+@@ -241,6 +241,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
-@@ -301,6 +302,7 @@ struct vm_area_struct {
+@@ -305,6 +306,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units, *not* PAGE_CACHE_SIZE */
struct file * vm_file; /* File we map to (can be NULL). */
#ifndef CONFIG_MMU
diff --git a/kernel/fork.c b/kernel/fork.c
-index 4dc2dda..5984c61 100644
+index cf65139..f28a048 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -430,7 +430,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
-index 4bf586e..59bd276 100644
+index 15dbe99..88e25b5 100644
--- a/mm/Makefile
+++ b/mm/Makefile
-@@ -18,7 +18,7 @@ obj-y := filemap.o mempool.o oom_kill.o \
+@@ -21,7 +21,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 \
-- iov_iter.o debug.o $(mmu-y)
-+ iov_iter.o prfile.o debug.o $(mmu-y)
+- debug.o $(mmu-y)
++ prfile.o debug.o $(mmu-y)
obj-y += init-mm.o
diff --git a/mm/filemap.c b/mm/filemap.c
-index 673e458..a623932 100644
+index ad72420..8885258 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -2063,7 +2063,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+@@ -2064,7 +2064,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);
lock_page(page);
if (page->mapping != inode->i_mapping) {
unlock_page(page);
-diff --git a/mm/fremap.c b/mm/fremap.c
-index 2805d71..1b011b0 100644
---- a/mm/fremap.c
-+++ b/mm/fremap.c
-@@ -224,16 +224,28 @@ get_write_lock:
- */
- if (mapping_cap_account_dirty(mapping)) {
- unsigned long addr;
-- struct file *file = get_file(vma->vm_file);
-+ struct file *file = vma->vm_file,
-+ *prfile = vma->vm_prfile;
-+
- /* mmap_region may free vma; grab the info now */
- vm_flags = vma->vm_flags;
-
-+ vma_get_file(vma);
- addr = mmap_region(file, start, size, vm_flags, pgoff);
-- fput(file);
-+ vma_fput(vma);
- if (IS_ERR_VALUE(addr)) {
- err = addr;
- } else {
- BUG_ON(addr != start);
-+ if (prfile) {
-+ struct vm_area_struct *new_vma;
-+
-+ new_vma = find_vma(mm, addr);
-+ if (!new_vma->vm_prfile)
-+ new_vma->vm_prfile = prfile;
-+ if (new_vma != vma)
-+ get_file(prfile);
-+ }
- err = 0;
- }
- goto out_freed;
diff --git a/mm/madvise.c b/mm/madvise.c
-index a271adc..29a932f 100644
+index d551475..1ebf71b 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
-@@ -324,12 +324,12 @@ static long madvise_remove(struct vm_area_struct *vma,
+@@ -320,12 +320,12 @@ static long madvise_remove(struct vm_area_struct *vma,
* vma's reference to the file) can go away as soon as we drop
* mmap_sem.
*/
return error;
}
diff --git a/mm/memory.c b/mm/memory.c
-index 2c3536c..444bb1d 100644
+index 97839f5..5e5d491 100644
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -2157,7 +2157,7 @@ reuse:
-
- /* file_update_time outside page_lock */
- if (vma->vm_file)
-- file_update_time(vma->vm_file);
-+ vma_file_update_time(vma);
+@@ -2034,7 +2034,7 @@ static inline int wp_page_reuse(struct m
}
- put_page(dirty_page);
- if (page_mkwrite) {
+
+ if (!page_mkwrite)
+- file_update_time(vma->vm_file);
++ vma_file_update_time(vma);
+ }
+
+ return VM_FAULT_WRITE;
diff --git a/mm/mmap.c b/mm/mmap.c
-index 7f684d5..ffa1b91 100644
+index 9ec50a3..4a6a641 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
-@@ -277,7 +277,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -274,7 +274,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;
-@@ -897,7 +897,7 @@ again: remove_next = 1 + (end > next->vm_end);
+@@ -886,7 +886,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);
-@@ -1682,8 +1682,8 @@ out:
+@@ -1671,8 +1671,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);
-@@ -2484,7 +2484,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2473,7 +2473,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);
-@@ -2503,7 +2503,7 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2492,7 +2492,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));
-@@ -2895,7 +2895,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2635,7 +2635,6 @@ 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;
+
+ pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. "
+ "See Documentation/vm/remap_file_pages.txt.\n",
+@@ -2679,10 +2678,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+ munlock_vma_pages_range(vma, start, start + size);
+ }
+
+- file = get_file(vma->vm_file);
++ vma_get_file(vma);
+ ret = do_mmap_pgoff(vma->vm_file, start, size,
+ prot, flags, pgoff, &populate);
+- fput(file);
++ vma_fput(vma);
+ out:
+ up_write(&mm->mmap_sem);
+ if (populate)
+@@ -2950,7 +2949,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/msync.c b/mm/msync.c
-index 992a167..ce1915b 100644
+index bb04d53..5c24c54 100644
--- a/mm/msync.c
+++ b/mm/msync.c
-@@ -84,13 +84,13 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
+@@ -84,10 +84,10 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
start = vma->vm_end;
if ((flags & MS_SYNC) && file &&
(vma->vm_flags & VM_SHARED)) {
- get_file(file);
+ vma_get_file(vma);
up_read(&mm->mmap_sem);
- if (vma->vm_flags & VM_NONLINEAR)
- error = vfs_fsync(file, 1);
- else
- error = vfs_fsync_range(file, fstart, fend, 1);
+ error = vfs_fsync_range(file, fstart, fend, 1);
- fput(file);
+ vma_fput(vma);
if (error || start >= end)
goto out;
down_read(&mm->mmap_sem);
diff --git a/mm/nommu.c b/mm/nommu.c
-index 28bd8c4..3c0ace2 100644
+index 3fba2dc..870ce96 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
-@@ -659,7 +659,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -693,7 +693,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 */
-@@ -824,7 +824,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -858,7 +858,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);
}
-@@ -1375,7 +1375,7 @@ unsigned long do_mmap_pgoff(struct file *file,
+@@ -1398,7 +1398,7 @@ unsigned long do_mmap_pgoff(struct file *file,
goto error_just_free;
}
}
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
-@@ -1451,10 +1451,10 @@ error_just_free:
+@@ -1474,10 +1474,10 @@ error_just_free:
up_write(&nommu_region_sem);
error:
if (region->vm_file)
return ret;
diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644
-index 0000000..fc708d2
+index 0000000..6aa5ab5
--- /dev/null
+++ b/mm/prfile.c
@@ -0,0 +1,86 @@
+#ifdef PRFILE_TRACE
+ if (pr)
+ pr_info("%s:%d: %s, %p\n", func, line, func2,
-+ f ? (char *)f->f_dentry->d_name.name : "(null)");
++ f ? (char *)f->f_path.dentry->d_name.name : "(null)");
+#endif
+}
+
-+#ifdef CONFIG_MMU
+void vma_do_file_update_time(struct vm_area_struct *vma, const char func[],
+ int line)
+{
+ if (f && pr)
+ fput(pr);
+}
-+#else
++
++#ifndef CONFIG_MMU
+struct file *vmr_do_pr_or_file(struct vm_region *region, const char func[],
+ int line)
+{
+ if (f && pr)
+ fput(pr);
+}
-+#endif /* CONFIG_MMU */
-aufs3.19 standalone patch
++#endif /* !CONFIG_MMU */
+aufs3.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
-index eaed72c..3b4386e 100644
+index b93a9f2..5a010ee 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1124,6 +1124,7 @@ rename_retry:
+@@ -1235,6 +1235,7 @@ rename_retry:
seq = 1;
goto again;
}
/*
* Search for at least 1 mount point in the dentry's subdirs.
+diff --git a/fs/file_table.c b/fs/file_table.c
+index 3f85411..00e9dcf 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -147,6 +147,7 @@ over:
+ }
+ return ERR_PTR(-ENFILE);
+ }
++EXPORT_SYMBOL(get_empty_filp);
+
+ /**
+ * alloc_file - allocate and initialize a 'struct file'
+@@ -308,6 +309,7 @@ void put_filp(struct file *file)
+ file_free(file);
+ }
+ }
++EXPORT_SYMBOL(put_filp);
+
+ void __init files_init(unsigned long mempages)
+ {
diff --git a/fs/inode.c b/fs/inode.c
-index 98d87de..084d84f 100644
+index f00b16f..eb7b8b5 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -57,6 +57,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
+@@ -58,6 +58,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
__cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
/*
* Empty aops. Can be used for the cases where the user does not
-@@ -1515,6 +1516,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
- mark_inode_dirty_sync(inode);
- return 0;
- }
-+EXPORT_SYMBOL(update_time);
-
- /**
- * touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
-index cd1e968..a99a3a7 100644
+index 82ef140..a3aa4b9 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -454,6 +454,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
+@@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
mnt_dec_writers(real_mount(mnt));
preempt_enable();
}
/**
* mnt_drop_write - give up write access to a mount
-@@ -1728,6 +1729,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1718,6 +1719,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
static int fsnotify_mark_destroy(void *ignored)
{
diff --git a/fs/open.c b/fs/open.c
-index 813be03..328f0d6 100644
+index 33f9cbf..fcc7eb4 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -62,6 +62,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
long vfs_truncate(struct path *path, loff_t length)
{
+@@ -672,6 +673,7 @@ int open_check_o_direct(struct file *f)
+ }
+ return 0;
+ }
++EXPORT_SYMBOL(open_check_o_direct);
+
+ static int do_dentry_open(struct file *f,
+ int (*open)(struct inode *, struct file *),
diff --git a/fs/splice.c b/fs/splice.c
-index 619359a..c14f60e 100644
+index beb9993..813275a 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1127,6 +1127,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1112,6 +1112,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.
-@@ -1153,6 +1154,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1138,6 +1139,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return splice_read(in, ppos, pipe, len, flags);
}
/* Compare an extended attribute value with the given value */
int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
diff --git a/security/commoncap.c b/security/commoncap.c
-index 2915d85..58382dd 100644
+index f66713b..fd4c4b8 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
-@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr)
+@@ -975,9 +975,11 @@ int cap_mmap_addr(unsigned long addr)
}
return ret;
}
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
-index 18b35c6..12c67af 100644
+index e81d5bb..0b7b840 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -407,6 +407,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+@@ -430,6 +430,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
return 0;
return security_ops->path_rmdir(dir, dentry);
}
int security_path_unlink(struct path *dir, struct dentry *dentry)
{
-@@ -423,6 +424,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+@@ -446,6 +447,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
return 0;
return security_ops->path_symlink(dir, dentry, old_name);
}
int security_path_link(struct dentry *old_dentry, struct path *new_dir,
struct dentry *new_dentry)
-@@ -431,6 +433,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+@@ -454,6 +456,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
return 0;
return security_ops->path_link(old_dentry, new_dir, new_dentry);
}
int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir, struct dentry *new_dentry,
-@@ -458,6 +461,7 @@ int security_path_truncate(struct path *path)
+@@ -481,6 +484,7 @@ int security_path_truncate(struct path *path)
return 0;
return security_ops->path_truncate(path);
}
int security_path_chmod(struct path *path, umode_t mode)
{
-@@ -465,6 +469,7 @@ int security_path_chmod(struct path *path, umode_t mode)
+@@ -488,6 +492,7 @@ int security_path_chmod(struct path *path, umode_t mode)
return 0;
return security_ops->path_chmod(path, mode);
}
int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
{
-@@ -472,6 +477,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
+@@ -495,6 +500,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
return 0;
return security_ops->path_chown(path, uid, gid);
}
int security_path_chroot(struct path *path)
{
-@@ -557,6 +563,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -580,6 +586,7 @@ int security_inode_readlink(struct dentry *dentry)
return 0;
return security_ops->inode_readlink(dentry);
}
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
{
-@@ -571,6 +578,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -594,6 +601,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return security_ops->inode_permission(inode, mask);
}
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
-@@ -693,6 +701,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -716,6 +724,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
int security_file_alloc(struct file *file)
{
-@@ -753,6 +762,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
+@@ -775,6 +784,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 2015-03-27 21:56:35.453461667 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs 2014-01-30 21:10:02.794146538 +0100
@@ -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 2015-03-27 21:56:35.456795001 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs 2014-01-30 21:10:02.794146538 +0100
@@ -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 2015-03-27 21:56:35.456795001 +0100
-@@ -0,0 +1,161 @@
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2015-06-22 08:27:37.867501461 +0200
+@@ -0,0 +1,170 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+#
+- multi layered stackable unification filesystem, the member directory
+ is called as a branch.
+- branch permission and attribute, 'readonly', 'real-readonly',
-+ 'readwrite', 'whiteout-able', 'link-able whiteout' and their
++ 'readwrite', 'whiteout-able', 'link-able whiteout', etc. and their
+ combination.
+- internal "file copy-on-write".
+- logical deletion, whiteout.
+- unnecessary copy-up may happen, for example mmap(MAP_PRIVATE) after
+ open(O_RDWR).
+
-+Unionfs has a longer history. When I started implementing a stacking filesystem
-+(Aug 2005), it already existed. It has virtual super_block, inode,
-+dentry and file objects and they have an array pointing lower same kind
-+objects. After contributing many patches for Unionfs, I re-started my
-+project AUFS (Jun 2006).
++In linux-3.18, "overlay" filesystem (formerly known as "overlayfs") was
++merged into mainline. This is another implementation of UnionMount as a
++separated filesystem. All the limitations and known problems which
++UnionMount are equally inherited to "overlay" filesystem.
++
++Unionfs has a longer history. When I started implementing a stackable
++filesystem (Aug 2005), it already existed. It has virtual super_block,
++inode, dentry and file objects and they have an array pointing lower
++same kind objects. After contributing many patches for Unionfs, I
++re-started my project AUFS (Jun 2006).
+
+In AUFS, the structure of filesystem resembles to Unionfs, but I
+implemented my own ideas, approaches and enhancements and it became
+- DM snapshot-merge may help a lot when users try merging. in the
+ fs-layer union, users will use rsync(1).
+
++You may want to read my old paper "Filesystems in LiveCD"
++(http://aufs.sourceforge.net/aufs2/report/sq/sq.pdf).
++
+
-+Several characters/aspects of aufs
++Several characters/aspects/persona of aufs
+----------------------------------------------------------------------
+
-+Aufs has several characters or aspects.
++Aufs has several characters, aspects or persona.
+1. a filesystem, callee of VFS helper
+2. sub-VFS, caller of VFS helper for branches
+3. a virtual filesystem which maintains persistent inode number
+numbers. This is particularly important to support exporting a
+filesystem via NFS. Aufs is a virtual filesystem which doesn't have a
+backend block device for its own. But some storage is necessary to
-+maintain inode number. It may be a large space and may not suit to keep
-+in memory. Aufs rents some space from its first writable branch
-+filesystem (by default) and creates file(s) on it. These files are
-+created by aufs internally and removed soon (currently) keeping opened.
++keep and maintain the inode numbers. It may be a large space and may not
++suit to keep in memory. Aufs rents some space from its first writable
++branch filesystem (by default) and creates file(s) on it. These files
++are created by aufs internally and removed soon (currently) keeping
++opened.
+Note: Because these files are removed, they are totally gone after
+ unmounting aufs. It means the inode numbers are not persistent
+ across unmount or reboot. I have a plan to make them really
+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 2015-03-27 21:56:35.456795001 +0100
-@@ -0,0 +1,251 @@
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2015-06-22 08:27:37.867501461 +0200
+@@ -0,0 +1,258 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+#
+
+Aufs lookup operation finds /ro/fileA and gets dentry for that. These
+pointers are stored in a aufs dentry. The array in aufs dentry will be,
-+- [0] = NULL
++- [0] = NULL (because /rw/fileA doesn't exist)
+- [1] = /ro/fileA
+
+This style of an array is essentially same to the aufs
+superblock/inode/dentry/file objects.
+
+Because aufs supports manipulating branches, ie. add/delete/change
-+dynamically, these objects has its own generation. When branches are
-+changed, the generation in aufs superblock is incremented. And a
-+generation in other object are compared when it is accessed.
-+When a generation in other objects are obsoleted, aufs refreshes the
-+internal array.
++branches dynamically, these objects has its own generation. When
++branches are changed, the generation in aufs superblock is
++incremented. And a generation in other object are compared when it is
++accessed. When a generation in other objects are obsoleted, aufs
++refreshes the internal array.
+
+
+Superblock
+Additionally aufs superblock has some data for policies to select one
+among multiple writable branches, XIB files, pseudo-links and kobject.
+See below in detail.
-+About the policies which supports copy-down a directory, see policy.txt
-+too.
++About the policies which supports copy-down a directory, see
++wbr_policy.txt too.
+
+
+Branch and XINO(External Inode Number Translation Table)
+might appear. If your branch filesystem consumes disk space for such
+holes, then you should specify 'xino=' option at mounting aufs.
+
++Aufs has a mount option to free the disk blocks for such holes in XINO
++files on tmpfs or ramdisk. But it is not so effective actually. If you
++meet a problem of disk shortage due to XINO files, then you should try
++"tmpfs-ino.patch" (and "vfs-ino.patch" too) in aufs4-standalone.git.
++The patch localizes the assignment inumbers per tmpfs-mount and avoid
++the holes in XINO files.
++
+Also a writable branch has three kinds of "whiteout bases". All these
-+are existed when the branch is joined to aufs and the names are
++are existed when the branch is joined to aufs, and their names are
+whiteout-ed doubly, so that users will never see their names in aufs
+hierarchy.
-+1. a regular file which will be linked to all whiteouts.
++1. a regular file which will be hardlinked to all whiteouts.
+2. a directory to store a pseudo-link.
-+3. a directory to store an "orphan-ed" file temporary.
++3. a directory to store an "orphan"-ed file temporary.
+
+1. Whiteout Base
+ When you remove a file on a readonly branch, aufs handles it as a
+ creating a file under this dir, the file is unlinked.
+
+Because aufs supports manipulating branches, ie. add/delete/change
-+dynamically, a branch has its own id. When the branch order changes, aufs
-+finds the new index by searching the branch id.
++dynamically, a branch has its own id. When the branch order changes,
++aufs finds the new index by searching the branch id.
+
+
+Pseudo-link
+simple list. If fileB is read after unlinking fileA, aufs returns
+filedata from the pseudo-link instead of the lower readonly
+branch. Because the pseudo-link is based upon the inode, to keep the
-+inode number by xino (see above) is important.
++inode number by xino (see above) is essentially necessary.
+
+All the hardlinks under the Pseudo-link Directory of the writable branch
+should be restored in a proper location later. Aufs provides a utility
+XIB(external inode number bitmap)
+----------------------------------------------------------------------
+Addition to the xino file per a branch, aufs has an external inode number
-+bitmap in a superblock object. It is also a file such like a xino file.
++bitmap in a superblock object. It is also an internal file such like a
++xino file.
+It is a simple bitmap to mark whether the aufs inode number is in-use or
+not.
+To reduce the file I/O, aufs prepares a single memory page to cache xib.
+
-+Aufs implements a feature to truncate/refresh both of xino and xib to
++As well as XINO files, aufs has a feature to truncate/refresh XIB to
+reduce the number of consumed disk blocks for these files.
+
+
+with eliminating the whiteout-ed ones, and sets it to file (dir)
+object. So the file object has its entry list until it is closed. The
+entry list will be updated when the file position is zero and becomes
-+old. This decision is made in aufs automatically.
++obsoleted. This decision is made in aufs automatically.
+
+The dynamically allocated memory block for the name of entries has a
+unit of 512 bytes (by default) and stores the names contiguously (no
+its completion. This approach solves a problem of a signal handler
+simply.
+If aufs didn't adopt the workqueue and changed the privilege of the
-+process, and if the mkdir/write call arises SIGXFSZ or other signal,
-+then the user process might gain a privilege or the generated core file
-+was owned by a superuser.
++process, then the process may receive the unexpected SIGXFSZ or other
++signals.
+
+Also aufs uses the system global workqueue ("events" kernel thread) too
+for asynchronous tasks, such like handling inotify/fsnotify, re-creating a
+
+Basically the whiteout represents "logical deletion" which stops aufs to
+lookup further, but also it represents "dir is opaque" which also stop
-+lookup.
++further lookup.
+
+In aufs, rmdir(2) and rename(2) for dir uses whiteout alternatively.
+In order to make several functions in a single systemcall to be
+unique whiteouted name.
+For example, in rename(2) dir where the target dir already existed, aufs
+renames the target dir to a temporary unique whiteouted name before the
-+actual rename on a branch and then handles other actions (make it opaque,
++actual rename on a branch, and then handles other actions (make it opaque,
+update the attributes, etc). If an error happens in these actions, aufs
+simply renames the whiteouted name back and returns an error. If all are
+succeeded, aufs registers a function to remove the whiteouted unique
+- diropq for the ancestor directories may exist on the upper branch.
+- free space on the lower branch will reduce.
+- another access to the file may happen during moving-down, including
-+ UDBA.
++ UDBA (see "Revalidate Dentry and UDBA").
+- the file should not be hard-linked nor pseudo-linked. they should be
+ handled by auplink utility later.
+
+- etc.
+
+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 2015-06-22 08:27:37.870834875 +0200
+@@ -0,0 +1,85 @@
++
++# Copyright (C) 2015 Junjiro R. Okajima
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++Support for a branch who has its ->atomic_open()
++----------------------------------------------------------------------
++The filesystems who implement its ->atomic_open() are not majority. For
++example NFSv4 does, and aufs should call NFSv4 ->atomic_open,
++particularly for open(O_CREAT|O_EXCL, 0400) case. Other than
++->atomic_open(), NFSv4 returns an error for this open(2). While I am not
++sure whether all filesystems who have ->atomic_open() behave like this,
++but NFSv4 surely returns the error.
++
++In order to support ->atomic_open() for aufs, there are a few
++approaches.
++
++A. Introduce aufs_atomic_open()
++ - calls one of VFS:do_last(), lookup_open() or atomic_open() for
++ branch fs.
++B. Introduce aufs_atomic_open() calling create, open and chmod. this is
++ an aufs user Pip Cet's approach
++ - calls aufs_create(), VFS finish_open() and notify_change().
++ - pass fake-mode to finish_open(), and then correct the mode by
++ notify_change().
++C. Extend aufs_open() to call branch fs's ->atomic_open()
++ - no aufs_atomic_open().
++ - aufs_lookup() registers the TID to an aufs internal object.
++ - aufs_create() does nothing when the matching TID is registered, but
++ registers the mode.
++ - aufs_open() calls branch fs's ->atomic_open() when the matching
++ TID is registered.
++D. Extend aufs_open() to re-try branch fs's ->open() with superuser's
++ credential
++ - no aufs_atomic_open().
++ - aufs_create() registers the TID to an internal object. this info
++ represents "this process created this file just now."
++ - when aufs gets EACCES from branch fs's ->open(), then confirm the
++ registered TID and re-try open() with superuser's credential.
++
++Pros and cons for each approach.
++
++A.
++ - straightforward but highly depends upon VFS internal.
++ - the atomic behavaiour is kept.
++ - some of parameters such as nameidata are hard to reproduce for
++ branch fs.
++ - large overhead.
++B.
++ - easy to implement.
++ - the atomic behavaiour is lost.
++C.
++ - the atomic behavaiour is kept.
++ - dirty and tricky.
++ - VFS checks whether the file is created correctly after calling
++ ->create(), which means this approach doesn't work.
++D.
++ - easy to implement.
++ - the atomic behavaiour is lost.
++ - to open a file with superuser's credential and give it to a user
++ process is a bad idea, since the file object keeps the credential
++ in it. It may affect LSM or something. This approach doesn't work
++ either.
++
++The approach A is ideal, but it hard to implement. So here is a
++variation of A, which is to be implemented.
++
++A-1. Introduce aufs_atomic_open()
++ - calls branch fs ->atomic_open() if exists. otherwise calls
++ vfs_create() and finish_open().
++ - the demerit is that the several checks after branch fs
++ ->atomic_open() are lost. in the ordinary case, the checks are
++ done by VFS:do_last(), lookup_open() and atomic_open(). some can
++ 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 2015-03-27 21:56:35.456795001 +0100
-@@ -0,0 +1,133 @@
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2015-06-22 08:27:37.870834875 +0200
+@@ -0,0 +1,113 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+#
+Lookup in a Branch
+----------------------------------------------------------------------
+Since aufs has a character of sub-VFS (see Introduction), it operates
-+lookup for branches as VFS does. It may be a heavy work. Generally
-+speaking struct nameidata is a bigger structure and includes many
-+information. But almost all lookup operation in aufs is the simplest
-+case, ie. lookup only an entry directly connected to its parent. Digging
-+down the directory hierarchy is unnecessary.
-+
-+VFS has a function lookup_one_len() for that use, but it is not usable
-+for a branch filesystem which requires struct nameidata. So aufs
-+implements a simple lookup wrapper function. When a branch filesystem
-+allows NULL as nameidata, it calls lookup_one_len(). Otherwise it builds
-+a simplest nameidata and calls lookup_hash().
-+Here aufs applies "a principle in NFSD", ie. if the filesystem supports
-+NFS-export, then it has to support NULL as a nameidata parameter for
-+->create(), ->lookup() and ->d_revalidate(). So the lookup wrapper in
-+aufs tests if ->s_export_op in the branch is NULL or not.
-+
-+When a branch is a remote filesystem, aufs basically trusts its
++lookup for branches as VFS does. It may be a heavy work. But almost all
++lookup operation in aufs is the simplest case, ie. lookup only an entry
++directly connected to its parent. Digging down the directory hierarchy
++is unnecessary. VFS has a function lookup_one_len() for that use, and
++aufs calls it.
++
++When a branch is a remote filesystem, aufs basically relies upon its
+->d_revalidate(), also aufs forces the hardest revalidate tests for
+them.
+For d_revalidate, aufs implements three levels of revalidate tests. See
+- "dirA" exists under /ro, but /rw. and its mode is 0700.
+- user invoked "chmod a+rx /au/dirA"
+- the internal copy-up is activated and "/rw/dirA" is created and its
-+ permission bits are set to world readble.
++ permission bits are set to world readable.
+- then "/au/dirA" becomes world readable?
+
+In this case, /ro/dirA is still 0700 since it exists in readonly branch,
+allowed it by chmod. Should really aufs rejects showing the entries
+under /ro/dirA?
+
-+To be honest, I don't have a best solution for this case. So aufs
-+implements 'dirperm1' and 'nodirperm1' and leave it to users.
++To be honest, I don't have a good solution for this case. So aufs
++implements 'dirperm1' and 'nodirperm1' mount options, and leave it to
++users.
+When dirperm1 is specified, aufs checks only the highest one for the
+directory permission, and shows the entries. Otherwise, as usual, checks
+every dir existing on all branches and rejects the request.
+branch is many.
+
+
-+Loopback Mount
-+----------------------------------------------------------------------
-+Basically aufs supports any type of filesystem and block device for a
-+branch (actually there are some exceptions). But it is prohibited to add
-+a loopback mounted one whose backend file exists in a filesystem which is
-+already added to aufs. The reason is to protect aufs from a recursive
-+lookup. If it was allowed, the aufs lookup operation might re-enter a
-+lookup for the loopback mounted branch in the same context, and will
-+cause a deadlock.
-+
-+
+Revalidate Dentry and UDBA (User's Direct Branch Access)
+----------------------------------------------------------------------
+Generally VFS helpers re-validate a dentry as a part of lookup.
+ itself.
+3. No Extra Validation
+ This is the simplest test and doesn't add any additional revalidation
-+ test, and skip therevalidatin in step 4. It is useful and improves
++ test, and skip the revalidation in step 4. It is useful and improves
+ aufs performance when system surely hide the aufs branches from user,
+ 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 2015-03-27 21:56:35.456795001 +0100
-@@ -0,0 +1,75 @@
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2015-06-22 08:27:37.870834875 +0200
+@@ -0,0 +1,74 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+#
+Add a Branch
+----------------------------------------------------------------------
+o Confirm the adding dir exists outside of aufs, including loopback
-+ mount.
-+- and other various attributes...
++ mount, and its various attributes.
+o Initialize the xino file and whiteout bases if necessary.
+ See struct.txt.
+
+ writable branch, and the writable branch is world-writable, then a
+ malicious guy may create /etc/passwd on the writable branch directly
+ and the infected file will be valid in aufs.
-+ I am afraid it can be a security issue, but nothing to do except
++ I am afraid it can be a security issue, but aufs can do nothing except
+ producing a warning.
+
+
+ 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 2015-03-27 21:56:35.456795001 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2015-06-22 08:27:37.870834875 +0200
@@ -0,0 +1,64 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+writable branch which has the parent (or ancestor) dir of the target
+file is chosen (top-down-parent policy).
+By user's request, aufs implements some other policies to select the
-+writable branch, for file creation two policies, round-robin and
-+most-free-space policies. For copy-up three policies, top-down-parent,
-+bottom-up-parent and bottom-up policies.
++writable branch, for file creation several policies, round-robin,
++most-free-space, and other policies. For copy-up, top-down-parent,
++bottom-up-parent, bottom-up and others.
+
+As expected, the round-robin policy selects the branch in circular. When
+you have two writable branches and creates 10 new files, 5 files will be
+ 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 2015-03-27 21:56:35.456795001 +0100
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2015-06-22 08:27:37.870834875 +0200
@@ -0,0 +1,120 @@
+
+# Copyright (C) 2011-2015 Junjiro R. Okajima
+----------------------------------------------------------------------
+Hierarchical Storage Management (or HSM) is a well-known feature in the
+storage world. Aufs provides this feature as file-based with multiple
-+writable branches, based upon the principle of "Colder-Lower".
++writable branches, based upon the principle of "Colder, the Lower".
+Here the word "colder" means that the less used files, and "lower" means
-+that the position in the order of the stacked branches.
++that the position in the order of the stacked branches vertically.
+These multiple writable branches are prioritized, ie. the topmost one
+should be the fastest drive and be used heavily.
+
+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 2015-03-27 21:56:35.460128334 +0100
-@@ -0,0 +1,46 @@
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2015-06-22 08:27:37.870834875 +0200
+@@ -0,0 +1,72 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+#
+interaction with aufs. It means aufs_mmap() calls the branch fs's
+->mmap().
+This approach is simple and good, but there is one problem.
-+Under /proc, several entries show the mmap-ped files by its path (with
++Under /proc, several entries show the mmapped files by its path (with
+device and inode number), and the printed path will be the path on the
+branch fs's instead of virtual aufs's.
+This is not a problem in most cases, but some utilities lsof(1) (and its
+ incremented.
+- merging vma maintains the ref count too.
+
-+This is not a good approach. It just faking the printed path. But it
++This is not a good approach. It just fakes the printed path. But it
+leaves all behaviour around f_mapping unchanged. This is surely an
+advantage.
+Actually aufs had adopted another complicated approach which calls
+generic_file_mmap() and handles struct vm_operations_struct. In this
+approach, aufs met a hard problem and I could not solve it without
+switching the approach.
++
++There may be one more another approach which is
++- bind-mount the branch-root onto the aufs-root internally
++- grab the new vfsmount (ie. struct mount)
++- lazy-umount the branch-root internally
++- in open(2) the aufs-file, open the branch-file with the hidden
++ vfsmount (instead of the original branch's vfsmount)
++- ideally this "bind-mount and lazy-umount" should be done atomically,
++ but it may be possible from userspace by the mount helper.
++
++Adding the internal hidden vfsmount and using it in opening a file, the
++file path under /proc will be printed correctly. This approach looks
++smarter, but is not possible I am afraid.
++- aufs-root may be bind-mount later. when it happens, another hidden
++ vfsmount will be required.
++- it is hard to get the chance to bind-mount and lazy-umount
++ + in kernel-space, FS can have vfsmount in open(2) via
++ file->f_path, and aufs can know its vfsmount. But several locks are
++ already acquired, and if aufs tries to bind-mount and lazy-umount
++ here, then it may cause a deadlock.
++ + in user-space, bind-mount doesn't invoke the mount helper.
++- since /proc shows dev and ino, aufs has to give vma these info. it
++ means a new member vm_prinode will be necessary. this is essentially
++ equivalent to vm_prfile described above.
++
++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 2015-03-27 21:56:35.460128334 +0100
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2015-06-22 08:27:37.870834875 +0200
@@ -0,0 +1,96 @@
+
+# Copyright (C) 2014-2015 Junjiro R. Okajima
+----------------------------------------------------------------------
+For the inode standard attributes (owner, group, timestamps, etc.), aufs
+shows the values from the topmost existing file. This behaviour is good
-+for the non-dir entreis since the bahaviour exactly matches the shown
++for the non-dir entries since the bahaviour exactly matches the shown
+information. But for the directories, aufs considers all the same named
+entries on the lower branches. Which means, if one of the lower entry
+rejects readdir call, then aufs returns an error even if the topmost
+
+A similar issue can happen around XATTR.
+getxattr(2) and listxattr(2) families behave as if dirperm1 option is
-+always set. Otherwise these very unpleasant situation can happen.
-+- listxattr(2) may return the duplicated entires.
++always set. Otherwise these very unpleasant situation would happen.
++- listxattr(2) may return the duplicated entries.
+- users may not be able to remove or reset the XATTR forever,
+
+
+XATTR/EA support in the internal (copy,move)-(up,down)
+----------------------------------------------------------------------
-+Generally the extended attributes of inode are categorazied as these.
++Generally the extended attributes of inode are categorized as these.
+- "security" for LSM and capability.
+- "system" for posix ACL, 'acl' mount option is required for the branch
+ fs generally.
+
+In copy-up, the support for XATTR on the dst branch may differ from the
+src branch. In this case, the copy-up operation will get an error and
-+the original user operation which triggered the copy-up fails. It can
-+happen that even all copy-up will fail.
++the original user operation which triggered the copy-up will fail. It
++can happen that even all copy-up will fail.
+When both of src and dst branches support XATTR and if an error occurs
+during copying XATTR, then the copy-up should fail obviously. That is a
+good reason and aufs should return an error to userspace. But when only
-+the src branch support XATTR, aufs should not return an error.
++the src branch support that XATTR, aufs should not return an error.
+For example, the src branch supports ACL but the dst branch doesn't
+because the dst branch may natively un-support it or temporary
+un-support it due to "noacl" mount option. Of course, the dst branch fs
+
+For the copy-up operation, there two basic approaches.
+- copy the specified XATTR only (by category above), and return the
-+ error if it happens inconditionally.
++ error unconditionally if it happens.
+- copy all XATTR, and ignore the error on the specified category only.
+
+In order to support XATTR and to implement the correct behaviour, aufs
-+chooses the latter approach and introduces some attributes for its
-+branch, "icexsec", "icexsys", "icextr", "icexusr", and "icexoth".
++chooses the latter approach and introduces some new branch attributes,
++"icexsec", "icexsys", "icextr", "icexusr", and "icexoth".
+They correspond to the XATTR namespaces (see above). Additionally, to be
-+convenient, "icex" is also provided which means all "ix*" attributes are
-+set.
++convenient, "icex" is also provided which means all "icex*" attributes
++are set (here the word "icex" stands for "ignore copy-error on XATTR").
+
+The meaning of these attributes is to ignore the error from setting
+XATTR on that branch.
+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 2015-03-27 21:56:35.460128334 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2015-06-22 08:27:37.870834875 +0200
@@ -0,0 +1,58 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+ + find the index of a branch from its id in handle, and check it is
+ still exist in aufs.
+ + 1st level: get the inode number from handle and search it in cache.
-+ + 2nd level: if not found, get the parent inode number from handle and
-+ search it in cache. and then open the parent dir, find the matching
-+ inode number by vfs_readdir() and get its name, and call
-+ lookup_one_len() for the target dentry.
++ + 2nd level: if not found in cache, get the parent inode number from
++ the handle and search it in cache. and then open the found parent
++ dir, find the matching inode number by vfs_readdir() and get its
++ name, and call lookup_one_len() for the target dentry.
+ + 3rd level: if the parent dir is not cached, call
+ exportfs_decode_fh() for a branch and get the parent on a branch,
+ build a pathname of it, convert it a pathname in aufs, call
+ 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 2015-03-27 21:56:35.460128334 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2015-06-22 08:27:37.870834875 +0200
@@ -0,0 +1,52 @@
+
+# Copyright (C) 2005-2015 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 2015-03-27 21:56:35.460128334 +0100
-@@ -0,0 +1,46 @@
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2015-06-22 08:27:37.870834875 +0200
+@@ -0,0 +1,47 @@
+
+# Copyright (C) 2010-2015 Junjiro R. Okajima
+#
+operation. Some FS have multiple sets of them. For instance, ext2 has
+three sets, one for XIP, for NOBH, and for normal.
+Since aufs overrides and redirects these operations, sometimes aufs has
-+to change its behaviour according to the branch FS type. More imporantly
++to change its behaviour according to the branch FS type. More importantly
+VFS acts differently if a function (member in the struct) is set or
+not. It means aufs should have several sets of operations and select one
+among them according to the branch FS definition.
+
-+In order to solve this problem and not to affect the behavour of VFS,
++In order to solve this problem and not to affect the behaviour of VFS,
+aufs defines these operations dynamically. For instance, aufs defines
-+aio_read function for struct file_operations, but it may not be set to
-+the file_operations. When the branch FS doesn't have it, aufs doesn't
-+set it to its file_operations while the function definition itself is
-+still alive. So the behaviour of io_submit(2) will not change, and it
-+will return an error when aio_read is not defined.
++dummy direct_IO function for struct address_space_operations, but it may
++not be set to the address_space_operations actually. When the branch FS
++doesn't have it, aufs doesn't set it to its address_space_operations
++while the function definition itself is still alive. So the behaviour
++itself will not change, and it will return an error when direct_IO is
++not set.
+
+The lifetime of these dynamically generated operation object is
+maintained by aufs branch object. When the branch is removed from aufs,
+the reference counter of the object is decremented. When it reaches
+zero, the dynamically generated operation object will be freed.
+
-+This approach is designed to support AIO (io_submit), Direcit I/O and
-+XIP mainly.
-+Currently this approach is applied to file_operations and
-+vm_operations_struct for regular files only.
++This approach is designed to support AIO (io_submit), Direct I/O and
++XIP (DAX) mainly.
++Currently this approach is applied to address_space_operations for
++regular files only.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/99plan.txt linux/Documentation/filesystems/aufs/design/99plan.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/99plan.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/99plan.txt 2015-03-27 21:56:35.460128334 +0100
-@@ -0,0 +1,58 @@
++++ linux/Documentation/filesystems/aufs/design/99plan.txt 2015-06-22 08:27:37.870834875 +0200
+@@ -0,0 +1,57 @@
+
+# Copyright (C) 2005-2015 Junjiro R. Okajima
+#
+----------------------------------------------------------------------
+Aufs1 allows aufs to be another aufs's readonly branch.
+This feature was developed by a user's request. But it may not be used
-+currecnly.
++currently.
+
+
+Refresh the Opened File (refrof)
+- user opened "/au/fileA".
+- he or someone else inserts a branch (/new) between /rw and /ro.
+ /au = /rw + /new + /ro
-+- the new branch has "fileA".
++- the new branch contains "fileA".
+- user reads from the opened "fileA"
+- which filedata should aufs return, from /ro or /new?
+
+Here again I don't have a best and final answer. I got an idea to
+implement 'refrof' and 'norefrof' option. When 'refrof' (REFResh the
+Opened File) is specified (by default), aufs returns the filedata from
-+/new.
-+Otherwise from /new.
++/new. Otherwise from /ro.
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 2015-03-27 21:56:35.456795001 +0100
-@@ -0,0 +1,389 @@
++++ linux/Documentation/filesystems/aufs/README 2015-06-22 08:27:37.867501461 +0200
+@@ -0,0 +1,384 @@
+
+Aufs3 -- advanced multi layered unification filesystem version 3.x
+http://aufs.sf.net
+0. Introduction
+----------------------------------------
+In the early days, aufs was entirely re-designed and re-implemented
-+Unionfs Version 1.x series. After many original ideas, approaches,
++Unionfs Version 1.x series. Adding many original ideas, approaches,
+improvements and implementations, it becomes totally different from
+Unionfs while keeping the basic features.
+Recently, Unionfs Version 2.x series begin taking some of the same
+- dynamic branch manipulation, add, del.
+- etc...
+
-+Also there are many enhancements in aufs1, such as:
++Also there are many enhancements in aufs, such as:
++- test only the highest one for the directory permission (dirperm1)
++- copyup on open (coo=)
++- 'move' policy for copy-up between two writable branches, after
++ checking free space.
++- xattr, acl
+- readdir(3) in userspace.
+- keep inode number by external inode number table
+- keep the timestamps of file/dir in internal copyup operation
+
+Currently these features are dropped temporary from aufs3.
+See design/08plan.txt in detail.
-+- test only the highest one for the directory permission (dirperm1)
-+- copyup on open (coo=)
+- nested mount, i.e. aufs as readonly no-whiteout branch of another aufs
+ (robr)
+- statistics of aufs thread (/sys/fs/aufs/stat)
-+- delegation mode (dlgt)
-+ a delegation of the internal branch access to support task I/O
-+ accounting, which also supports Linux Security Modules (LSM) mainly
-+ for Suse AppArmor.
-+- intent.open/create (file open in a single lookup)
+
+Features or just an idea in the future (see also design/*.txt),
+- reorder the branch index without del/re-add.
+- permanent xino files for NFSD
+- an option for refreshing the opened files after add/del branches
-+- 'move' policy for copy-up between two writable branches, after
-+ checking free space.
+- light version, without branch manipulation. (unnecessary?)
+- copyup in userspace
+- inotify in userspace
+- readv/writev
-+- xattr, acl
+
+
+2. Download
+# 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 2015-03-27 21:56:35.460128334 +0100
++++ linux/fs/aufs/aufs.h 2015-06-22 08:27:37.874168290 +0200
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005-2015 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 2015-03-27 21:56:35.460128334 +0100
-@@ -0,0 +1,1408 @@
++++ linux/fs/aufs/branch.c 2015-06-22 08:29:23.703424266 +0200
+@@ -0,0 +1,1406 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ aufs_bindex_t br_id;
+ unsigned char verbose, writer;
+ struct file *file, *hf, **array;
-+ struct inode *inode;
+ struct au_hfile *hfile;
+
+ mnt_flags = au_mntflags(sb);
+ goto out_array;
+ }
+
-+ inode = file_inode(file);
+ hfile = &au_fi(file)->fi_htop;
+ hf = hfile->hf_file;
-+ if (!S_ISREG(inode->i_mode)
++ if (!d_is_reg(file->f_path.dentry)
+ || !(file->f_mode & FMODE_WRITE)
+ || hfile->hf_br->br_id != br_id
+ || !(hf->f_mode & FMODE_WRITE))
+}
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 2015-03-27 21:56:35.460128334 +0100
-@@ -0,0 +1,267 @@
++++ linux/fs/aufs/branch.h 2015-06-22 08:29:23.703424266 +0200
+@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+#endif
+}
+
++static inline int au_br_test_oflag(int oflag, struct au_branch *br)
++{
++ int err, exec_flag;
++
++ err = 0;
++ exec_flag = oflag & __FMODE_EXEC;
++ if (unlikely(exec_flag && (au_br_mnt(br)->mnt_flags & MNT_NOEXEC)))
++ err = -EACCES;
++
++ return err;
++}
++
+/* ---------------------------------------------------------------------- */
+
+/* branch.c */
+#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 2015-03-27 21:56:35.460128334 +0100
++++ linux/fs/aufs/conf.mk 2015-06-22 08:27:37.874168290 +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 2015-03-27 21:56:35.460128334 +0100
-@@ -0,0 +1,1303 @@
++++ linux/fs/aufs/cpup.c 2015-06-22 08:29:23.703424266 +0200
+@@ -0,0 +1,1308 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ struct au_cpup_reg_attr *h_src_attr)
+{
+ int err, sbits, icex;
++ unsigned int mnt_flags;
++ unsigned char verbose;
+ struct iattr ia;
+ struct path h_path;
+ struct inode *h_isrc, *h_idst;
+ }
+
+ icex = br->br_perm & AuBrAttr_ICEX;
-+ if (!err)
-+ err = au_cpup_xattr(h_path.dentry, h_src, icex);
++ if (!err) {
++ mnt_flags = au_mntflags(dst->d_sb);
++ verbose = !!au_opt_test(mnt_flags, VERBOSE);
++ err = au_cpup_xattr(h_path.dentry, h_src, icex, verbose);
++ }
+
+ return err;
+}
+ return err;
+}
+
-+#if 0 /* unused */
++#if 0 /* reserved */
+struct au_cpup_single_args {
+ int *errp;
+ struct au_cp_generic *cpg;
+ return do_sio;
+}
+
-+#if 0 /* unused */
++#if 0 /* reserved */
+int au_sio_cpup_single(struct au_cp_generic *cpg, struct dentry *dst_parent)
+{
+ int err, wkq_err;
+}
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 2015-03-27 21:56:35.460128334 +0100
++++ linux/fs/aufs/cpup.h 2015-06-22 08:27:37.874168290 +0200
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2005-2015 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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/dbgaufs.c 2015-06-22 08:29:23.706757681 +0200
@@ -0,0 +1,432 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+void dbgaufs_si_fin(struct au_sbinfo *sbinfo)
+{
+ /*
-+ * This function is a dynamic '__init' function actually,
++ * This function is a dynamic '__fin' function actually,
+ * so the tiny check for si_rwsem is unnecessary.
+ */
+ /* AuRwMustWriteLock(&sbinfo->si_rwsem); */
+}
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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/dbgaufs.h 2015-06-22 08:27:37.874168290 +0200
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2005-2015 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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/dcsub.c 2015-06-22 08:27:37.877501704 +0200
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2005-2015 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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,125 @@
++++ linux/fs/aufs/dcsub.h 2015-06-22 08:29:23.706757681 +0200
+@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+#include <linux/dcache.h>
+#include <linux/fs.h>
+
-+struct dentry;
-+
+struct au_dpage {
+ int ndentry;
+ struct dentry **dentries;
+ && !memcmp(a->name, b->name, a->len);
+}
+
++/*
++ * by the commit
++ * 360f547 2015-01-25 dcache: let the dentry count go down to zero without
++ * taking d_lock
++ * the type of d_lockref.count became int, but the inlined function d_count()
++ * still returns unsigned int.
++ * I don't know why. Maybe it is for every d_count() users?
++ * Anyway au_dcount() lives on.
++ */
+static inline int au_dcount(struct dentry *d)
+{
+ return (int)d_count(d);
+#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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,520 @@
++++ linux/fs/aufs/debug.c 2015-06-22 08:29:23.706757681 +0200
+@@ -0,0 +1,438 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ * debug print functions
+ */
+
-+#include <linux/vt_kern.h>
+#include "aufs.h"
+
+/* Returns 0, or -errno. arg is in kp->arg. */
+ }
+ a[0] = 0;
+ if (bindex < 0
-+ && file->f_path.dentry
++ && !IS_ERR_OR_NULL(file->f_path.dentry)
+ && au_test_aufs(file->f_path.dentry->d_sb)
+ && au_fi(file))
+ snprintf(a, sizeof(a), ", gen %d, mmapped %d",
+ dpri("f%d: mode 0x%x, flags 0%o, cnt %ld, v %llu, pos %llu%s\n",
+ bindex, file->f_mode, file->f_flags, (long)file_count(file),
+ file->f_version, file->f_pos, a);
-+ if (file->f_path.dentry)
++ if (!IS_ERR_OR_NULL(file->f_path.dentry))
+ do_pri_dentry(bindex, file->f_path.dentry);
+ return 0;
+}
+
+ err = do_pri_file(-1, file);
+ if (err
-+ || !file->f_path.dentry
++ || IS_ERR_OR_NULL(file->f_path.dentry)
+ || !au_test_aufs(file->f_path.dentry->d_sb))
+ return;
+
+
+/* ---------------------------------------------------------------------- */
+
-+void au_dbg_sleep_jiffy(int jiffy)
-+{
-+ while (jiffy)
-+ jiffy = schedule_timeout_uninterruptible(jiffy);
-+}
-+
-+void au_dbg_iattr(struct iattr *ia)
-+{
-+#define AuBit(name) \
-+ do { \
-+ if (ia->ia_valid & ATTR_ ## name) \
-+ dpri(#name "\n"); \
-+ } while (0)
-+ AuBit(MODE);
-+ AuBit(UID);
-+ AuBit(GID);
-+ AuBit(SIZE);
-+ AuBit(ATIME);
-+ AuBit(MTIME);
-+ AuBit(CTIME);
-+ AuBit(ATIME_SET);
-+ AuBit(MTIME_SET);
-+ AuBit(FORCE);
-+ AuBit(ATTR_FLAG);
-+ AuBit(KILL_SUID);
-+ AuBit(KILL_SGID);
-+ AuBit(FILE);
-+ AuBit(KILL_PRIV);
-+ AuBit(OPEN);
-+ AuBit(TIMES_SET);
-+#undef AuBit
-+ dpri("ia_file %p\n", ia->ia_file);
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
+void __au_dbg_verify_dinode(struct dentry *dentry, const char *func, int line)
+{
+ struct inode *h_inode, *inode = dentry->d_inode;
+ }
+}
+
-+void au_dbg_verify_dir_parent(struct dentry *dentry, unsigned int sigen)
-+{
-+ struct dentry *parent;
-+
-+ parent = dget_parent(dentry);
-+ AuDebugOn(!d_is_dir(dentry));
-+ AuDebugOn(IS_ROOT(dentry));
-+ AuDebugOn(au_digen_test(parent, sigen));
-+ dput(parent);
-+}
-+
-+void au_dbg_verify_nondir_parent(struct dentry *dentry, unsigned int sigen)
-+{
-+ struct dentry *parent;
-+
-+ parent = dget_parent(dentry);
-+ AuDebugOn(d_is_dir(dentry));
-+ AuDebugOn(au_digen_test(parent, sigen));
-+ dput(parent);
-+}
-+
+void au_dbg_verify_gen(struct dentry *parent, unsigned int sigen)
+{
+ int err, i, j;
+
+/* ---------------------------------------------------------------------- */
+
-+void au_debug_sbinfo_init(struct au_sbinfo *sbinfo __maybe_unused)
-+{
-+#ifdef AuForceNoPlink
-+ au_opt_clr(sbinfo->si_mntflags, PLINK);
-+#endif
-+#ifdef AuForceNoXino
-+ au_opt_clr(sbinfo->si_mntflags, XINO);
-+#endif
-+#ifdef AuForceNoRefrof
-+ au_opt_clr(sbinfo->si_mntflags, REFROF);
-+#endif
-+#ifdef AuForceHnotify
-+ au_opt_set_udba(sbinfo->si_mntflags, UDBA_HNOTIFY);
-+#endif
-+#ifdef AuForceRd0
-+ sbinfo->si_rdblk = 0;
-+ sbinfo->si_rdhash = 0;
-+#endif
-+}
-+
+int __init au_debug_init(void)
+{
+ aufs_bindex_t bindex;
+ pr_warn("CONFIG_4KSTACKS is defined.\n");
+#endif
+
-+#ifdef AuForceNoBrs
-+ sysaufs_brs = 0;
-+#endif
-+
+ return 0;
+}
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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,262 @@
++++ linux/fs/aufs/debug.h 2015-06-22 08:27:37.877501704 +0200
+@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+
+/* ---------------------------------------------------------------------- */
+
-+struct au_sbinfo;
-+struct au_finfo;
+struct dentry;
+#ifdef CONFIG_AUFS_DEBUG
+extern struct mutex au_dbg_mtx;
+struct super_block;
+void au_dpri_sb(struct super_block *sb);
+
-+void au_dbg_sleep_jiffy(int jiffy);
-+struct iattr;
-+void au_dbg_iattr(struct iattr *ia);
-+
+#define au_dbg_verify_dinode(d) __au_dbg_verify_dinode(d, __func__, __LINE__)
+void __au_dbg_verify_dinode(struct dentry *dentry, const char *func, int line);
-+void au_dbg_verify_dir_parent(struct dentry *dentry, unsigned int sigen);
-+void au_dbg_verify_nondir_parent(struct dentry *dentry, unsigned int sigen);
+void au_dbg_verify_gen(struct dentry *parent, unsigned int sigen);
+void au_dbg_verify_kthread(void);
+
+int __init au_debug_init(void);
-+void au_debug_sbinfo_init(struct au_sbinfo *sbinfo);
++
+#define AuDbgWhlist(w) do { \
+ mutex_lock(&au_dbg_mtx); \
+ AuDbg(#w "\n"); \
+ mutex_unlock(&au_dbg_mtx); \
+} while (0)
+
-+#define AuDbgSleep(sec) do { \
-+ AuDbg("sleep %d sec\n", sec); \
-+ ssleep(sec); \
-+} while (0)
-+
-+#define AuDbgSleepJiffy(jiffy) do { \
-+ AuDbg("sleep %d jiffies\n", jiffy); \
-+ au_dbg_sleep_jiffy(jiffy); \
-+} while (0)
-+
-+#define AuDbgIAttr(ia) do { \
-+ AuDbg("ia_valid 0x%x\n", (ia)->ia_valid); \
-+ au_dbg_iattr(ia); \
-+} while (0)
-+
+#define AuDbgSym(addr) do { \
+ char sym[KSYM_SYMBOL_LEN]; \
+ sprint_symbol(sym, (unsigned long)addr); \
+ AuDbg("%s\n", sym); \
+} while (0)
-+
-+#define AuInfoSym(addr) do { \
-+ char sym[KSYM_SYMBOL_LEN]; \
-+ sprint_symbol(sym, (unsigned long)addr); \
-+ AuInfo("%s\n", sym); \
-+} while (0)
+#else
+AuStubVoid(au_dbg_verify_dinode, struct dentry *dentry)
+AuStubVoid(au_dbg_verify_dir_parent, struct dentry *dentry, unsigned int sigen)
+AuStubVoid(au_dbg_verify_gen, struct dentry *parent, unsigned int sigen)
+AuStubVoid(au_dbg_verify_kthread, void)
+AuStubInt0(__init au_debug_init, void)
-+AuStubVoid(au_debug_sbinfo_init, struct au_sbinfo *sbinfo)
+
+#define AuDbgWhlist(w) do {} while (0)
+#define AuDbgVdir(v) do {} while (0)
+#define AuDbgDentry(d) do {} while (0)
+#define AuDbgFile(f) do {} while (0)
+#define AuDbgSb(sb) do {} while (0)
-+#define AuDbgSleep(sec) do {} while (0)
-+#define AuDbgSleepJiffy(jiffy) do {} while (0)
-+#define AuDbgIAttr(ia) do {} while (0)
+#define AuDbgSym(addr) do {} while (0)
-+#define AuInfoSym(addr) do {} while (0)
+#endif /* CONFIG_AUFS_DEBUG */
+
+/* ---------------------------------------------------------------------- */
+#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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/dentry.c 2015-06-22 08:27:37.877501704 +0200
@@ -0,0 +1,1097 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+};
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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/dentry.h 2015-06-22 08:27:37.877501704 +0200
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/dinfo.c 2015-06-22 08:27:37.877501704 +0200
@@ -0,0 +1,544 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,643 @@
++++ linux/fs/aufs/dir.c 2015-06-22 08:29:23.706757681 +0200
+@@ -0,0 +1,751 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ return sz;
+}
+
++struct au_dir_ts_arg {
++ struct dentry *dentry;
++ aufs_bindex_t brid;
++};
++
++static void au_do_dir_ts(void *arg)
++{
++ struct au_dir_ts_arg *a = arg;
++ struct au_dtime dt;
++ struct path h_path;
++ struct inode *dir, *h_dir;
++ struct super_block *sb;
++ struct au_branch *br;
++ struct au_hinode *hdir;
++ int err;
++ aufs_bindex_t bstart, bindex;
++
++ sb = a->dentry->d_sb;
++ dir = a->dentry->d_inode;
++ if (!dir)
++ goto out;
++ /* no dir->i_mutex lock */
++ aufs_read_lock(a->dentry, AuLock_DW | AuLock_DIR); /* noflush */
++
++ bstart = au_ibstart(dir);
++ bindex = au_br_index(sb, a->brid);
++ if (bindex < bstart)
++ goto out_unlock;
++
++ br = au_sbr(sb, bindex);
++ h_path.dentry = au_h_dptr(a->dentry, bindex);
++ if (!h_path.dentry)
++ goto out_unlock;
++ h_path.mnt = au_br_mnt(br);
++ au_dtime_store(&dt, a->dentry, &h_path);
++
++ br = au_sbr(sb, bstart);
++ if (!au_br_writable(br->br_perm))
++ goto out_unlock;
++ h_path.dentry = au_h_dptr(a->dentry, bstart);
++ 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);
++ 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);
++ vfsub_mnt_drop_write(h_path.mnt);
++ au_cpup_attr_timesizes(dir);
++
++out_unlock:
++ aufs_read_unlock(a->dentry, AuLock_DW);
++out:
++ dput(a->dentry);
++ au_nwt_done(&au_sbi(sb)->si_nowait);
++ kfree(arg);
++}
++
++void au_dir_ts(struct inode *dir, aufs_bindex_t bindex)
++{
++ int perm, wkq_err;
++ aufs_bindex_t bstart;
++ struct au_dir_ts_arg *arg;
++ struct dentry *dentry;
++ struct super_block *sb;
++
++ IMustLock(dir);
++
++ dentry = d_find_any_alias(dir);
++ AuDebugOn(!dentry);
++ sb = dentry->d_sb;
++ bstart = au_ibstart(dir);
++ if (bstart == bindex) {
++ au_cpup_attr_timesizes(dir);
++ goto out;
++ }
++
++ perm = au_sbr_perm(sb, bstart);
++ if (!au_br_writable(perm))
++ goto out;
++
++ arg = kmalloc(sizeof(*arg), GFP_NOFS);
++ if (!arg)
++ goto out;
++
++ arg->dentry = dget(dentry); /* will be dput-ted by au_do_dir_ts() */
++ arg->brid = au_sbr_id(sb, bindex);
++ wkq_err = au_wkq_nowait(au_do_dir_ts, arg, sb, /*flags*/0);
++ if (unlikely(wkq_err)) {
++ pr_err("wkq %d\n", wkq_err);
++ dput(dentry);
++ kfree(arg);
++ }
++
++out:
++ dput(dentry);
++}
++
+/* ---------------------------------------------------------------------- */
+
+static int reopen_dir(struct file *file)
+ return err;
+}
+
-+static int do_open_dir(struct file *file, int flags)
++static int do_open_dir(struct file *file, int flags, struct file *h_file)
+{
+ int err;
+ aufs_bindex_t bindex, btail;
+ struct dentry *dentry, *h_dentry;
-+ struct file *h_file;
+
+ FiMustWriteLock(file);
++ AuDebugOn(h_file);
+
+ err = 0;
+ dentry = file->f_path.dentry;
+ si_read_lock(sb, AuLock_FLUSH);
+ fidir = au_fidir_alloc(sb);
+ if (fidir) {
-+ err = au_do_open(file, do_open_dir, fidir);
++ struct au_do_open_args args = {
++ .open = do_open_dir,
++ .fidir = fidir
++ };
++ err = au_do_open(file, &args);
+ if (unlikely(err))
+ kfree(fidir);
+ }
+ if (unlikely(err))
+ goto out;
+
-+ sb = file->f_path.dentry->d_sb;
+ inode = file_inode(file);
++ sb = inode->i_sb;
+ bend = au_fbend_dir(file);
+ for (bindex = au_fbstart(file); !err && bindex <= bend; bindex++) {
+ h_file = au_hf_dir(file, bindex);
+};
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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,130 @@
++++ linux/fs/aufs/dir.h 2015-06-22 08:27:37.877501704 +0200
+@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+void au_add_nlink(struct inode *dir, struct inode *h_dir);
+void au_sub_nlink(struct inode *dir, struct inode *h_dir);
+loff_t au_dir_size(struct file *file, struct dentry *dentry);
++void au_dir_ts(struct inode *dir, aufs_bindex_t bsrc);
+int au_test_empty_lower(struct dentry *dentry);
+int au_test_empty(struct dentry *dentry, struct au_nhash *whlist);
+
+#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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,379 @@
++++ linux/fs/aufs/dynop.c 2015-06-22 08:29:23.706757681 +0200
+@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2010-2015 Junjiro R. Okajima
+ *
+ DySetAop(invalidatepage);
+ DySetAop(releasepage);
+ DySetAop(freepage);
-+ /* these two will be changed according to an aufs mount option */
++ /* this one will be changed according to an aufs mount option */
+ DySetAop(direct_IO);
-+ DySetAop(get_xip_mem);
+ DySetAop(migratepage);
+ DySetAop(launder_page);
+ DySetAop(is_partially_uptodate);
+ DySetAop(swap_deactivate);
+
+ DyDbgSize(cnt, *h_aop);
-+ dyaop->da_get_xip_mem = h_aop->get_xip_mem;
+}
+
+/* ---------------------------------------------------------------------- */
+ * of the succeeding I/O. The dio mount option enables O_DIRECT and makes
+ * open(O_DIRECT) always succeed, but the succeeding I/O may return an error.
+ * See the aufs manual in detail.
-+ *
-+ * To keep this behaviour, aufs has to set NULL to ->get_xip_mem too, and the
-+ * performance of fadvise() and madvise() may be affected.
+ */
+static void dy_adx(struct au_dyaop *dyaop, int do_dx)
+{
-+ if (!do_dx) {
++ if (!do_dx)
+ dyaop->da_op.direct_IO = NULL;
-+ dyaop->da_op.get_xip_mem = NULL;
-+ } else {
++ else
+ dyaop->da_op.direct_IO = aufs_aop.direct_IO;
-+ dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
-+ if (!dyaop->da_get_xip_mem)
-+ dyaop->da_op.get_xip_mem = NULL;
-+ }
+}
+
+static struct au_dyaop *dy_aget(struct au_branch *br,
+}
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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,75 @@
++++ linux/fs/aufs/dynop.h 2015-06-22 08:29:23.706757681 +0200
+@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2010-2015 Junjiro R. Okajima
+ *
+
+#ifdef __KERNEL__
+
-+#include "inode.h"
++#include <linux/fs.h>
++#include <linux/kref.h>
+
+enum {AuDy_AOP, AuDyLast};
+
+struct au_dyaop {
+ struct au_dykey da_key;
+ struct address_space_operations da_op; /* not const */
-+ int (*da_get_xip_mem)(struct address_space *, pgoff_t, int,
-+ void **, unsigned long *);
+};
+
+/* ---------------------------------------------------------------------- */
+#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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/export.c 2015-06-22 08:29:23.706757681 +0200
@@ -0,0 +1,831 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/fhsm.c 2015-06-22 08:27:37.880835119 +0200
@@ -0,0 +1,426 @@
+/*
+ * Copyright (C) 2011-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,829 @@
++++ linux/fs/aufs/file.c 2015-06-22 08:29:23.706757681 +0200
+@@ -0,0 +1,844 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ struct super_block *sb;
+ struct au_branch *br;
+ struct path h_path;
-+ int err, exec_flag;
++ int err;
+
+ /* a race condition can happen between open and unlink/rmdir */
+ h_file = ERR_PTR(-ENOENT);
+
+ sb = dentry->d_sb;
+ br = au_sbr(sb, bindex);
-+ h_file = ERR_PTR(-EACCES);
-+ exec_flag = flags & __FMODE_EXEC;
-+ if (exec_flag && (au_br_mnt(br)->mnt_flags & MNT_NOEXEC))
++ err = au_br_test_oflag(flags, br);
++ h_file = ERR_PTR(err);
++ if (unlikely(err))
+ goto out;
+
+ /* drop flags for writing */
+ if (IS_ERR(h_file))
+ goto out_br;
+
-+ if (exec_flag) {
++ if (flags & __FMODE_EXEC) {
+ err = deny_write_access(h_file);
+ if (unlikely(err)) {
+ fput(h_file);
+ .pin = &pin,
+ .flags = AuCpup_DTIME | AuCpup_HOPEN
+ };
-+ struct inode *inode, *delegated;
++ struct inode *delegated;
+ struct super_block *sb;
+ struct au_sbinfo *sbinfo;
+ struct au_fhsm *fhsm;
+ struct au_hinode *hdir;
+
+ DiMustWriteLock(dentry);
-+ inode = dentry->d_inode;
-+ IiMustWriteLock(inode);
++ IiMustWriteLock(dentry->d_inode);
+
+ err = 0;
+ if (IS_ROOT(dentry))
+ cmoo = au_br_cmoo(br->br_perm);
+ if (!cmoo)
+ goto out;
-+ if (!S_ISREG(inode->i_mode))
++ if (!d_is_reg(dentry))
+ cmoo &= AuBrAttr_COO_ALL;
+ if (!cmoo)
+ goto out;
+ return err;
+}
+
-+int au_do_open(struct file *file, int (*open)(struct file *file, int flags),
-+ struct au_fidir *fidir)
++int au_do_open(struct file *file, struct au_do_open_args *args)
+{
-+ int err;
++ int err, no_lock = args->no_lock;
+ struct dentry *dentry;
+ struct au_finfo *finfo;
+
-+ err = au_finfo_init(file, fidir);
++ if (!no_lock)
++ err = au_finfo_init(file, args->fidir);
++ else {
++ lockdep_off();
++ err = au_finfo_init(file, args->fidir);
++ lockdep_on();
++ }
+ if (unlikely(err))
+ goto out;
+
+ dentry = file->f_path.dentry;
-+ di_write_lock_child(dentry);
-+ err = au_cmoo(dentry);
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ if (!err)
-+ err = open(file, vfsub_file_flags(file));
-+ di_read_unlock(dentry, AuLock_IR);
++ AuDebugOn(IS_ERR_OR_NULL(dentry));
++ if (!no_lock) {
++ di_write_lock_child(dentry);
++ err = au_cmoo(dentry);
++ di_downgrade_lock(dentry, AuLock_IR);
++ if (!err)
++ err = args->open(file, vfsub_file_flags(file), NULL);
++ di_read_unlock(dentry, AuLock_IR);
++ } else {
++ err = au_cmoo(dentry);
++ if (!err)
++ err = args->open(file, vfsub_file_flags(file),
++ args->h_file);
++ if (!err && au_fbstart(file) != au_dbstart(dentry))
++ /*
++ * cmoo happens after h_file was opened.
++ * need to refresh file later.
++ */
++ atomic_dec(&au_fi(file)->fi_generation);
++ }
+
+ finfo = au_fi(file);
+ if (!err) {
+ au_sphl_add(&finfo->fi_hlist,
+ &au_sbi(file->f_path.dentry->d_sb)->si_files);
+ }
-+ fi_write_unlock(file);
++ if (!no_lock)
++ fi_write_unlock(file);
++ else {
++ lockdep_off();
++ fi_write_unlock(file);
++ lockdep_on();
++ }
+ if (unlikely(err)) {
+ finfo->fi_hdir = NULL;
+ au_finfo_fin(file);
+ struct iov_iter *iter, loff_t offset)
+{ BUG(); return 0; }
+
-+/*
-+ * it will never be called, but madvise and fadvise behaves differently
-+ * when get_xip_mem is defined
-+ */
-+static int aufs_get_xip_mem(struct address_space *mapping, pgoff_t pgoff,
-+ int create, void **kmem, unsigned long *pfn)
-+{ BUG(); return 0; }
-+
+/* they will never be called. */
+#ifdef CONFIG_AUFS_DEBUG
+static int aufs_write_begin(struct file *file, struct address_space *mapping,
+const struct address_space_operations aufs_aop = {
+ .readpage = aufs_readpage,
+ .direct_IO = aufs_direct_IO,
-+ .get_xip_mem = aufs_get_xip_mem,
+#ifdef CONFIG_AUFS_DEBUG
+ .writepage = aufs_writepage,
+ /* no writepages, because of writepage */
+};
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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,284 @@
++++ linux/fs/aufs/file.h 2015-06-22 08:27:37.880835119 +0200
+@@ -0,0 +1,291 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+unsigned int au_file_roflags(unsigned int flags);
+struct file *au_h_open(struct dentry *dentry, aufs_bindex_t bindex, int flags,
+ struct file *file, int force_wr);
-+int au_do_open(struct file *file, int (*open)(struct file *file, int flags),
-+ struct au_fidir *fidir);
++struct au_do_open_args {
++ int no_lock;
++ int (*open)(struct file *file, int flags,
++ struct file *h_file);
++ struct au_fidir *fidir;
++ struct file *h_file;
++};
++int au_do_open(struct file *file, struct au_do_open_args *args);
+int au_reopen_nondir(struct file *file);
+struct au_pin;
+int au_ready_to_write(struct file *file, loff_t len, struct au_pin *pin);
+
+/* f_op.c */
+extern const struct file_operations aufs_file_fop;
-+int au_do_open_nondir(struct file *file, int flags);
++int au_do_open_nondir(struct file *file, int flags, struct file *h_file);
+int aufs_release_nondir(struct inode *inode __maybe_unused, struct file *file);
++struct file *au_read_pre(struct file *file, int keep_fi);
+
+/* finfo.c */
+void au_hfput(struct au_hfile *hf, struct file *file);
+#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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,156 @@
++++ linux/fs/aufs/finfo.c 2015-06-22 08:29:23.706757681 +0200
+@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ au_hfput(hf, file);
+ if (val) {
+ FiMustWriteLock(file);
++ AuDebugOn(IS_ERR_OR_NULL(file->f_path.dentry));
+ hf->hf_file = val;
+ hf->hf_br = au_sbr(file->f_path.dentry->d_sb, bindex);
+ }
+}
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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,814 @@
++++ linux/fs/aufs/f_op.c 2015-06-22 08:29:23.706757681 +0200
+@@ -0,0 +1,748 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+#include <linux/security.h>
+#include "aufs.h"
+
-+int au_do_open_nondir(struct file *file, int flags)
++int au_do_open_nondir(struct file *file, int flags, struct file *h_file)
+{
+ int err;
+ aufs_bindex_t bindex;
-+ struct file *h_file;
+ struct dentry *dentry;
+ struct au_finfo *finfo;
+ struct inode *h_inode;
+
+ err = 0;
+ dentry = file->f_path.dentry;
++ AuDebugOn(IS_ERR_OR_NULL(dentry));
+ finfo = au_fi(file);
+ memset(&finfo->fi_htop, 0, sizeof(finfo->fi_htop));
+ atomic_set(&finfo->fi_mmapped, 0);
+ bindex = au_dbstart(dentry);
-+ h_file = au_h_open(dentry, bindex, flags, file, /*force_wr*/0);
++ if (!h_file)
++ h_file = au_h_open(dentry, bindex, flags, file, /*force_wr*/0);
++ else
++ get_file(h_file);
+ if (IS_ERR(h_file))
+ err = PTR_ERR(h_file);
+ else {
+{
+ int err;
+ struct super_block *sb;
++ struct au_do_open_args args = {
++ .open = au_do_open_nondir
++ };
+
+ AuDbg("%pD, f_flags 0x%x, f_mode 0x%x\n",
+ file, vfsub_file_flags(file), file->f_mode);
+
+ sb = file->f_path.dentry->d_sb;
+ si_read_lock(sb, AuLock_FLUSH);
-+ err = au_do_open(file, au_do_open_nondir, /*fidir*/NULL);
++ err = au_do_open(file, &args);
+ si_read_unlock(sb);
+ return err;
+}
+ * read functions after [fdi]_rwsem are released, but it should be harmless.
+ */
+
-+static ssize_t aufs_read(struct file *file, char __user *buf, size_t count,
-+ loff_t *ppos)
++/* Callers should call au_read_post() or fput() in the end */
++struct file *au_read_pre(struct file *file, int keep_fi)
+{
-+ ssize_t err;
-+ struct dentry *dentry;
+ struct file *h_file;
-+ struct super_block *sb;
++ int err;
+
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
-+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
++ if (!err) {
++ di_read_unlock(file->f_path.dentry, AuLock_IR);
++ h_file = au_hf_top(file);
++ get_file(h_file);
++ if (!keep_fi)
++ fi_read_unlock(file);
++ } else
++ h_file = ERR_PTR(err);
++
++ return h_file;
++}
++
++static void au_read_post(struct inode *inode, struct file *h_file)
++{
++ /* update without lock, I don't think it a problem */
++ fsstack_copy_attr_atime(inode, file_inode(h_file));
++ fput(h_file);
++}
++
++struct au_write_pre {
++ blkcnt_t blks;
++ aufs_bindex_t bstart;
++};
++
++/*
++ * return with iinfo is write-locked
++ * callers should call au_write_post() or iinfo_write_unlock() + fput() in the
++ * end
++ */
++static struct file *au_write_pre(struct file *file, int do_ready,
++ struct au_write_pre *wpre)
++{
++ struct file *h_file;
++ struct dentry *dentry;
++ int err;
++ struct au_pin pin;
++
++ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
++ h_file = ERR_PTR(err);
+ if (unlikely(err))
+ goto out;
+
++ dentry = file->f_path.dentry;
++ if (do_ready) {
++ err = au_ready_to_write(file, -1, &pin);
++ if (unlikely(err)) {
++ h_file = ERR_PTR(err);
++ di_write_unlock(dentry);
++ goto out_fi;
++ }
++ }
++
++ di_downgrade_lock(dentry, /*flags*/0);
++ if (wpre)
++ wpre->bstart = au_fbstart(file);
+ h_file = au_hf_top(file);
+ get_file(h_file);
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_read_unlock(file);
++ if (wpre)
++ wpre->blks = file_inode(h_file)->i_blocks;
++ if (do_ready)
++ au_unpin(&pin);
++ di_read_unlock(dentry, /*flags*/0);
++
++out_fi:
++ fi_write_unlock(file);
++out:
++ return h_file;
++}
++
++static void au_write_post(struct inode *inode, struct file *h_file,
++ struct au_write_pre *wpre, ssize_t written)
++{
++ struct inode *h_inode;
++
++ au_cpup_attr_timesizes(inode);
++ AuDebugOn(au_ibstart(inode) != wpre->bstart);
++ h_inode = file_inode(h_file);
++ inode->i_mode = h_inode->i_mode;
++ ii_write_unlock(inode);
++ fput(h_file);
++
++ /* AuDbg("blks %llu, %llu\n", (u64)blks, (u64)h_inode->i_blocks); */
++ if (written > 0)
++ au_fhsm_wrote(inode->i_sb, wpre->bstart,
++ /*force*/h_inode->i_blocks > wpre->blks);
++}
++
++static ssize_t aufs_read(struct file *file, char __user *buf, size_t count,
++ loff_t *ppos)
++{
++ ssize_t err;
++ struct inode *inode;
++ struct file *h_file;
++ struct super_block *sb;
++
++ inode = file_inode(file);
++ sb = inode->i_sb;
++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
++
++ h_file = au_read_pre(file, /*keep_fi*/0);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
+
+ /* filedata may be obsoleted by concurrent copyup, but no problem */
+ err = vfsub_read_u(h_file, buf, count, ppos);
+ /* todo: necessary? */
+ /* file->f_ra = h_file->f_ra; */
-+ /* update without lock, I don't think it a problem */
-+ fsstack_copy_attr_atime(dentry->d_inode, file_inode(h_file));
-+ fput(h_file);
++ au_read_post(inode, h_file);
+
+out:
+ si_read_unlock(sb);
+ size_t count, loff_t *ppos)
+{
+ ssize_t err;
-+ blkcnt_t blks;
-+ aufs_bindex_t bstart;
-+ struct au_pin pin;
-+ struct dentry *dentry;
-+ struct inode *inode, *h_inode;
-+ struct super_block *sb;
++ struct au_write_pre wpre;
++ struct inode *inode;
+ struct file *h_file;
+ char __user *buf = (char __user *)ubuf;
+
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
-+ inode = dentry->d_inode;
++ inode = file_inode(file);
+ au_mtx_and_read_lock(inode);
+
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
-+ if (unlikely(err))
-+ goto out;
-+
-+ err = au_ready_to_write(file, -1, &pin);
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ if (unlikely(err)) {
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out;
-+ }
-+
-+ bstart = au_fbstart(file);
-+ h_file = au_hf_top(file);
-+ get_file(h_file);
-+ h_inode = file_inode(h_file);
-+ blks = h_inode->i_blocks;
-+ au_unpin(&pin);
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
+
+ err = vfsub_write_u(h_file, buf, count, ppos);
-+ ii_write_lock_child(inode);
-+ au_cpup_attr_timesizes(inode);
-+ inode->i_mode = file_inode(h_file)->i_mode;
-+ AuDbg("blks %llu, %llu\n", (u64)blks, (u64)h_inode->i_blocks);
-+ if (err > 0)
-+ au_fhsm_wrote(sb, bstart, /*force*/h_inode->i_blocks > blks);
-+ ii_write_unlock(inode);
-+ fput(h_file);
++ au_write_post(inode, h_file, &wpre, err);
+
+out:
-+ si_read_unlock(sb);
++ si_read_unlock(inode->i_sb);
+ mutex_unlock(&inode->i_mutex);
+ return err;
+}
+{
+ ssize_t err;
+ struct file *file, *h_file;
-+ struct dentry *dentry;
++ struct inode *inode;
+ struct super_block *sb;
+
+ file = kio->ki_filp;
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
++ inode = file_inode(file);
++ sb = inode->i_sb;
+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
-+ if (unlikely(err))
-+ goto out;
+
-+ h_file = au_hf_top(file);
-+ get_file(h_file);
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_read_unlock(file);
++ h_file = au_read_pre(file, /*keep_fi*/0);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
+
+ err = au_do_iter(h_file, MAY_READ, kio, iov_iter);
+ /* todo: necessary? */
+ /* file->f_ra = h_file->f_ra; */
-+ /* update without lock, I don't think it a problem */
-+ fsstack_copy_attr_atime(dentry->d_inode, file_inode(h_file));
-+ fput(h_file);
++ au_read_post(inode, h_file);
+
+out:
+ si_read_unlock(sb);
+static ssize_t aufs_write_iter(struct kiocb *kio, struct iov_iter *iov_iter)
+{
+ ssize_t err;
-+ blkcnt_t blks;
-+ aufs_bindex_t bstart;
-+ struct au_pin pin;
-+ struct dentry *dentry;
-+ struct inode *inode, *h_inode;
++ struct au_write_pre wpre;
++ struct inode *inode;
+ struct file *file, *h_file;
-+ struct super_block *sb;
+
+ file = kio->ki_filp;
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
-+ inode = dentry->d_inode;
++ inode = file_inode(file);
+ au_mtx_and_read_lock(inode);
+
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
-+ if (unlikely(err))
-+ goto out;
-+
-+ err = au_ready_to_write(file, -1, &pin);
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ if (unlikely(err)) {
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out;
-+ }
-+
-+ bstart = au_fbstart(file);
-+ h_file = au_hf_top(file);
-+ get_file(h_file);
-+ h_inode = file_inode(h_file);
-+ blks = h_inode->i_blocks;
-+ au_unpin(&pin);
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
+
+ err = au_do_iter(h_file, MAY_WRITE, kio, iov_iter);
-+ ii_write_lock_child(inode);
-+ au_cpup_attr_timesizes(inode);
-+ inode->i_mode = file_inode(h_file)->i_mode;
-+ AuDbg("blks %llu, %llu\n", (u64)blks, (u64)h_inode->i_blocks);
-+ if (err > 0)
-+ au_fhsm_wrote(sb, bstart, /*force*/h_inode->i_blocks > blks);
-+ ii_write_unlock(inode);
-+ fput(h_file);
++ au_write_post(inode, h_file, &wpre, err);
+
+out:
-+ si_read_unlock(sb);
++ si_read_unlock(inode->i_sb);
+ mutex_unlock(&inode->i_mutex);
+ return err;
+}
+{
+ ssize_t err;
+ struct file *h_file;
-+ struct dentry *dentry;
++ struct inode *inode;
+ struct super_block *sb;
+
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
++ inode = file_inode(file);
++ sb = inode->i_sb;
+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
-+ if (unlikely(err))
++
++ h_file = au_read_pre(file, /*keep_fi*/1);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out;
+
-+ err = -EINVAL;
-+ h_file = au_hf_top(file);
-+ get_file(h_file);
+ if (au_test_loopback_kthread()) {
+ au_warn_loopback(h_file->f_path.dentry->d_sb);
+ if (file->f_mapping != h_file->f_mapping) {
+ smp_mb(); /* unnecessary? */
+ }
+ }
-+ di_read_unlock(dentry, AuLock_IR);
+ fi_read_unlock(file);
+
+ err = vfsub_splice_to(h_file, ppos, pipe, len, flags);
+ /* todo: necessasry? */
+ /* file->f_ra = h_file->f_ra; */
-+ /* update without lock, I don't think it a problem */
-+ fsstack_copy_attr_atime(dentry->d_inode, file_inode(h_file));
-+ fput(h_file);
++ au_read_post(inode, h_file);
+
+out:
+ si_read_unlock(sb);
+ size_t len, unsigned int flags)
+{
+ ssize_t err;
-+ blkcnt_t blks;
-+ aufs_bindex_t bstart;
-+ struct au_pin pin;
-+ struct dentry *dentry;
-+ struct inode *inode, *h_inode;
-+ struct super_block *sb;
++ struct au_write_pre wpre;
++ struct inode *inode;
+ struct file *h_file;
+
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
-+ inode = dentry->d_inode;
++ inode = file_inode(file);
+ au_mtx_and_read_lock(inode);
+
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
-+ if (unlikely(err))
-+ goto out;
-+
-+ err = au_ready_to_write(file, -1, &pin);
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ if (unlikely(err)) {
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out;
-+ }
-+
-+ bstart = au_fbstart(file);
-+ h_file = au_hf_top(file);
-+ get_file(h_file);
-+ h_inode = file_inode(h_file);
-+ blks = h_inode->i_blocks;
-+ au_unpin(&pin);
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
+
+ err = vfsub_splice_from(pipe, h_file, ppos, len, flags);
-+ ii_write_lock_child(inode);
-+ au_cpup_attr_timesizes(inode);
-+ inode->i_mode = file_inode(h_file)->i_mode;
-+ AuDbg("blks %llu, %llu\n", (u64)blks, (u64)h_inode->i_blocks);
-+ if (err > 0)
-+ au_fhsm_wrote(sb, bstart, /*force*/h_inode->i_blocks > blks);
-+ ii_write_unlock(inode);
-+ fput(h_file);
++ au_write_post(inode, h_file, &wpre, err);
+
+out:
-+ si_read_unlock(sb);
++ si_read_unlock(inode->i_sb);
+ mutex_unlock(&inode->i_mutex);
+ return err;
+}
+ loff_t len)
+{
+ long err;
-+ struct au_pin pin;
-+ struct dentry *dentry;
-+ struct super_block *sb;
++ struct au_write_pre wpre;
+ struct inode *inode;
+ struct file *h_file;
+
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
-+ inode = dentry->d_inode;
++ inode = file_inode(file);
+ au_mtx_and_read_lock(inode);
+
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
-+ if (unlikely(err))
-+ goto out;
-+
-+ err = au_ready_to_write(file, -1, &pin);
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ if (unlikely(err)) {
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out;
-+ }
-+
-+ h_file = au_hf_top(file);
-+ get_file(h_file);
-+ au_unpin(&pin);
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
+
+ lockdep_off();
+ err = vfs_fallocate(h_file, mode, offset, len);
+ lockdep_on();
-+ ii_write_lock_child(inode);
-+ au_cpup_attr_timesizes(inode);
-+ inode->i_mode = file_inode(h_file)->i_mode;
-+ ii_write_unlock(inode);
-+ fput(h_file);
++ au_write_post(inode, h_file, &wpre, /*written*/1);
+
+out:
-+ si_read_unlock(sb);
++ si_read_unlock(inode->i_sb);
+ mutex_unlock(&inode->i_mutex);
+ return err;
+}
+static int aufs_mmap(struct file *file, struct vm_area_struct *vma)
+{
+ int err;
-+ aufs_bindex_t bstart;
+ const unsigned char wlock
+ = (file->f_mode & FMODE_WRITE) && (vma->vm_flags & VM_SHARED);
-+ struct dentry *dentry;
+ struct super_block *sb;
+ struct file *h_file;
-+ struct au_branch *br;
-+ struct au_pin pin;
++ struct inode *inode;
+
+ AuDbgVmRegion(file, vma);
+
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
++ inode = file_inode(file);
++ sb = inode->i_sb;
+ lockdep_off();
+ si_read_lock(sb, AuLock_NOPLMW);
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
-+ if (unlikely(err))
-+ goto out;
-+
-+ if (wlock) {
-+ err = au_ready_to_write(file, -1, &pin);
-+ di_write_unlock(dentry);
-+ if (unlikely(err)) {
-+ fi_write_unlock(file);
-+ goto out;
-+ }
-+ au_unpin(&pin);
-+ } else
-+ di_write_unlock(dentry);
+
-+ bstart = au_fbstart(file);
-+ br = au_sbr(sb, bstart);
-+ h_file = au_hf_top(file);
-+ get_file(h_file);
-+ au_set_mmapped(file);
-+ fi_write_unlock(file);
++ h_file = au_write_pre(file, wlock, /*wpre*/NULL);
+ lockdep_on();
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
+
++ err = 0;
++ au_set_mmapped(file);
+ au_vm_file_reset(vma, h_file);
+ /*
+ * we cannot call security_mmap_file() here since it may acquire
+ */
+ if (!err)
+ err = h_file->f_op->mmap(h_file, vma);
-+ if (unlikely(err))
-+ goto out_reset;
-+
-+ au_vm_prfile_set(vma, file);
-+ /* update without lock, I don't think it a problem */
-+ fsstack_copy_attr_atime(file_inode(file), file_inode(h_file));
-+ goto out_fput; /* success */
-+
-+out_reset:
++ if (!err) {
++ au_vm_prfile_set(vma, file);
++ fsstack_copy_attr_atime(inode, file_inode(h_file));
++ goto out_fput; /* success */
++ }
+ au_unset_mmapped(file);
+ au_vm_file_reset(vma, file);
++
+out_fput:
-+ fput(h_file);
+ lockdep_off();
++ ii_write_unlock(inode);
++ lockdep_on();
++ fput(h_file);
+out:
++ lockdep_off();
+ si_read_unlock(sb);
+ lockdep_on();
+ AuTraceErr(err);
+ int datasync)
+{
+ int err;
-+ struct au_pin pin;
-+ struct dentry *dentry;
++ struct au_write_pre wpre;
+ struct inode *inode;
+ struct file *h_file;
-+ struct super_block *sb;
-+
-+ dentry = file->f_path.dentry;
-+ inode = dentry->d_inode;
-+ sb = dentry->d_sb;
-+ mutex_lock(&inode->i_mutex);
-+ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
-+ if (unlikely(err))
-+ goto out;
+
+ err = 0; /* -EBADF; */ /* posix? */
+ if (unlikely(!(file->f_mode & FMODE_WRITE)))
-+ goto out_si;
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
-+ if (unlikely(err))
-+ goto out_si;
++ goto out;
+
-+ err = au_ready_to_write(file, -1, &pin);
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ if (unlikely(err))
++ inode = file_inode(file);
++ au_mtx_and_read_lock(inode);
++
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out_unlock;
-+ au_unpin(&pin);
+
-+ err = -EINVAL;
-+ h_file = au_hf_top(file);
+ err = vfsub_fsync(h_file, &h_file->f_path, datasync);
-+ au_cpup_attr_timesizes(inode);
++ au_write_post(inode, h_file, &wpre, /*written*/0);
+
+out_unlock:
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
-+out_si:
-+ si_read_unlock(sb);
-+out:
++ si_read_unlock(inode->i_sb);
+ mutex_unlock(&inode->i_mutex);
++out:
+ return err;
+}
+
+static int aufs_aio_fsync_nondir(struct kiocb *kio, int datasync)
+{
+ int err;
-+ struct au_pin pin;
-+ struct dentry *dentry;
++ struct au_write_pre wpre;
+ struct inode *inode;
+ struct file *file, *h_file;
+
-+ file = kio->ki_filp;
-+ dentry = file->f_path.dentry;
-+ inode = dentry->d_inode;
-+ au_mtx_and_read_lock(inode);
-+
+ err = 0; /* -EBADF; */ /* posix? */
+ if (unlikely(!(file->f_mode & FMODE_WRITE)))
+ goto out;
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
-+ if (unlikely(err))
-+ goto out;
+
-+ err = au_ready_to_write(file, -1, &pin);
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ if (unlikely(err))
++ file = kio->ki_filp;
++ inode = file_inode(file);
++ au_mtx_and_read_lock(inode);
++
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out_unlock;
-+ au_unpin(&pin);
+
+ err = -ENOSYS;
+ h_file = au_hf_top(file);
+ if (!err)
+ vfsub_update_h_iattr(&h_file->f_path, /*did*/NULL);
+ /*ignore*/
-+ au_cpup_attr_timesizes(inode);
+ mutex_unlock(h_mtx);
+ }
++ au_write_post(inode, h_file, &wpre, /*written*/0);
+
+out_unlock:
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_write_unlock(file);
-+out:
+ si_read_unlock(inode->sb);
+ mutex_unlock(&inode->i_mutex);
++out:
+ return err;
+}
+#endif
+{
+ int err;
+ struct file *h_file;
-+ struct dentry *dentry;
+ struct super_block *sb;
+
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
++ sb = file->f_path.dentry->d_sb;
+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
-+ if (unlikely(err))
++
++ h_file = au_read_pre(file, /*keep_fi*/0);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out;
+
-+ h_file = au_hf_top(file);
+ if (h_file->f_op->fasync)
+ err = h_file->f_op->fasync(fd, h_file, flag);
-+
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_read_unlock(file);
++ fput(h_file); /* instead of au_read_post() */
+
+out:
+ si_read_unlock(sb);
+};
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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,469 @@
++++ linux/fs/aufs/fstype.h 2015-06-22 08:27:37.880835119 +0200
+@@ -0,0 +1,400 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+#include <linux/fs.h>
+#include <linux/magic.h>
+#include <linux/romfs_fs.h>
++#include <linux/nfs_fs.h>
+
+static inline int au_test_aufs(struct super_block *sb)
+{
+#endif
+}
+
-+static inline int au_test_ocfs2(struct super_block *sb __maybe_unused)
-+{
-+#if defined(CONFIG_OCFS2_FS) || defined(CONFIG_OCFS2_FS_MODULE)
-+ return sb->s_magic == OCFS2_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
-+
-+static inline int au_test_ocfs2_dlmfs(struct super_block *sb __maybe_unused)
-+{
-+#if defined(CONFIG_OCFS2_FS_O2CB) || defined(CONFIG_OCFS2_FS_O2CB_MODULE)
-+ return sb->s_magic == DLMFS_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
-+
-+static inline int au_test_coda(struct super_block *sb __maybe_unused)
-+{
-+#if defined(CONFIG_CODA_FS) || defined(CONFIG_CODA_FS_MODULE)
-+ return sb->s_magic == CODA_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
-+
-+static inline int au_test_v9fs(struct super_block *sb __maybe_unused)
-+{
-+#if defined(CONFIG_9P_FS) || defined(CONFIG_9P_FS_MODULE)
-+ return sb->s_magic == V9FS_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
-+
-+static inline int au_test_ext4(struct super_block *sb __maybe_unused)
-+{
-+#if defined(CONFIG_EXT4_FS) || defined(CONFIG_EXT4_FS_MODULE)
-+ return sb->s_magic == EXT4_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
-+
-+static inline int au_test_sysv(struct super_block *sb __maybe_unused)
-+{
-+#if defined(CONFIG_SYSV_FS) || defined(CONFIG_SYSV_FS_MODULE)
-+ return !strcmp(au_sbtype(sb), "sysv");
-+#else
-+ return 0;
-+#endif
-+}
-+
+static inline int au_test_ramfs(struct super_block *sb)
+{
+ return sb->s_magic == RAMFS_MAGIC;
+#endif
+}
+
-+static inline int au_test_cifs(struct super_block *sb __maybe_unused)
-+{
-+#if defined(CONFIG_CIFS_FS) || defined(CONFIGCIFS_FS_MODULE)
-+ return sb->s_magic == CIFS_MAGIC_NUMBER;
-+#else
-+ return 0;
-+#endif
-+}
-+
+static inline int au_test_fat(struct super_block *sb __maybe_unused)
+{
+#if defined(CONFIG_FAT_FS) || defined(CONFIG_FAT_FS_MODULE)
+{
+ return au_test_nfs(sb)
+ || au_test_fuse(sb)
-+ /* || au_test_ocfs2(sb) */ /* untested */
+ /* || au_test_btrfs(sb) */ /* untested */
-+ /* || au_test_coda(sb) */ /* untested */
-+ /* || au_test_v9fs(sb) */ /* untested */
+ ;
+}
+
+ || au_test_btrfs(sb)
+ || au_test_ubifs(sb)
+ || au_test_hfsplus(sb) /* maintained, but incorrect */
-+ /* || au_test_ext4(sb) */ /* untested */
-+ /* || au_test_ocfs2(sb) */ /* untested */
-+ /* || au_test_ocfs2_dlmfs(sb) */ /* untested */
-+ /* || au_test_sysv(sb) */ /* untested */
+ /* || au_test_minix(sb) */ /* untested */
+ ;
+}
+static inline int au_test_fs_bad_iattr(struct super_block *sb)
+{
+ return au_test_fs_bad_iattr_size(sb)
-+ /* || au_test_cifs(sb) */ /* untested */
+ || au_test_fat(sb)
+ || au_test_msdos(sb)
+ || au_test_vfat(sb);
+ return au_test_nfs(sb)
+ || au_test_fuse(sb)
+ || au_test_ubifs(sb)
-+ /* || au_test_cifs(sb) */ /* untested */
+ ;
+}
+
-+/*
-+ * filesystems which requires replacing i_mapping.
-+ */
-+static inline int au_test_fs_bad_mapping(struct super_block *sb)
-+{
-+ return au_test_fuse(sb)
-+ || au_test_ubifs(sb);
-+}
-+
+/* temporary support for i#1 in cramfs */
+static inline int au_test_fs_unique_ino(struct inode *inode)
+{
+ || au_test_romfs(sb);
+}
+
++/*
++ * test if the @inode is nfs with 'noacl' option
++ * NFS always sets MS_POSIXACL regardless its mount option 'noacl.'
++ */
++static inline int au_test_nfs_noacl(struct inode *inode)
++{
++ return au_test_nfs(inode->i_sb)
++ /* && IS_POSIXACL(inode) */
++ && !nfs_server_capable(inode, NFS_CAP_ACLS);
++}
++
+#endif /* __KERNEL__ */
+#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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/hfsnotify.c 2015-06-22 08:27:37.880835119 +0200
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ test_ret(FS_UNMOUNT);
+ test_ret(FS_Q_OVERFLOW);
+ test_ret(FS_IN_IGNORED);
-+ test_ret(FS_IN_ISDIR);
++ test_ret(FS_ISDIR);
+ test_ret(FS_IN_ONESHOT);
+ test_ret(FS_EVENT_ON_CHILD);
+ return "";
+};
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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/hfsplus.c 2015-06-22 08:29:23.706757681 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010-2015 Junjiro R. Okajima
+
+ h_file = NULL;
+ if (au_test_hfsplus(h_dentry->d_sb)
-+ && S_ISREG(h_dentry->d_inode->i_mode))
++ && d_is_reg(h_dentry))
+ h_file = au_h_open(dentry, bindex,
+ O_RDONLY | O_NOATIME | O_LARGEFILE,
+ /*file*/NULL, force_wr);
+}
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 2015-03-27 21:56:35.463461668 +0100
++++ linux/fs/aufs/hnotify.c 2015-06-22 08:29:23.706757681 +0200
@@ -0,0 +1,714 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/iinfo.c 2015-06-22 08:27:37.884168534 +0200
@@ -0,0 +1,277 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/inode.c 2015-06-22 08:27:37.884168534 +0200
@@ -0,0 +1,495 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,667 @@
++++ linux/fs/aufs/inode.h 2015-06-22 08:27:37.884168534 +0200
+@@ -0,0 +1,673 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+
+/* au_wr_dir flags */
+#define AuWrDir_ADD_ENTRY 1
-+#define AuWrDir_TMP_WHENTRY (1 << 1)
-+#define AuWrDir_ISDIR (1 << 2)
-+#define AuWrDir_TMPFILE (1 << 3)
++#define AuWrDir_ISDIR (1 << 1)
++#define AuWrDir_TMPFILE (1 << 2)
+#define au_ftest_wrdir(flags, name) ((flags) & AuWrDir_##name)
+#define au_fset_wrdir(flags, name) \
+ do { (flags) |= AuWrDir_##name; } while (0)
+int aufs_symlink(struct inode *dir, struct dentry *dentry, const char *symname);
+int aufs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+ bool want_excl);
++struct vfsub_aopen_args;
++int au_aopen_or_create(struct inode *dir, struct dentry *dentry,
++ struct vfsub_aopen_args *args);
+int aufs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode);
+int aufs_link(struct dentry *src_dentry, struct inode *dir,
+ struct dentry *dentry);
+#ifdef CONFIG_PROC_FS
+/* plink.c */
+int au_plink_maint(struct super_block *sb, int flags);
++struct au_sbinfo;
+void au_plink_maint_leave(struct au_sbinfo *sbinfo);
+int au_plink_maint_enter(struct super_block *sb);
+#ifdef CONFIG_AUFS_DEBUG
+
+#ifdef CONFIG_AUFS_XATTR
+/* xattr.c */
-+int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags);
++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);
+/* void au_xattr_init(struct super_block *sb); */
+#else
+AuStubInt0(au_cpup_xattr, struct dentry *h_dst, struct dentry *h_src,
-+ int ignore_flags);
++ int ignore_flags, unsigned int verbose);
+/* AuStubVoid(au_xattr_init, struct super_block *sb); */
+#endif
+
+ }
+}
+
++#if 0 /* reserved */
+static inline void au_pin_set_parent(struct au_pin *pin, struct dentry *parent)
+{
+ if (pin) {
+ pin->parent = dget(parent);
+ }
+}
++#endif
+
+/* ---------------------------------------------------------------------- */
+
+#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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/ioctl.c 2015-06-22 08:29:23.706757681 +0200
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,896 @@
++++ linux/fs/aufs/i_op_add.c 2015-06-22 08:27:37.880835119 +0200
+@@ -0,0 +1,930 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ d_instantiate(dentry, inode);
+ dir = dentry->d_parent->d_inode; /* dir inode is locked */
+ IMustLock(dir);
-+ if (au_ibstart(dir) == au_dbstart(dentry))
-+ au_cpup_attr_timesizes(dir);
++ au_dir_ts(dir, bindex);
+ dir->i_version++;
+ au_fhsm_wrote(sb, bindex, /*force*/0);
+ return 0; /* success */
+ int type;
+ union {
+ struct {
-+ umode_t mode;
-+ bool want_excl;
++ umode_t mode;
++ bool want_excl;
++ bool try_aopen;
++ struct vfsub_aopen_args *aopen;
+ } c;
+ struct {
+ const char *symname;
+ int err, rerr;
+ aufs_bindex_t bstart;
+ unsigned char created;
++ const unsigned char try_aopen
++ = (arg->type == Creat && arg->u.c.try_aopen);
+ struct dentry *wh_dentry, *parent;
+ struct inode *h_dir;
++ struct super_block *sb;
++ struct au_branch *br;
+ /* to reuduce stack size */
+ struct {
+ struct au_dtime dt;
+ a->wr_dir_args.flags = AuWrDir_ADD_ENTRY;
+
+ parent = dentry->d_parent; /* dir inode is locked */
-+ err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN);
-+ if (unlikely(err))
-+ goto out_free;
++ if (!try_aopen) {
++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN);
++ if (unlikely(err))
++ goto out_free;
++ }
+ err = au_d_may_add(dentry);
+ if (unlikely(err))
+ goto out_unlock;
-+ di_write_lock_parent(parent);
++ if (!try_aopen)
++ di_write_lock_parent(parent);
+ wh_dentry = lock_hdir_lkup_wh(dentry, &a->dt, /*src_dentry*/NULL,
+ &a->pin, &a->wr_dir_args);
+ err = PTR_ERR(wh_dentry);
+ goto out_parent;
+
+ bstart = au_dbstart(dentry);
++ sb = dentry->d_sb;
++ br = au_sbr(sb, bstart);
+ a->h_path.dentry = au_h_dptr(dentry, bstart);
-+ a->h_path.mnt = au_sbr_mnt(dentry->d_sb, bstart);
++ a->h_path.mnt = au_br_mnt(br);
+ h_dir = au_pinned_h_dir(&a->pin);
+ switch (arg->type) {
+ case Creat:
-+ err = vfsub_create(h_dir, &a->h_path, arg->u.c.mode,
-+ arg->u.c.want_excl);
++ err = 0;
++ if (!try_aopen || !h_dir->i_op->atomic_open)
++ err = vfsub_create(h_dir, &a->h_path, arg->u.c.mode,
++ arg->u.c.want_excl);
++ else
++ err = vfsub_atomic_open(h_dir, a->h_path.dentry,
++ arg->u.c.aopen, br);
+ break;
+ case Symlink:
+ err = vfsub_symlink(h_dir, &a->h_path, arg->u.s.symname);
+ au_dtime_revert(&a->dt);
+ }
+
++ if (!err && try_aopen && !h_dir->i_op->atomic_open)
++ *arg->u.c.aopen->opened |= FILE_CREATED;
++
+ au_unpin(&a->pin);
+ dput(wh_dentry);
+
+out_parent:
-+ di_write_unlock(parent);
++ if (!try_aopen)
++ di_write_unlock(parent);
+out_unlock:
+ if (unlikely(err)) {
+ au_update_dbstart(dentry);
+ d_drop(dentry);
+ }
-+ aufs_read_unlock(dentry, AuLock_DW);
++ if (!try_aopen)
++ aufs_read_unlock(dentry, AuLock_DW);
+out_free:
+ kfree(a);
+out:
+ return add_simple(dir, dentry, &arg);
+}
+
++int au_aopen_or_create(struct inode *dir, struct dentry *dentry,
++ struct vfsub_aopen_args *aopen_args)
++{
++ struct simple_arg arg = {
++ .type = Creat,
++ .u.c = {
++ .mode = aopen_args->create_mode,
++ .want_excl = aopen_args->open_flag & O_EXCL,
++ .try_aopen = true,
++ .aopen = aopen_args
++ }
++ };
++ return add_simple(dir, dentry, &arg);
++}
++
+int aufs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
+{
+ int err;
+ goto out_revert;
+ }
+
++ au_dir_ts(dir, a->bdst);
+ dir->i_version++;
-+ if (au_ibstart(dir) == au_dbstart(dentry))
-+ au_cpup_attr_timesizes(dir);
+ inc_nlink(inode);
+ inode->i_ctime = dir->i_ctime;
+ d_instantiate(dentry, au_igrab(inode));
+}
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 2015-03-27 21:56:35.463461668 +0100
-@@ -0,0 +1,1299 @@
++++ linux/fs/aufs/i_op.c 2015-06-22 08:29:23.706757681 +0200
+@@ -0,0 +1,1445 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ * - skip the lower fs test in the case of write to ro branch.
+ * - nfs dir permission write check is optimized, but a policy for
+ * link/rename requires a real check.
++ * - nfs always sets MS_POSIXACL regardless its mount option 'noacl.'
++ * in this case, generic_permission() returns -EOPNOTSUPP.
+ */
+ if ((write_mask && !au_br_writable(brperm))
+ || (au_test_nfs(h_inode->i_sb) && S_ISDIR(h_inode->i_mode)
+ && write_mask && !(mask & MAY_READ))
+ || !h_inode->i_op->permission) {
+ /* AuLabel(generic_permission); */
++ /* AuDbg("get_acl %pf\n", h_inode->i_op->get_acl); */
+ err = generic_permission(h_inode, mask);
++ if (err == -EOPNOTSUPP && au_test_nfs_noacl(h_inode))
++ err = h_inode->i_op->permission(h_inode, mask);
++ AuTraceErr(err);
+ } else {
+ /* AuLabel(h_inode->permission); */
+ err = h_inode->i_op->permission(h_inode, mask);
+
+/* ---------------------------------------------------------------------- */
+
++struct aopen_node {
++ struct hlist_node hlist;
++ struct file *file, *h_file;
++};
++
++static int au_do_aopen(struct inode *inode, struct file *file)
++{
++ struct au_sphlhead *aopen;
++ struct aopen_node *node;
++ struct au_do_open_args args = {
++ .no_lock = 1,
++ .open = au_do_open_nondir
++ };
++
++ aopen = &au_sbi(inode->i_sb)->si_aopen;
++ spin_lock(&aopen->spin);
++ hlist_for_each_entry(node, &aopen->head, hlist)
++ if (node->file == file) {
++ args.h_file = node->h_file;
++ break;
++ }
++ spin_unlock(&aopen->spin);
++ /* AuDebugOn(!args.h_file); */
++
++ return au_do_open(file, &args);
++}
++
++static int aufs_atomic_open(struct inode *dir, struct dentry *dentry,
++ struct file *file, unsigned int open_flag,
++ umode_t create_mode, int *opened)
++{
++ int err, h_opened = *opened;
++ struct dentry *parent;
++ struct dentry *d;
++ struct au_sphlhead *aopen;
++ struct vfsub_aopen_args args = {
++ .open_flag = open_flag,
++ .create_mode = create_mode,
++ .opened = &h_opened
++ };
++ struct aopen_node aopen_node = {
++ .file = file
++ };
++
++ IMustLock(dir);
++ AuDbg("open_flag 0x%x\n", open_flag);
++ AuDbgDentry(dentry);
++
++ err = 0;
++ if (!au_di(dentry)) {
++ d = aufs_lookup(dir, dentry, /*flags*/0);
++ if (IS_ERR(d)) {
++ err = PTR_ERR(d);
++ goto out;
++ } else if (d) {
++ /*
++ * obsoleted dentry found.
++ * another error will be returned later.
++ */
++ d_drop(d);
++ dput(d);
++ AuDbgDentry(d);
++ }
++ AuDbgDentry(dentry);
++ }
++
++ if (d_is_positive(dentry)
++ || d_unhashed(dentry)
++ || d_unlinked(dentry)
++ || !(open_flag & O_CREAT))
++ goto out_no_open;
++
++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_FLUSH | AuLock_GEN);
++ if (unlikely(err))
++ goto out;
++
++ parent = dentry->d_parent; /* dir is locked */
++ di_write_lock_parent(parent);
++ err = au_lkup_dentry(dentry, /*bstart*/0, /*type*/0);
++ if (unlikely(err))
++ goto out_unlock;
++
++ AuDbgDentry(dentry);
++ if (d_is_positive(dentry))
++ goto out_unlock;
++
++ args.file = get_empty_filp();
++ err = PTR_ERR(args.file);
++ if (IS_ERR(args.file))
++ goto out_unlock;
++
++ args.file->f_flags = file->f_flags;
++ err = au_aopen_or_create(dir, dentry, &args);
++ AuTraceErr(err);
++ AuDbgFile(args.file);
++ if (unlikely(err < 0)) {
++ if (h_opened & FILE_OPENED)
++ fput(args.file);
++ else
++ put_filp(args.file);
++ goto out_unlock;
++ }
++
++ /* some filesystems don't set FILE_CREATED while succeeded? */
++ *opened |= FILE_CREATED;
++ if (h_opened & FILE_OPENED)
++ aopen_node.h_file = args.file;
++ else {
++ put_filp(args.file);
++ args.file = NULL;
++ }
++ aopen = &au_sbi(dir->i_sb)->si_aopen;
++ au_sphl_add(&aopen_node.hlist, aopen);
++ err = finish_open(file, dentry, au_do_aopen, opened);
++ au_sphl_del(&aopen_node.hlist, aopen);
++ AuTraceErr(err);
++ AuDbgFile(file);
++ if (aopen_node.h_file)
++ fput(aopen_node.h_file);
++
++out_unlock:
++ di_write_unlock(parent);
++ aufs_read_unlock(dentry, AuLock_DW);
++ AuDbgDentry(dentry);
++ if (unlikely(err))
++ goto out;
++out_no_open:
++ if (!err && !(*opened & FILE_CREATED)) {
++ AuLabel(out_no_open);
++ dget(dentry);
++ err = finish_no_open(file, dentry);
++ }
++out:
++ AuDbg("%pd%s%s\n", dentry,
++ (*opened & FILE_CREATED) ? " created" : "",
++ (*opened & FILE_OPENED) ? " opened" : "");
++ AuTraceErr(err);
++ return err;
++}
++
++
++/* ---------------------------------------------------------------------- */
++
+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)
+ h_parent = au_h_dptr(parent, bcpup);
+ h_dir = h_parent->d_inode;
+ mutex_lock_nested(&h_dir->i_mutex, AuLsc_I_PARENT);
-+ err = au_lkup_neg(dentry, bcpup,
-+ au_ftest_wrdir(add_entry, TMP_WHENTRY));
++ err = au_lkup_neg(dentry, bcpup, /*wh*/0);
+ /* todo: no unlock here */
+ mutex_unlock(&h_dir->i_mutex);
+
+ aufs_bindex_t bcpup, bstart, src_bstart;
+ const unsigned char add_entry
+ = au_ftest_wrdir(args->flags, ADD_ENTRY)
-+ | au_ftest_wrdir(args->flags, TMP_WHENTRY)
+ | au_ftest_wrdir(args->flags, TMPFILE);
+ struct super_block *sb;
+ struct dentry *parent;
+
+ if (ia->ia_valid & ATTR_FILE) {
+ /* currently ftruncate(2) only */
-+ AuDebugOn(!S_ISREG(inode->i_mode));
++ AuDebugOn(!d_is_reg(dentry));
+ file = ia->ia_file;
+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
+ if (unlikely(err))
+#endif
+
+ .update_time = aufs_update_time,
-+ /* no support for atomic_open() */
-+
++ .atomic_open = aufs_atomic_open,
+ .tmpfile = aufs_tmpfile
+};
+
+};
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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,507 @@
++++ linux/fs/aufs/i_op_del.c 2015-06-22 08:27:37.884168534 +0200
+@@ -0,0 +1,506 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ d_drop(dentry);
+ inode->i_ctime = dir->i_ctime;
+
-+ if (au_ibstart(dir) == bindex)
-+ au_cpup_attr_timesizes(dir);
++ au_dir_ts(dir, bindex);
+ dir->i_version++;
+}
+
+}
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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,1035 @@
++++ linux/fs/aufs/i_op_ren.c 2015-06-22 08:27:37.884168534 +0200
+@@ -0,0 +1,1015 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+#define AuRen_MNT_WRITE (1 << 4)
+#define AuRen_DT_DSTDIR (1 << 5)
+#define AuRen_DIROPQ (1 << 6)
-+#define AuRen_CPUP (1 << 7)
+#define au_ftest_ren(flags, name) ((flags) & AuRen_##name)
+#define au_fset_ren(flags, name) \
+ do { (flags) |= AuRen_##name; } while (0)
+ RevertFailure("rename %pd", a->src_dentry);
+}
+
-+static void au_ren_rev_cpup(int err, struct au_ren_args *a)
-+{
-+ int rerr;
-+
-+ a->h_path.dentry = a->dst_h_dentry;
-+ /* no delegation since it is just created */
-+ rerr = vfsub_unlink(a->dst_h_dir, &a->h_path, /*delegated*/NULL,
-+ /*force*/0);
-+ au_set_h_dptr(a->src_dentry, a->btgt, NULL);
-+ au_set_dbstart(a->src_dentry, a->src_bstart);
-+ if (rerr)
-+ RevertFailure("unlink %pd", a->dst_h_dentry);
-+}
-+
+static void au_ren_rev_whtmp(int err, struct au_ren_args *a)
+{
+ int rerr;
+ if (au_ftest_ren(a->flags, DIROPQ))
+ au_ren_rev_diropq(err, a);
+out_rename:
-+ if (!au_ftest_ren(a->flags, CPUP))
-+ au_ren_rev_rename(err, a);
-+ else
-+ au_ren_rev_cpup(err, a);
++ au_ren_rev_rename(err, a);
+ dput(a->h_dst);
+out_whtmp:
+ if (a->thargs)
+ au_cpup_attr_nlink(dir, /*force*/1);
+ }
+
-+ if (au_ibstart(dir) == a->btgt)
-+ au_cpup_attr_timesizes(dir);
++ au_dir_ts(dir, a->btgt);
+
+ if (au_ftest_ren(a->flags, ISSAMEDIR))
+ return;
+ dir->i_version++;
+ if (au_ftest_ren(a->flags, ISDIR))
+ au_cpup_attr_nlink(dir, /*force*/1);
-+ if (au_ibstart(dir) == a->btgt)
-+ au_cpup_attr_timesizes(dir);
++ au_dir_ts(dir, a->btgt);
+}
+
+static void au_ren_refresh(struct au_ren_args *a)
+}
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 2015-03-27 21:56:35.460128334 +0100
++++ linux/fs/aufs/Kconfig 2015-06-22 08:27:37.874168290 +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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/loop.c 2015-06-22 08:29:23.706757681 +0200
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2005-2015 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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/loop.h 2015-06-22 08:27:37.884168534 +0200
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2015 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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,54 @@
++++ linux/fs/aufs/magic.mk 2015-06-22 08:27:37.884168534 +0200
+@@ -0,0 +1,30 @@
+
+# defined in ${srctree}/fs/fuse/inode.c
+# tristate
+ccflags-y += -DFUSE_SUPER_MAGIC=0x65735546
+endif
+
-+# defined in ${srctree}/fs/ocfs2/ocfs2_fs.h
-+# tristate
-+ifdef CONFIG_OCFS2_FS
-+ccflags-y += -DOCFS2_SUPER_MAGIC=0x7461636f
-+endif
-+
-+# defined in ${srctree}/fs/ocfs2/dlm/userdlm.h
-+# tristate
-+ifdef CONFIG_OCFS2_FS_O2CB
-+ccflags-y += -DDLMFS_MAGIC=0x76a9f425
-+endif
-+
-+# defined in ${srctree}/fs/cifs/cifsfs.c
-+# tristate
-+ifdef CONFIG_CIFS_FS
-+ccflags-y += -DCIFS_MAGIC_NUMBER=0xFF534D42
-+endif
-+
+# defined in ${srctree}/fs/xfs/xfs_sb.h
+# tristate
+ifdef CONFIG_XFS_FS
+ccflags-y += -DCONFIGFS_MAGIC=0x62656570
+endif
+
-+# defined in ${srctree}/fs/9p/v9fs.h
-+# tristate
-+ifdef CONFIG_9P_FS
-+ccflags-y += -DV9FS_MAGIC=0x01021997
-+endif
-+
+# defined in ${srctree}/fs/ubifs/ubifs.h
+# tristate
+ifdef CONFIG_UBIFS_FS
+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 2015-03-27 21:56:35.460128334 +0100
++++ linux/fs/aufs/Makefile 2015-06-22 08:27:37.874168290 +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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/module.c 2015-06-22 08:27:37.884168534 +0200
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/module.h 2015-06-22 08:27:37.884168534 +0200
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/mvdown.c 2015-06-22 08:27:37.884168534 +0200
@@ -0,0 +1,694 @@
+/*
+ * Copyright (C) 2011-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,1859 @@
++++ linux/fs/aufs/opts.c 2015-06-22 08:29:23.710091096 +0200
+@@ -0,0 +1,1854 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+
+enum {
+ Opt_br,
-+ Opt_add, Opt_del, Opt_mod, Opt_reorder, Opt_append, Opt_prepend,
-+ Opt_idel, Opt_imod, Opt_ireorder,
-+ Opt_dirwh, Opt_rdcache, Opt_rdblk, Opt_rdhash, Opt_rendir,
++ Opt_add, Opt_del, Opt_mod, Opt_append, Opt_prepend,
++ Opt_idel, Opt_imod,
++ Opt_dirwh, Opt_rdcache, Opt_rdblk, Opt_rdhash,
+ Opt_rdblk_def, Opt_rdhash_def,
-+ Opt_xino, Opt_zxino, Opt_noxino,
++ Opt_xino, Opt_noxino,
+ Opt_trunc_xino, Opt_trunc_xino_v, Opt_notrunc_xino,
+ Opt_trunc_xino_path, Opt_itrunc_xino,
+ Opt_trunc_xib, Opt_notrunc_xib,
+ Opt_plink, Opt_noplink, Opt_list_plink,
+ Opt_udba,
+ Opt_dio, Opt_nodio,
-+ /* Opt_lock, Opt_unlock, */
-+ Opt_cmd, Opt_cmd_args,
+ Opt_diropq_a, Opt_diropq_w,
+ Opt_warn_perm, Opt_nowarn_perm,
+ Opt_wbr_copyup, Opt_wbr_create,
+ {Opt_dirperm1, "dirperm1"},
+ {Opt_nodirperm1, "nodirperm1"},
+
-+ {Opt_rendir, "rendir=%d"},
-+
+ {Opt_refrof, "refrof"},
+ {Opt_norefrof, "norefrof"},
+
+ u.xino_itrunc = &opt->xino_itrunc;
+ AuDbg("trunc_xino %d\n", u.xino_itrunc->bindex);
+ break;
-+
+ case Opt_noxino:
+ AuLabel(noxino);
+ break;
+}
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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,213 @@
++++ linux/fs/aufs/opts.h 2015-06-22 08:27:37.887501948 +0200
+@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+#ifdef __KERNEL__
+
+#include <linux/path.h>
-+#include "branch.h"
+
+struct file;
+struct super_block;
+
+/* ---------------------------------------------------------------------- */
+
++/* opts.c */
+void au_optstr_br_perm(au_br_perm_str_t *str, int perm);
+const char *au_optstr_udba(int udba);
+const char *au_optstr_wbr_copyup(int wbr_copyup);
+
+unsigned int au_opt_udba(struct super_block *sb);
+
-+/* ---------------------------------------------------------------------- */
-+
+#endif /* __KERNEL__ */
+#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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/plink.c 2015-06-22 08:27:37.887501948 +0200
@@ -0,0 +1,532 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,55 @@
++++ linux/fs/aufs/poll.c 2015-06-22 08:29:23.710091096 +0200
+@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ unsigned int mask;
+ int err;
+ struct file *h_file;
-+ struct dentry *dentry;
+ struct super_block *sb;
+
+ /* We should pretend an error happened. */
+ mask = POLLERR /* | POLLIN | POLLOUT */;
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
++ sb = file->f_path.dentry->d_sb;
+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
-+ if (unlikely(err))
++
++ h_file = au_read_pre(file, /*keep_fi*/0);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out;
+
+ /* it is not an error if h_file has no operation */
+ mask = DEFAULT_POLLMASK;
-+ h_file = au_hf_top(file);
+ if (h_file->f_op->poll)
+ mask = h_file->f_op->poll(h_file, wait);
-+
-+ di_read_unlock(dentry, AuLock_IR);
-+ fi_read_unlock(file);
++ fput(h_file); /* instead of au_read_post() */
+
+out:
+ si_read_unlock(sb);
+}
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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/posix_acl.c 2015-06-22 08:27:37.887501948 +0200
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2014-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/procfs.c 2015-06-22 08:27:37.887501948 +0200
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2010-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/rdu.c 2015-06-22 08:29:23.710091096 +0200
@@ -0,0 +1,388 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/rwsem.h 2015-06-22 08:27:37.887501948 +0200
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,353 @@
++++ linux/fs/aufs/sbinfo.c 2015-06-22 08:27:37.887501948 +0200
+@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ sbinfo->si_xino_brid = -1;
+ /* leave si_xib_last_pindex and si_xib_next_bit */
+
++ au_sphl_init(&sbinfo->si_aopen);
++
+ sbinfo->si_rdcache = msecs_to_jiffies(AUFS_RDCACHE_DEF * MSEC_PER_SEC);
+ sbinfo->si_rdblk = AUFS_RDBLK_DEF;
+ sbinfo->si_rdhash = AUFS_RDHASH_DEF;
+ sbinfo->si_sb = sb;
+ sb->s_fs_info = sbinfo;
+ si_pid_set(sb);
-+ au_debug_sbinfo_init(sbinfo);
+ return 0; /* success */
+
+out_br:
+}
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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/spl.h 2015-06-22 08:27:37.887501948 +0200
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2005-2015 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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,1009 @@
++++ linux/fs/aufs/super.c 2015-06-22 08:29:23.710091096 +0200
+@@ -0,0 +1,1007 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ */
+
+#include <linux/mm.h>
-+#include <linux/module.h>
+#include <linux/seq_file.h>
+#include <linux/statfs.h>
+#include <linux/vmalloc.h>
-+#include <linux/writeback.h>
+#include "aufs.h"
+
+/*
+};
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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,641 @@
++++ linux/fs/aufs/super.h 2015-06-22 08:27:37.887501948 +0200
+@@ -0,0 +1,638 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ atomic_t si_xigen_next;
+#endif
+
++ /* dirty trick to suppoer atomic_open */
++ struct au_sphlhead si_aopen;
++
+ /* vdir parameters */
+ unsigned long si_rdcache; /* max cache time in jiffies */
+ unsigned int si_rdblk; /* deblk size */
+ */
+ unsigned int si_dirwh;
+
-+ /*
-+ * rename(2) a directory with all children.
-+ */
-+ /* reserved for future use */
-+ /* int si_rendir; */
-+
+ /* pseudo_link list */
+ struct au_sphlhead si_plink[AuPlink_NHASH];
+ wait_queue_head_t si_plink_wq;
+ return locked;
+}
+
-+#if 0 /* unused */
++#if 0 /* reserved */
+static inline int si_read_trylock(struct super_block *sb, int flags)
+{
+ if (au_ftest_lock(flags, FLUSH))
+ __si_read_unlock(sb);
+}
+
-+#if 0 /* unused */
++#if 0 /* reserved */
+static inline int si_write_trylock(struct super_block *sb, int flags)
+{
+ if (au_ftest_lock(flags, FLUSH))
+ __si_write_unlock(sb);
+}
+
-+#if 0 /* unused */
++#if 0 /* reserved */
+static inline void si_downgrade_lock(struct super_block *sb)
+{
+ __si_downgrade_lock(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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/sysaufs.c 2015-06-22 08:27:37.887501948 +0200
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2015 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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/sysaufs.h 2015-06-22 08:27:37.887501948 +0200
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2005-2015 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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/sysfs.c 2015-06-22 08:29:23.710091096 +0200
@@ -0,0 +1,372 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.466795000 +0100
++++ linux/fs/aufs/sysrq.c 2015-06-22 08:27:37.887501948 +0200
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.466795000 +0100
-@@ -0,0 +1,889 @@
++++ linux/fs/aufs/vdir.c 2015-06-22 08:29:23.710091096 +0200
+@@ -0,0 +1,888 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ || au_nhash_test_known_wh(&arg->whlist, name, nlen))
+ goto out; /* already exists or whiteouted */
+
-+ sb = arg->file->f_path.dentry->d_sb;
+ arg->err = au_ino(sb, arg->bindex, h_ino, d_type, &ino);
+ if (!arg->err) {
+ if (unlikely(nlen > AUFS_MAX_NAMELEN))
+}
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 2015-03-27 21:56:35.470128334 +0100
-@@ -0,0 +1,796 @@
++++ linux/fs/aufs/vfsub.c 2015-06-22 08:29:23.710091096 +0200
+@@ -0,0 +1,846 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+ * sub-routines for VFS
+ */
+
-+#include <linux/ima.h>
+#include <linux/namei.h>
+#include <linux/security.h>
+#include <linux/splice.h>
+ return file;
+}
+
++/*
++ * Ideally this function should call VFS:do_last() in order to keep all its
++ * checkings. But it is very hard for aufs to regenerate several VFS internal
++ * structure such as nameidata. This is a second (or third) best approach.
++ * cf. linux/fs/namei.c:do_last(), lookup_open() and atomic_open().
++ */
++int vfsub_atomic_open(struct inode *dir, struct dentry *dentry,
++ struct vfsub_aopen_args *args, struct au_branch *br)
++{
++ int err;
++ struct file *file = args->file;
++ /* copied from linux/fs/namei.c:atomic_open() */
++ struct dentry *const DENTRY_NOT_SET = (void *)-1UL;
++
++ IMustLock(dir);
++ AuDebugOn(!dir->i_op->atomic_open);
++
++ err = au_br_test_oflag(args->open_flag, br);
++ if (unlikely(err))
++ goto out;
++
++ args->file->f_path.dentry = DENTRY_NOT_SET;
++ args->file->f_path.mnt = au_br_mnt(br);
++ err = dir->i_op->atomic_open(dir, dentry, file, args->open_flag,
++ args->create_mode, args->opened);
++ if (err >= 0) {
++ /* some filesystems don't set FILE_CREATED while succeeded? */
++ if (*args->opened & FILE_CREATED)
++ fsnotify_create(dir, dentry);
++ } else
++ goto out;
++
++
++ if (!err) {
++ /* todo: call VFS:may_open() here */
++ err = open_check_o_direct(file);
++ /* todo: ima_file_check() too? */
++ if (!err && (args->open_flag & __FMODE_EXEC))
++ err = deny_write_access(file);
++ if (unlikely(err))
++ /* note that the file is created and still opened */
++ goto out;
++ }
++
++ atomic_inc(&br->br_count);
++ fsnotify_open(file);
++
++out:
++ return err;
++}
++
+int vfsub_kern_path(const char *name, unsigned int flags, struct path *path)
+{
+ int err;
+}
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 2015-03-27 21:56:35.470128334 +0100
-@@ -0,0 +1,301 @@
++++ linux/fs/aufs/vfsub.h 2015-06-22 08:29:23.710091096 +0200
+@@ -0,0 +1,286 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+#ifdef __KERNEL__
+
+#include <linux/fs.h>
-+#include <linux/lglock.h>
+#include <linux/mount.h>
+#include <linux/xattr.h>
+#include "debug.h"
+/* todo: BAD approach!! */
+extern void __mnt_drop_write(struct vfsmount *);
+extern spinlock_t inode_sb_list_lock;
++extern int open_check_o_direct(struct file *f);
+
+/* ---------------------------------------------------------------------- */
+
+int vfsub_update_h_iattr(struct path *h_path, int *did);
+struct file *vfsub_dentry_open(struct path *path, int flags);
+struct file *vfsub_filp_open(const char *path, int oflags, int mode);
++struct vfsub_aopen_args {
++ struct file *file;
++ unsigned int open_flag;
++ umode_t create_mode;
++ int *opened;
++};
++struct au_branch;
++int vfsub_atomic_open(struct inode *dir, struct dentry *dentry,
++ struct vfsub_aopen_args *args, struct au_branch *br);
+int vfsub_kern_path(const char *name, unsigned int flags, struct path *path);
+
+struct dentry *vfsub_lookup_one_len(const char *name, struct dentry *parent,
+ lockdep_on();
+}
+
++#if 0 /* reserved */
+static inline void vfsub_mnt_drop_write_file(struct file *file)
+{
+ lockdep_off();
+ mnt_drop_write_file(file);
+ lockdep_on();
+}
++#endif
+
+/* ---------------------------------------------------------------------- */
+
+ return flags;
+}
+
++#if 0 /* reserved */
+static inline void vfsub_file_accessed(struct file *h_file)
+{
+ file_accessed(h_file);
+ vfsub_update_h_iattr(&h_file->f_path, /*did*/NULL); /*ignore*/
+}
++#endif
+
+static inline void vfsub_touch_atime(struct vfsmount *h_mnt,
+ struct dentry *h_dentry)
+static inline int vfsub_update_time(struct inode *h_inode, struct timespec *ts,
+ int flags)
+{
-+ return update_time(h_inode, ts, flags);
++ return generic_update_time(h_inode, ts, flags);
+ /* no vfsub_update_h_iattr() since we don't have struct path */
+}
+
+
+/* ---------------------------------------------------------------------- */
+
-+/* dirty workaround for strict type of fmode_t */
-+union vfsub_fmu {
-+ fmode_t fm;
-+ unsigned int ui;
-+};
-+
-+static inline unsigned int vfsub_fmode_to_uint(fmode_t fm)
-+{
-+ union vfsub_fmu u = {
-+ .fm = fm
-+ };
-+
-+ BUILD_BUG_ON(sizeof(u.fm) != sizeof(u.ui));
-+
-+ return u.ui;
-+}
-+
-+static inline fmode_t vfsub_uint_to_fmode(unsigned int ui)
-+{
-+ union vfsub_fmu u = {
-+ .ui = ui
-+ };
-+
-+ return u.fm;
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
+int vfsub_sio_mkdir(struct inode *dir, struct path *path, int mode);
+int vfsub_sio_rmdir(struct inode *dir, struct path *path);
+int vfsub_sio_notify_change(struct path *path, struct iattr *ia,
+#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 2015-03-27 21:56:35.470128334 +0100
++++ linux/fs/aufs/wbr_policy.c 2015-06-22 08:27:37.887501948 +0200
@@ -0,0 +1,765 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+};
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 2015-03-27 21:56:35.470128334 +0100
++++ linux/fs/aufs/whout.c 2015-06-22 08:29:23.710091096 +0200
@@ -0,0 +1,1064 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ goto out_wh; /* success */
+
+ err = 1;
-+ if (S_ISREG(wh_dentry->d_inode->i_mode))
++ if (d_is_reg(wh_dentry))
+ goto out_wh; /* success */
+
+ err = -EIO;
+ err = PTR_ERR(h_path.dentry);
+ else {
+ if (h_path.dentry->d_inode
-+ && S_ISREG(h_path.dentry->d_inode->i_mode))
++ && d_is_reg(h_path.dentry))
+ err = do_unlink_wh(h_parent->d_inode, &h_path);
+ dput(h_path.dentry);
+ }
+ if (!base[AuBrWh_BASE].dentry->d_inode) {
+ h_path->dentry = base[AuBrWh_BASE].dentry;
+ err = vfsub_create(h_dir, h_path, WH_MASK, /*want_excl*/true);
-+ } else if (S_ISREG(base[AuBrWh_BASE].dentry->d_inode->i_mode))
++ } else if (d_is_reg(base[AuBrWh_BASE].dentry))
+ err = 0;
+ else
+ pr_err("unknown %pd2 exists\n", base[AuBrWh_BASE].dentry);
+}
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 2015-03-27 21:56:35.470128334 +0100
++++ linux/fs/aufs/whout.h 2015-06-22 08:27:37.890835363 +0200
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+
+/* whout.c */
+int au_wh_name_alloc(struct qstr *wh, const struct qstr *name);
-+struct au_branch;
+int au_wh_test(struct dentry *h_parent, struct qstr *wh_name, int try_sio);
+int au_diropq_test(struct dentry *h_dentry);
++struct au_branch;
+struct dentry *au_whtmp_lkup(struct dentry *h_parent, struct au_branch *br,
+ struct qstr *prefix);
+int au_whtmp_ren(struct dentry *h_dentry, struct au_branch *br);
+#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 2015-03-27 21:56:35.470128334 +0100
++++ linux/fs/aufs/wkq.c 2015-06-22 08:27:37.890835363 +0200
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+}
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 2015-03-27 21:56:35.470128334 +0100
++++ linux/fs/aufs/wkq.h 2015-06-22 08:27:37.890835363 +0200
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+#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 2015-03-27 21:56:35.470128334 +0100
-@@ -0,0 +1,334 @@
++++ linux/fs/aufs/xattr.c 2015-06-22 08:27:37.890835363 +0200
+@@ -0,0 +1,344 @@
+/*
+ * Copyright (C) 2014-2015 Junjiro R. Okajima
+ *
+static const int au_xattr_out_of_list = AuBrAttr_ICEX_OTH << 1;
+
+static int au_do_cpup_xattr(struct dentry *h_dst, struct dentry *h_src,
-+ char *name, char **buf, unsigned int ignore_flags)
++ char *name, char **buf, unsigned int ignore_flags,
++ unsigned int verbose)
+{
+ int err;
+ ssize_t ssz;
+ ssz = vfs_getxattr_alloc(h_src, name, buf, 0, GFP_NOFS);
+ err = ssz;
+ if (unlikely(err <= 0)) {
-+ AuTraceErr(err);
+ if (err == -ENODATA
+ || (err == -EOPNOTSUPP
-+ && (ignore_flags & au_xattr_out_of_list)))
++ && ((ignore_flags & au_xattr_out_of_list)
++ || (au_test_nfs_noacl(h_src->d_inode)
++ && (!strcmp(name, XATTR_NAME_POSIX_ACL_ACCESS)
++ || !strcmp(name,
++ XATTR_NAME_POSIX_ACL_DEFAULT))))
++ ))
+ err = 0;
++ if (err && (verbose || au_debug_test()))
++ pr_err("%s, err %d\n", name, err);
+ goto out;
+ }
+
+ err = vfsub_setxattr(h_dst, name, *buf, ssz, /*flags*/0);
+ mutex_lock_nested(&h_idst->i_mutex, AuLsc_I_CHILD2);
+ if (unlikely(err)) {
-+ AuDbg("%s, err %d\n", name, err);
++ if (verbose || au_debug_test())
++ pr_err("%s, err %d\n", name, err);
+ err = au_xattr_ignore(err, name, ignore_flags);
+ }
+
+ return err;
+}
+
-+int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags)
++int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags,
++ unsigned int verbose)
+{
+ int err, unlocked, acl_access, acl_default;
+ ssize_t ssz;
+ char *value, *p, *o, *e;
+
+ /* try stopping to update the source inode while we are referencing */
-+ /* there should not be the parent-child relation ship between them */
++ /* there should not be the parent-child relationship between them */
+ h_isrc = h_src->d_inode;
+ h_idst = h_dst->d_inode;
+ mutex_unlock(&h_idst->i_mutex);
+ acl_default |= !strncmp(p, XATTR_NAME_POSIX_ACL_DEFAULT,
+ sizeof(XATTR_NAME_POSIX_ACL_DEFAULT)
+ - 1);
-+ err = au_do_cpup_xattr(h_dst, h_src, p, &value, ignore_flags);
++ err = au_do_cpup_xattr(h_dst, h_src, p, &value, ignore_flags,
++ verbose);
+ p += strlen(p) + 1;
+ }
+ AuTraceErr(err);
+ if (!err && !acl_access) {
+ err = au_do_cpup_xattr(h_dst, h_src,
+ XATTR_NAME_POSIX_ACL_ACCESS, &value,
-+ ignore_flags);
++ ignore_flags, verbose);
+ AuTraceErr(err);
+ }
+ if (!err && !acl_default) {
+ err = au_do_cpup_xattr(h_dst, h_src,
+ XATTR_NAME_POSIX_ACL_DEFAULT, &value,
-+ ignore_flags);
++ ignore_flags, verbose);
+ AuTraceErr(err);
+ }
+
+#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 2015-03-27 21:56:35.470128334 +0100
-@@ -0,0 +1,1318 @@
++++ linux/fs/aufs/xino.c 2015-06-22 08:29:23.710091096 +0200
+@@ -0,0 +1,1322 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+ *
+{
+ struct file *file;
+ struct dentry *h_parent, *d;
-+ struct inode *h_dir;
++ struct inode *h_dir, *inode;
+ int err;
+
+ /*
+ }
+
+ /* keep file count */
++ err = 0;
++ inode = file_inode(file);
+ h_parent = dget_parent(file->f_path.dentry);
+ h_dir = h_parent->d_inode;
+ mutex_lock_nested(&h_dir->i_mutex, AuLsc_I_PARENT);
+ /* mnt_want_write() is unnecessary here */
+ /* no delegation since it is just created */
-+ err = vfsub_unlink(h_dir, &file->f_path, /*delegated*/NULL, /*force*/0);
++ if (inode->i_nlink)
++ err = vfsub_unlink(h_dir, &file->f_path, /*delegated*/NULL,
++ /*force*/0);
+ mutex_unlock(&h_dir->i_mutex);
+ dput(h_parent);
+ if (unlikely(err)) {
+}
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 2015-03-27 21:56:35.470128334 +0100
++++ linux/include/uapi/linux/aufs_type.h 2015-06-22 08:29:23.710091096 +0200
@@ -0,0 +1,419 @@
+/*
+ * Copyright (C) 2005-2015 Junjiro R. Okajima
+
+#include <linux/limits.h>
+
-+#define AUFS_VERSION "3.19-20150323"
++#define AUFS_VERSION "3.x-rcN-20150622"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
+ "+" AUFS_BRATTR_COO_REG \
+ "+" AUFS_BRATTR_FHSM \
+ "+" AUFS_BRATTR_UNPIN \
-+ "+" AUFS_BRATTR_ICEX_SEC \
-+ "+" AUFS_BRATTR_ICEX_SYS \
-+ "+" AUFS_BRATTR_ICEX_USR \
-+ "+" AUFS_BRATTR_ICEX_OTH \
++ "+" AUFS_BRATTR_ICEX_SEC \
++ "+" AUFS_BRATTR_ICEX_SYS \
++ "+" AUFS_BRATTR_ICEX_USR \
++ "+" AUFS_BRATTR_ICEX_OTH \
+ "+" AUFS_BRWATTR_NLWH)
+
+typedef struct {
+#define AUFS_CTL_FHSM_FD _IOW(AuCtlType, AuCtl_FHSM_FD, int)
+
+#endif /* __AUFS_TYPE_H__ */
-aufs3.19 loopback patch
-
-diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 30efd68..2a9b789 100644
---- a/drivers/block/loop.c
-+++ b/drivers/block/loop.c
-@@ -514,7 +514,7 @@ out:
- }
-
- struct switch_request {
-- struct file *file;
-+ struct file *file, *virt_file;
- struct completion wait;
- };
-
-@@ -576,7 +576,8 @@ static int loop_thread(void *data)
- * 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.
- */
--static int loop_switch(struct loop_device *lo, struct file *file)
-+static int loop_switch(struct loop_device *lo, struct file *file,
-+ struct file *virt_file)
- {
- struct switch_request w;
- struct bio *bio = bio_alloc(GFP_KERNEL, 0);
-@@ -584,6 +585,7 @@ static int loop_switch(struct loop_device *lo, struct file *file)
- return -ENOMEM;
- init_completion(&w.wait);
- w.file = file;
-+ w.virt_file = virt_file;
- bio->bi_private = &w;
- bio->bi_bdev = NULL;
- loop_make_request(lo->lo_queue, bio);
-@@ -600,7 +602,7 @@ static int loop_flush(struct loop_device *lo)
- if (!lo->lo_thread)
- return 0;
-
-- return loop_switch(lo, NULL);
-+ return loop_switch(lo, NULL, NULL);
- }
-
- /*
-@@ -619,6 +621,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_backing_virt_file = p->virt_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);
-@@ -627,6 +630,13 @@ out:
- complete(&p->wait);
- }
-
-+static struct file *loop_real_file(struct file *file)
-+{
-+ struct file *f = NULL;
-+ if (file->f_path.dentry->d_sb->s_op->real_loop)
-+ f = file->f_path.dentry->d_sb->s_op->real_loop(file);
-+ return f;
-+}
-
- /*
- * loop_change_fd switched the backing store of a loopback device to
-@@ -640,6 +650,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- unsigned int arg)
- {
- struct file *file, *old_file;
-+ struct file *f, *virt_file = NULL, *old_virt_file;
- struct inode *inode;
- int error;
-
-@@ -656,9 +667,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- file = fget(arg);
- if (!file)
- goto out;
-+ f = loop_real_file(file);
-+ if (f) {
-+ virt_file = file;
-+ file = f;
-+ get_file(file);
-+ }
-
- inode = file->f_mapping->host;
- old_file = lo->lo_backing_file;
-+ old_virt_file = lo->lo_backing_virt_file;
-
- error = -EINVAL;
-
-@@ -670,17 +688,21 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- goto out_putf;
-
- /* and ... switch */
-- error = loop_switch(lo, file);
-+ error = loop_switch(lo, file, virt_file);
- if (error)
- goto out_putf;
-
- fput(old_file);
-+ if (old_virt_file)
-+ fput(old_virt_file);
- if (lo->lo_flags & LO_FLAGS_PARTSCAN)
- ioctl_by_bdev(bdev, BLKRRPART, 0);
- return 0;
-
- out_putf:
- fput(file);
-+ if (virt_file)
-+ fput(virt_file);
- out:
- return error;
- }
-@@ -841,7 +863,7 @@ static void loop_config_discard(struct loop_device *lo)
- static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- struct block_device *bdev, unsigned int arg)
- {
-- struct file *file, *f;
-+ struct file *file, *f, *virt_file = NULL;
- struct inode *inode;
- struct address_space *mapping;
- unsigned lo_blocksize;
-@@ -856,6 +878,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- file = fget(arg);
- if (!file)
- goto out;
-+ f = loop_real_file(file);
-+ if (f) {
-+ virt_file = file;
-+ file = f;
-+ get_file(file);
-+ }
-
- error = -EBUSY;
- if (lo->lo_state != Lo_unbound)
-@@ -904,6 +932,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->lo_backing_virt_file = virt_file;
- lo->transfer = transfer_none;
- lo->ioctl = NULL;
- lo->lo_sizelimit = 0;
-@@ -948,6 +977,7 @@ out_clr:
- lo->lo_thread = NULL;
- lo->lo_device = NULL;
- lo->lo_backing_file = NULL;
-+ lo->lo_backing_virt_file = NULL;
- lo->lo_flags = 0;
- set_capacity(lo->lo_disk, 0);
- invalidate_bdev(bdev);
-@@ -957,6 +987,8 @@ out_clr:
- lo->lo_state = Lo_unbound;
- out_putf:
- fput(file);
-+ if (virt_file)
-+ fput(virt_file);
- out:
- /* This is safe: open() is still holding a reference. */
- module_put(THIS_MODULE);
-@@ -1003,6 +1035,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;
-+ struct file *virt_filp = lo->lo_backing_virt_file;
- gfp_t gfp = lo->old_gfp_mask;
- struct block_device *bdev = lo->lo_device;
-
-@@ -1036,6 +1069,7 @@ static int loop_clr_fd(struct loop_device *lo)
-
- spin_lock_irq(&lo->lo_lock);
- lo->lo_backing_file = NULL;
-+ lo->lo_backing_virt_file = NULL;
- spin_unlock_irq(&lo->lo_lock);
-
- loop_release_xfer(lo);
-@@ -1078,6 +1112,8 @@ static int loop_clr_fd(struct loop_device *lo)
- * bd_mutex which is usually taken before lo_ctl_mutex.
- */
- fput(filp);
-+ if (virt_filp)
-+ fput(virt_filp);
- return 0;
- }
-
-diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index 90df5d6..cb91822 100644
---- a/drivers/block/loop.h
-+++ b/drivers/block/loop.h
-@@ -44,7 +44,7 @@ struct loop_device {
- int (*ioctl)(struct loop_device *, int cmd,
- unsigned long arg);
-
-- struct file * lo_backing_file;
-+ struct file * lo_backing_file, *lo_backing_virt_file;
- struct block_device *lo_device;
- unsigned lo_blocksize;
- void *key_data;
-diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 41c4c4a..6a68365 100644
---- a/fs/aufs/f_op.c
-+++ b/fs/aufs/f_op.c
-@@ -368,7 +368,7 @@ static ssize_t aufs_splice_read(struct file *file, loff_t *ppos,
- err = -EINVAL;
- h_file = au_hf_top(file);
- get_file(h_file);
-- if (au_test_loopback_kthread()) {
-+ if (0 && 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;
-diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
-index 69f7e96..7941063 100644
---- a/fs/aufs/loop.c
-+++ b/fs/aufs/loop.c
-@@ -130,3 +130,19 @@ void au_loopback_fin(void)
- symbol_put(loop_backing_file);
- kfree(au_warn_loopback_array);
- }
-+
-+/* ---------------------------------------------------------------------- */
-+
-+/* support the loopback block device insude aufs */
-+
-+struct file *aufs_real_loop(struct file *file)
-+{
-+ struct file *f;
-+
-+ BUG_ON(!au_test_aufs(file->f_path.dentry->d_sb));
-+ fi_read_lock(file);
-+ f = au_hf_top(file);
-+ fi_read_unlock(file);
-+ AuDebugOn(!f);
-+ return f;
-+}
-diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index 6d9864d..3322557 100644
---- a/fs/aufs/loop.h
-+++ b/fs/aufs/loop.h
-@@ -25,7 +25,11 @@ void au_warn_loopback(struct super_block *h_sb);
-
- int au_loopback_init(void);
- void au_loopback_fin(void);
-+
-+struct file *aufs_real_loop(struct file *file);
- #else
-+AuStub(struct file *, loop_backing_file, return NULL)
-+
- AuStubInt0(au_test_loopback_overlap, struct super_block *sb,
- struct dentry *h_adding)
- AuStubInt0(au_test_loopback_kthread, void)
-@@ -33,6 +37,8 @@ AuStubVoid(au_warn_loopback, struct super_block *h_sb)
-
- AuStubInt0(au_loopback_init, void)
- AuStubVoid(au_loopback_fin, void)
-+
-+AuStub(struct file *, aufs_real_loop, return NULL, struct file *file)
- #endif /* BLK_DEV_LOOP */
-
- #endif /* __KERNEL__ */
-diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 9acda0e..bb80e3b 100644
---- a/fs/aufs/super.c
-+++ b/fs/aufs/super.c
-@@ -812,7 +812,10 @@ static const struct super_operations aufs_sop = {
- .statfs = aufs_statfs,
- .put_super = aufs_put_super,
- .sync_fs = aufs_sync_fs,
-- .remount_fs = aufs_remount_fs
-+ .remount_fs = aufs_remount_fs,
-+#ifdef CONFIG_AUFS_BDEV_LOOP
-+ .real_loop = aufs_real_loop
-+#endif
- };
-
- /* ---------------------------------------------------------------------- */
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index f634198..bfecf84 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -1620,6 +1620,10 @@ struct super_operations {
- int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
- long (*nr_cached_objects)(struct super_block *, int);
- long (*free_cached_objects)(struct super_block *, long, int);
-+#if defined(CONFIG_BLK_DEV_LOOP) || defined(CONFIG_BLK_DEV_LOOP_MODULE)
-+ /* and aufs */
-+ struct file *(*real_loop)(struct file *);
-+#endif
- };
-
- /*
projects / packages / kernel.git / blobdiff