-aufs4.x-rcN kbuild patch
-
-diff --git a/fs/Kconfig b/fs/Kconfig
-index 7aee6d6..ec92031 100644
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -248,6 +248,7 @@ source "fs/pstore/Kconfig"
- source "fs/sysv/Kconfig"
- source "fs/ufs/Kconfig"
- source "fs/exofs/Kconfig"
-+source "fs/aufs/Kconfig"
-
- endif # MISC_FILESYSTEMS
-
-diff --git a/fs/Makefile b/fs/Makefile
-index 7bbaca9..a026491 100644
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -128,3 +128,4 @@ obj-y += exofs/ # Multiple modules
- obj-$(CONFIG_CEPH_FS) += ceph/
- obj-$(CONFIG_PSTORE) += pstore/
- obj-$(CONFIG_EFIVAR_FS) += efivarfs/
-+obj-$(CONFIG_AUFS_FS) += aufs/
-aufs4.x-rcN base patch
-
-diff --git a/MAINTAINERS b/MAINTAINERS
-index af0cb69..d360d2e 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2465,6 +2465,19 @@ F: include/linux/audit.h
- F: include/uapi/linux/audit.h
- F: kernel/audit*
-
-+AUFS (advanced multi layered unification filesystem) FILESYSTEM
-+M: "J. R. Okajima" <hooanon05g@gmail.com>
-+L: linux-unionfs@vger.kernel.org
-+L: aufs-users@lists.sourceforge.net (members only)
-+W: http://aufs.sourceforge.net
-+T: git://github.com/sfjro/aufs4-linux.git
-+S: Supported
-+F: Documentation/filesystems/aufs/
-+F: Documentation/ABI/testing/debugfs-aufs
-+F: Documentation/ABI/testing/sysfs-aufs
-+F: fs/aufs/
-+F: include/uapi/linux/aufs_type.h
+diff -urNp -x '*.orig' linux-4.14/Documentation/ABI/testing/debugfs-aufs linux-4.14/Documentation/ABI/testing/debugfs-aufs
+--- linux-4.14/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/ABI/testing/debugfs-aufs 2021-02-24 21:42:43.437781422 +0100
+@@ -0,0 +1,50 @@
++What: /debug/aufs/si_<id>/
++Date: March 2009
++Contact: J. R. Okajima <hooanon05g@gmail.com>
++Description:
++ Under /debug/aufs, a directory named si_<id> is created
++ per aufs mount, where <id> is a unique id generated
++ internally.
+
- AUXILIARY DISPLAY DRIVERS
- 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 85de673..d44de9d 100644
---- a/drivers/block/loop.c
-+++ b/drivers/block/loop.c
-@@ -686,6 +686,24 @@ static inline int is_loop_device(struct file *file)
- return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
- }
-
-+/*
-+ * for AUFS
-+ * no get/put for file.
-+ */
-+struct file *loop_backing_file(struct super_block *sb)
-+{
-+ struct file *ret;
-+ struct loop_device *l;
++What: /debug/aufs/si_<id>/plink
++Date: Apr 2013
++Contact: J. R. Okajima <hooanon05g@gmail.com>
++Description:
++ It has three lines and shows the information about the
++ pseudo-link. The first line is a single number
++ representing a number of buckets. The second line is a
++ number of pseudo-links per buckets (separated by a
++ blank). The last line is a single number representing a
++ total number of psedo-links.
++ When the aufs mount option 'noplink' is specified, it
++ will show "1\n0\n0\n".
+
-+ ret = NULL;
-+ if (MAJOR(sb->s_dev) == LOOP_MAJOR) {
-+ l = sb->s_bdev->bd_disk->private_data;
-+ ret = l->lo_backing_file;
-+ }
-+ return ret;
-+}
-+EXPORT_SYMBOL_GPL(loop_backing_file);
++What: /debug/aufs/si_<id>/xib
++Date: March 2009
++Contact: J. R. Okajima <hooanon05g@gmail.com>
++Description:
++ It shows the consumed blocks by xib (External Inode Number
++ Bitmap), its block size and file size.
++ When the aufs mount option 'noxino' is specified, it
++ will be empty. About XINO files, see the aufs manual.
+
- /* loop sysfs attributes */
-
- static ssize_t loop_attr_show(struct device *dev, char *page,
-diff --git a/fs/dcache.c b/fs/dcache.c
-index f901413..e3719a5 100644
---- a/fs/dcache.c
-+++ b/fs/dcache.c
-@@ -1197,7 +1197,7 @@ enum d_walk_ret {
- *
- * The @enter() and @finish() callbacks are called with d_lock held.
- */
--static void d_walk(struct dentry *parent, void *data,
-+void d_walk(struct dentry *parent, void *data,
- enum d_walk_ret (*enter)(void *, struct dentry *),
- void (*finish)(void *))
- {
-diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 448a111..f51c2cf 100644
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -31,7 +31,7 @@
-
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
-
--static int setfl(int fd, struct file * filp, unsigned long arg)
-+int setfl(int fd, struct file * filp, unsigned long arg)
- {
- struct inode * inode = file_inode(filp);
- int error = 0;
-@@ -62,6 +62,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
-
- if (filp->f_op->check_flags)
- error = filp->f_op->check_flags(arg);
-+ if (!error && filp->f_op->setfl)
-+ error = filp->f_op->setfl(filp, arg);
- if (error)
- return error;
-
-diff --git a/fs/inode.c b/fs/inode.c
-index d1e35b5..f7800d6 100644
---- a/fs/inode.c
-+++ b/fs/inode.c
-@@ -1655,7 +1655,7 @@ EXPORT_SYMBOL(generic_update_time);
- * This does the actual work of updating an inodes time or version. Must have
- * had called mnt_want_write() before calling this.
- */
--static int update_time(struct inode *inode, struct timespec *time, int flags)
-+int update_time(struct inode *inode, struct timespec *time, int flags)
- {
- int (*update_time)(struct inode *, struct timespec *, int);
-
-diff --git a/fs/namespace.c b/fs/namespace.c
-index d18deb4..e5a4a7f 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -846,6 +846,12 @@ static inline int check_mnt(struct mount *mnt)
- return mnt->mnt_ns == current->nsproxy->mnt_ns;
- }
-
-+/* for aufs, CONFIG_AUFS_BR_FUSE */
-+int is_current_mnt_ns(struct vfsmount *mnt)
-+{
-+ return check_mnt(real_mount(mnt));
-+}
++What: /debug/aufs/si_<id>/xino0, xino1 ... xinoN
++Date: March 2009
++Contact: J. R. Okajima <hooanon05g@gmail.com>
++Description:
++ It shows the consumed blocks by xino (External Inode Number
++ Translation Table), its link count, block size and file
++ size.
++ When the aufs mount option 'noxino' is specified, it
++ will be empty. About XINO files, see the aufs manual.
+
- /*
- * vfsmount lock must be held for write
- */
-diff --git a/fs/read_write.c b/fs/read_write.c
-index f0d4b16..6aa8c7a 100644
---- a/fs/read_write.c
-+++ b/fs/read_write.c
-@@ -483,6 +483,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
- return -EINVAL;
- }
-
-+vfs_readf_t vfs_readf(struct file *file)
-+{
-+ const struct file_operations *fop = file->f_op;
++What: /debug/aufs/si_<id>/xigen
++Date: March 2009
++Contact: J. R. Okajima <hooanon05g@gmail.com>
++Description:
++ It shows the consumed blocks by xigen (External Inode
++ Generation Table), its block size and file size.
++ If CONFIG_AUFS_EXPORT is disabled, this entry will not
++ be created.
++ When the aufs mount option 'noxino' is specified, it
++ will be empty. About XINO files, see the aufs manual.
+diff -urNp -x '*.orig' linux-4.14/Documentation/ABI/testing/sysfs-aufs linux-4.14/Documentation/ABI/testing/sysfs-aufs
+--- linux-4.14/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/ABI/testing/sysfs-aufs 2021-02-24 21:42:43.437781422 +0100
+@@ -0,0 +1,31 @@
++What: /sys/fs/aufs/si_<id>/
++Date: March 2009
++Contact: J. R. Okajima <hooanon05g@gmail.com>
++Description:
++ Under /sys/fs/aufs, a directory named si_<id> is created
++ per aufs mount, where <id> is a unique id generated
++ internally.
+
-+ if (fop->read)
-+ return fop->read;
-+ if (fop->read_iter)
-+ return new_sync_read;
-+ return ERR_PTR(-ENOSYS);
-+}
++What: /sys/fs/aufs/si_<id>/br0, br1 ... brN
++Date: March 2009
++Contact: J. R. Okajima <hooanon05g@gmail.com>
++Description:
++ It shows the abolute path of a member directory (which
++ is called branch) in aufs, and its permission.
+
-+vfs_writef_t vfs_writef(struct file *file)
-+{
-+ const struct file_operations *fop = file->f_op;
++What: /sys/fs/aufs/si_<id>/brid0, brid1 ... bridN
++Date: July 2013
++Contact: J. R. Okajima <hooanon05g@gmail.com>
++Description:
++ It shows the id of a member directory (which is called
++ branch) in aufs.
+
-+ if (fop->write)
-+ return fop->write;
-+ if (fop->write_iter)
-+ return new_sync_write;
-+ return ERR_PTR(-ENOSYS);
-+}
++What: /sys/fs/aufs/si_<id>/xi_path
++Date: March 2009
++Contact: J. R. Okajima <hooanon05g@gmail.com>
++Description:
++ It shows the abolute path of XINO (External Inode Number
++ Bitmap, Translation Table and Generation Table) file
++ even if it is the default path.
++ When the aufs mount option 'noxino' is specified, it
++ will be empty. About XINO files, see the aufs manual.
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/README linux-4.14/Documentation/filesystems/aufs/README
+--- linux-4.14/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/README 2021-02-24 21:42:43.441114748 +0100
+@@ -0,0 +1,393 @@
+
- ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
- {
- mm_segment_t old_fs;
-diff --git a/fs/splice.c b/fs/splice.c
-index f3084cc..eb888c6 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
- /*
- * Attempt to initiate a splice from pipe to file.
- */
--static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-- loff_t *ppos, size_t len, unsigned int flags)
-+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+ loff_t *ppos, size_t len, unsigned int flags)
- {
- ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
- loff_t *, size_t, unsigned int);
-@@ -854,9 +854,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.
- */
--static long do_splice_to(struct file *in, loff_t *ppos,
-- struct pipe_inode_info *pipe, size_t len,
-- unsigned int flags)
-+long do_splice_to(struct file *in, loff_t *ppos,
-+ struct pipe_inode_info *pipe, size_t len,
-+ unsigned int flags)
- {
- ssize_t (*splice_read)(struct file *, loff_t *,
- struct pipe_inode_info *, size_t, unsigned int);
-diff --git a/fs/sync.c b/fs/sync.c
-index a576aa2..eb61780 100644
---- a/fs/sync.c
-+++ b/fs/sync.c
-@@ -27,7 +27,7 @@
- * wait == 1 case since in that case write_inode() functions do
- * sync_dirty_buffer() and thus effectively write one block at a time.
- */
--static int __sync_filesystem(struct super_block *sb, int wait)
-+int __sync_filesystem(struct super_block *sb, int wait)
- {
- if (wait)
- sync_inodes_sb(sb);
-diff --git a/include/linux/file.h b/include/linux/file.h
-index 61eb82c..e700888 100644
---- a/include/linux/file.h
-+++ b/include/linux/file.h
-@@ -19,6 +19,7 @@ struct dentry;
- struct path;
- extern struct file *alloc_file(const struct path *, fmode_t mode,
- const struct file_operations *fop);
-+extern struct file *get_empty_filp(void);
-
- static inline void fput_light(struct file *file, int fput_needed)
- {
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 13dab19..8ab6566 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -1264,6 +1264,7 @@ extern void fasync_free(struct fasync_struct *);
- /* can be called from interrupts */
- extern void kill_fasync(struct fasync_struct **, int, int);
-
-+extern int setfl(int fd, struct file * filp, unsigned long arg);
- extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
- extern int f_setown(struct file *filp, unsigned long arg, int force);
- extern void f_delown(struct file *filp);
-@@ -1710,6 +1711,7 @@ struct file_operations {
- ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
- unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
- int (*check_flags)(int);
-+ int (*setfl)(struct file *, unsigned long);
- int (*flock) (struct file *, int, struct file_lock *);
- ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
- ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
-@@ -1780,6 +1782,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
- struct iovec *fast_pointer,
- struct iovec **ret_pointer);
-
-+typedef ssize_t (*vfs_readf_t)(struct file *, char __user *, size_t, loff_t *);
-+typedef ssize_t (*vfs_writef_t)(struct file *, const char __user *, size_t,
-+ loff_t *);
-+vfs_readf_t vfs_readf(struct file *file);
-+vfs_writef_t vfs_writef(struct file *file);
++Aufs4 -- advanced multi layered unification filesystem version 4.x
++http://aufs.sf.net
++Junjiro R. Okajima
+
- extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
- extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
- extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -2182,6 +2190,7 @@ extern int current_umask(void);
- extern void ihold(struct inode * inode);
- extern void iput(struct inode *);
- extern int generic_update_time(struct inode *, struct timespec *, int);
-+extern int update_time(struct inode *, struct timespec *, int);
-
- /* /sys/fs */
- extern struct kobject *fs_kobj;
-@@ -2462,6 +2471,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
- return false;
- }
- #endif
-+extern int __sync_filesystem(struct super_block *, int);
- extern int sync_filesystem(struct super_block *);
- extern const struct file_operations def_blk_fops;
- extern const struct file_operations def_chr_fops;
-diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index bfa8e0b..728d810 100644
---- a/include/linux/lockdep.h
-+++ b/include/linux/lockdep.h
-@@ -405,6 +405,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
- return lock->key == key;
- }
-
-+struct lock_class *lockdep_hlock_class(struct held_lock *hlock);
+
- /*
- * Acquire a lock.
- *
-@@ -529,6 +531,7 @@ struct lock_class_key { };
-
- #define lockdep_depth(tsk) (0)
-
-+#define lockdep_is_held(lock) (1)
- #define lockdep_is_held_type(l, r) (1)
-
- #define lockdep_assert_held(l) do { (void)(l); } while (0)
-diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
-index 12b2ab5..8b810d1 100644
---- a/include/linux/mnt_namespace.h
-+++ b/include/linux/mnt_namespace.h
-@@ -5,11 +5,14 @@
- struct mnt_namespace;
- struct fs_struct;
- struct user_namespace;
-+struct vfsmount;
-
- extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *,
- struct user_namespace *, struct fs_struct *);
- extern void put_mnt_ns(struct mnt_namespace *ns);
-
-+extern int is_current_mnt_ns(struct vfsmount *mnt);
++0. Introduction
++----------------------------------------
++In the early days, aufs was entirely re-designed and re-implemented
++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
++approaches to aufs1's.
++Unionfs is being developed by Professor Erez Zadok at Stony Brook
++University and his team.
+
- extern const struct file_operations proc_mounts_operations;
- extern const struct file_operations proc_mountinfo_operations;
- extern const struct file_operations proc_mountstats_operations;
-diff --git a/include/linux/splice.h b/include/linux/splice.h
-index db42746..12f3a5a 100644
---- a/include/linux/splice.h
-+++ b/include/linux/splice.h
-@@ -86,4 +86,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
-
- extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
- extern const struct pipe_buf_operations default_pipe_buf_ops;
++Aufs4 supports linux-4.0 and later, and for linux-3.x series try aufs3.
++If you want older kernel version support, try aufs2-2.6.git or
++aufs2-standalone.git repository, aufs1 from CVS on SourceForge.
+
-+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+ loff_t *ppos, size_t len, unsigned int flags);
-+extern long do_splice_to(struct file *in, loff_t *ppos,
-+ struct pipe_inode_info *pipe, size_t len,
-+ unsigned int flags);
- #endif
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index e36e652..bc97a97 100644
---- a/kernel/locking/lockdep.c
-+++ b/kernel/locking/lockdep.c
-@@ -144,7 +144,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
- unsigned long nr_lock_classes;
- static struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
-
--static inline struct lock_class *hlock_class(struct held_lock *hlock)
-+inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
- {
- if (!hlock->class_idx) {
- /*
-@@ -155,6 +155,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
- }
- return lock_classes + hlock->class_idx - 1;
- }
-+#define hlock_class(hlock) lockdep_hlock_class(hlock)
-
- #ifdef CONFIG_LOCK_STAT
- static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
-aufs4.x-rcN mmap patch
-
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index ad3b076..ad4a50d 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -1987,7 +1987,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
- down_read(&mm->mmap_sem);
- vma = find_exact_vma(mm, vm_start, vm_end);
- if (vma && vma->vm_file) {
-- *path = vma->vm_file->f_path;
-+ *path = vma_pr_or_file(vma)->f_path;
- path_get(path);
- rc = 0;
- }
-diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index 7563437..7c0dc0f 100644
---- a/fs/proc/nommu.c
-+++ b/fs/proc/nommu.c
-@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
- file = region->vm_file;
-
- if (file) {
-- struct inode *inode = file_inode(region->vm_file);
-+ struct inode *inode;
++Note: it becomes clear that "Aufs was rejected. Let's give it up."
++ According to Christoph Hellwig, linux rejects all union-type
++ filesystems but UnionMount.
++<http://marc.info/?l=linux-kernel&m=123938533724484&w=2>
+
-+ file = vmr_pr_or_file(region);
-+ inode = file_inode(file);
- dev = inode->i_sb->s_dev;
- ino = inode->i_ino;
- }
-diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 5589b4b..f60aea2 100644
---- a/fs/proc/task_mmu.c
-+++ b/fs/proc/task_mmu.c
-@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
- const char *name = NULL;
-
- if (file) {
-- struct inode *inode = file_inode(vma->vm_file);
-+ struct inode *inode;
++PS. Al Viro seems have a plan to merge aufs as well as overlayfs and
++ UnionMount, and he pointed out an issue around a directory mutex
++ lock and aufs addressed it. But it is still unsure whether aufs will
++ be merged (or any other union solution).
++<http://marc.info/?l=linux-kernel&m=136312705029295&w=1>
+
-+ 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;
-@@ -1734,7 +1737,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 = {
- .hugetlb_entry = gather_hugetlb_stats,
-diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index b00b7660..93e8a86 100644
---- a/fs/proc/task_nommu.c
-+++ b/fs/proc/task_nommu.c
-@@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
- file = vma->vm_file;
-
- if (file) {
-- struct inode *inode = file_inode(vma->vm_file);
-+ struct inode *inode;
+
-+ 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 065d99d..04486c3 100644
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -1348,6 +1348,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
- }
- #endif
-
-+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);
-+extern void vma_do_get_file(struct vm_area_struct *, const char[], int);
-+extern void vma_do_fput(struct vm_area_struct *, const char[], int);
++1. Features
++----------------------------------------
++- unite several directories into a single virtual filesystem. The member
++ directory is called as a branch.
++- you can specify the permission flags to the branch, which are 'readonly',
++ 'readwrite' and 'whiteout-able.'
++- by upper writable branch, internal copyup and whiteout, files/dirs on
++ readonly branch are modifiable logically.
++- dynamic branch manipulation, add, del.
++- etc...
+
-+#define vma_file_update_time(vma) vma_do_file_update_time(vma, __func__, \
-+ __LINE__)
-+#define vma_pr_or_file(vma) vma_do_pr_or_file(vma, __func__, \
-+ __LINE__)
-+#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__)
-+#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__)
++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
++- seekable directory, supporting NFS readdir.
++- whiteout is hardlinked in order to reduce the consumption of inodes
++ on branch
++- do not copyup, nor create a whiteout when it is unnecessary
++- revert a single systemcall when an error occurs in aufs
++- remount interface instead of ioctl
++- maintain /etc/mtab by an external command, /sbin/mount.aufs.
++- loopback mounted filesystem as a branch
++- kernel thread for removing the dir who has a plenty of whiteouts
++- support copyup sparse file (a file which has a 'hole' in it)
++- default permission flags for branches
++- selectable permission flags for ro branch, whether whiteout can
++ exist or not
++- export via NFS.
++- support <sysfs>/fs/aufs and <debugfs>/aufs.
++- support multiple writable branches, some policies to select one
++ among multiple writable branches.
++- a new semantics for link(2) and rename(2) to support multiple
++ writable branches.
++- no glibc changes are required.
++- pseudo hardlink (hardlink over branches)
++- allow a direct access manually to a file on branch, e.g. bypassing aufs.
++ including NFS or remote filesystem branch.
++- userspace wrapper for pathconf(3)/fpathconf(3) with _PC_LINK_MAX.
++- and more...
+
-+#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);
++Currently these features are dropped temporary from aufs4.
++See design/08plan.txt in detail.
++- nested mount, i.e. aufs as readonly no-whiteout branch of another aufs
++ (robr)
++- statistics of aufs thread (/sys/fs/aufs/stat)
+
-+#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 */
++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
++- light version, without branch manipulation. (unnecessary?)
++- copyup in userspace
++- inotify in userspace
++- readv/writev
+
- extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len,
- unsigned int gup_flags);
- extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
-diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 1861ea8..d85a914 100644
---- a/include/linux/mm_types.h
-+++ b/include/linux/mm_types.h
-@@ -260,6 +260,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 */
-+ struct file *vm_prfile; /* the virtual 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
-@@ -334,6 +335,7 @@ struct vm_area_struct {
- unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
- units */
- struct file * vm_file; /* File we map to (can be NULL). */
-+ struct file *vm_prfile; /* shadow of vm_file */
- void * vm_private_data; /* was vm_pte (shared mem) */
-
- atomic_long_t swap_readahead_info;
-diff --git a/kernel/fork.c b/kernel/fork.c
-index 07cc743..b1d2b43 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -676,7 +676,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
- struct inode *inode = file_inode(file);
- struct address_space *mapping = file->f_mapping;
-
-- get_file(file);
-+ vma_get_file(tmp);
- if (tmp->vm_flags & VM_DENYWRITE)
- atomic_dec(&inode->i_writecount);
- i_mmap_lock_write(mapping);
-diff --git a/mm/Makefile b/mm/Makefile
-index e3ac3ae..745b26c 100644
---- a/mm/Makefile
-+++ b/mm/Makefile
-@@ -39,7 +39,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 swap_slots.o \
- interval_tree.o list_lru.o workingset.o \
-- 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 594d73f..7183aef 100644
---- a/mm/filemap.c
-+++ b/mm/filemap.c
-@@ -2590,7 +2590,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
- int ret = VM_FAULT_LOCKED;
-
- sb_start_pagefault(inode->i_sb);
-- file_update_time(vmf->vma->vm_file);
-+ vma_file_update_time(vmf->vma);
- lock_page(page);
- if (page->mapping != inode->i_mapping) {
- unlock_page(page);
-diff --git a/mm/mmap.c b/mm/mmap.c
-index 680506f..081406a 100644
---- a/mm/mmap.c
-+++ b/mm/mmap.c
-@@ -171,7 +171,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)
-- fput(vma->vm_file);
-+ vma_fput(vma);
- mpol_put(vma_policy(vma));
- kmem_cache_free(vm_area_cachep, vma);
- return next;
-@@ -896,7 +896,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
- if (remove_next) {
- if (file) {
- uprobe_munmap(next, next->vm_start, next->vm_end);
-- fput(file);
-+ vma_fput(vma);
- }
- if (next->anon_vma)
- anon_vma_merge(vma, next);
-@@ -1746,8 +1746,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
- return addr;
-
- unmap_and_free_vma:
-+ vma_fput(vma);
- vma->vm_file = NULL;
-- fput(file);
-
- /* Undo any partial mapping done by a device driver. */
- unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2569,7 +2569,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
- goto out_free_mpol;
-
- if (new->vm_file)
-- get_file(new->vm_file);
-+ vma_get_file(new);
-
- if (new->vm_ops && new->vm_ops->open)
- new->vm_ops->open(new);
-@@ -2588,7 +2588,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
- if (new->vm_ops && new->vm_ops->close)
- new->vm_ops->close(new);
- if (new->vm_file)
-- fput(new->vm_file);
-+ vma_fput(new);
- unlink_anon_vmas(new);
- out_free_mpol:
- mpol_put(vma_policy(new));
-@@ -2750,7 +2750,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
- struct vm_area_struct *vma;
- unsigned long populate = 0;
- unsigned long ret = -EINVAL;
-- struct file *file;
-+ struct file *file, *prfile;
-
- pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
- current->comm, current->pid);
-@@ -2825,10 +2825,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
- }
- }
-
-- file = get_file(vma->vm_file);
-+ vma_get_file(vma);
-+ file = vma->vm_file;
-+ prfile = vma->vm_prfile;
- ret = do_mmap_pgoff(vma->vm_file, start, size,
- prot, flags, pgoff, &populate, NULL);
-+ if (!IS_ERR_VALUE(ret) && file && prfile) {
-+ struct vm_area_struct *new_vma;
+
-+ new_vma = find_vma(mm, ret);
-+ if (!new_vma->vm_prfile)
-+ new_vma->vm_prfile = prfile;
-+ if (new_vma != vma)
-+ get_file(prfile);
-+ }
-+ /*
-+ * two fput()s instead of vma_fput(vma),
-+ * coz vma may not be available anymore.
-+ */
- fput(file);
-+ if (prfile)
-+ fput(prfile);
- out:
- up_write(&mm->mmap_sem);
- if (populate)
-@@ -3136,7 +3153,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)
-- get_file(new_vma->vm_file);
-+ vma_get_file(new_vma);
- if (new_vma->vm_ops && new_vma->vm_ops->open)
- new_vma->vm_ops->open(new_vma);
- vma_link(mm, new_vma, prev, rb_link, rb_parent);
-diff --git a/mm/nommu.c b/mm/nommu.c
-index 17c00d9..4bcdf94 100644
---- a/mm/nommu.c
-+++ b/mm/nommu.c
-@@ -641,7 +641,7 @@ static void __put_nommu_region(struct vm_region *region)
- up_write(&nommu_region_sem);
-
- if (region->vm_file)
-- fput(region->vm_file);
-+ vmr_fput(region);
-
- /* IO memory and memory shared directly out of the pagecache
- * from ramfs/tmpfs mustn't be released here */
-@@ -799,7 +799,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
- if (vma->vm_ops && vma->vm_ops->close)
- vma->vm_ops->close(vma);
- if (vma->vm_file)
-- fput(vma->vm_file);
-+ vma_fput(vma);
- put_nommu_region(vma->vm_region);
- kmem_cache_free(vm_area_cachep, vma);
- }
-@@ -1321,7 +1321,7 @@ unsigned long do_mmap(struct file *file,
- goto error_just_free;
- }
- }
-- fput(region->vm_file);
-+ vmr_fput(region);
- kmem_cache_free(vm_region_jar, region);
- region = pregion;
- result = start;
-@@ -1396,10 +1396,10 @@ unsigned long do_mmap(struct file *file,
- up_write(&nommu_region_sem);
- error:
- if (region->vm_file)
-- fput(region->vm_file);
-+ vmr_fput(region);
- kmem_cache_free(vm_region_jar, region);
- if (vma->vm_file)
-- fput(vma->vm_file);
-+ vma_fput(vma);
- kmem_cache_free(vm_area_cachep, vma);
- return ret;
-
-diff --git a/mm/prfile.c b/mm/prfile.c
-new file mode 100644
-index 0000000..1ef053b
---- /dev/null
-+++ b/mm/prfile.c
-@@ -0,0 +1,85 @@
-+/*
-+ * Mainly for aufs which mmap(2) different file and wants to print different
-+ * path in /proc/PID/maps.
-+ * Call these functions via macros defined in linux/mm.h.
-+ *
-+ * See Documentation/filesystems/aufs/design/06mmap.txt
-+ *
-+ * Copyright (c) 2014-2017 Junjro R. Okajima
-+ * Copyright (c) 2014 Ian Campbell
-+ */
++2. Download
++----------------------------------------
++There are three GIT trees for aufs4, aufs4-linux.git,
++aufs4-standalone.git, and aufs-util.git. Note that there is no "4" in
++"aufs-util.git."
++While the aufs-util is always necessary, you need either of aufs4-linux
++or aufs4-standalone.
+
-+#include <linux/mm.h>
-+#include <linux/file.h>
-+#include <linux/fs.h>
++The aufs4-linux tree includes the whole linux mainline GIT tree,
++git://git.kernel.org/.../torvalds/linux.git.
++And you cannot select CONFIG_AUFS_FS=m for this version, eg. you cannot
++build aufs4 as an external kernel module.
++Several extra patches are not included in this tree. Only
++aufs4-standalone tree contains them. They are described in the later
++section "Configuration and Compilation."
+
-+/* #define PRFILE_TRACE */
-+static inline void prfile_trace(struct file *f, struct file *pr,
-+ const char func[], int line, const char func2[])
-+{
-+#ifdef PRFILE_TRACE
-+ if (pr)
-+ pr_info("%s:%d: %s, %pD2\n", func, line, func2, f);
-+#endif
-+}
++On the other hand, the aufs4-standalone tree has only aufs source files
++and necessary patches, and you can select CONFIG_AUFS_FS=m.
++But you need to apply all aufs patches manually.
+
-+void vma_do_file_update_time(struct vm_area_struct *vma, const char func[],
-+ int line)
-+{
-+ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
++You will find GIT branches whose name is in form of "aufs4.x" where "x"
++represents the linux kernel version, "linux-4.x". For instance,
++"aufs4.0" is for linux-4.0. For latest "linux-4.x-rcN", use
++"aufs4.x-rcN" branch.
+
-+ prfile_trace(f, pr, func, line, __func__);
-+ file_update_time(f);
-+ if (f && pr)
-+ file_update_time(pr);
-+}
++o aufs4-linux tree
++$ git clone --reference /your/linux/git/tree \
++ git://github.com/sfjro/aufs4-linux.git aufs4-linux.git
++- if you don't have linux GIT tree, then remove "--reference ..."
++$ cd aufs4-linux.git
++$ git checkout origin/aufs4.0
+
-+struct file *vma_do_pr_or_file(struct vm_area_struct *vma, const char func[],
-+ int line)
-+{
-+ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
++Or You may want to directly git-pull aufs into your linux GIT tree, and
++leave the patch-work to GIT.
++$ cd /your/linux/git/tree
++$ git remote add aufs4 git://github.com/sfjro/aufs4-linux.git
++$ git fetch aufs4
++$ git checkout -b my4.0 v4.0
++$ (add your local change...)
++$ git pull aufs4 aufs4.0
++- now you have v4.0 + your_changes + aufs4.0 in you my4.0 branch.
++- you may need to solve some conflicts between your_changes and
++ aufs4.0. in this case, git-rerere is recommended so that you can
++ solve the similar conflicts automatically when you upgrade to 4.1 or
++ later in the future.
+
-+ prfile_trace(f, pr, func, line, __func__);
-+ return (f && pr) ? pr : f;
-+}
++o aufs4-standalone tree
++$ git clone git://github.com/sfjro/aufs4-standalone.git aufs4-standalone.git
++$ cd aufs4-standalone.git
++$ git checkout origin/aufs4.0
+
-+void vma_do_get_file(struct vm_area_struct *vma, const char func[], int line)
-+{
-+ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
++o aufs-util tree
++$ git clone git://git.code.sf.net/p/aufs/aufs-util aufs-util.git
++- note that the public aufs-util.git is on SourceForge instead of
++ GitHUB.
++$ cd aufs-util.git
++$ git checkout origin/aufs4.0
+
-+ prfile_trace(f, pr, func, line, __func__);
-+ get_file(f);
-+ if (f && pr)
-+ get_file(pr);
-+}
++Note: The 4.x-rcN branch is to be used with `rc' kernel versions ONLY.
++The minor version number, 'x' in '4.x', of aufs may not always
++follow the minor version number of the kernel.
++Because changes in the kernel that cause the use of a new
++minor version number do not always require changes to aufs-util.
+
-+void vma_do_fput(struct vm_area_struct *vma, const char func[], int line)
-+{
-+ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
++Since aufs-util has its own minor version number, you may not be
++able to find a GIT branch in aufs-util for your kernel's
++exact minor version number.
++In this case, you should git-checkout the branch for the
++nearest lower number.
+
-+ prfile_trace(f, pr, func, line, __func__);
-+ fput(f);
-+ if (f && pr)
-+ fput(pr);
-+}
++For (an unreleased) example:
++If you are using "linux-4.10" and the "aufs4.10" branch
++does not exist in aufs-util repository, then "aufs4.9", "aufs4.8"
++or something numerically smaller is the branch for your kernel.
+
-+#ifndef CONFIG_MMU
-+struct file *vmr_do_pr_or_file(struct vm_region *region, const char func[],
-+ int line)
-+{
-+ struct file *f = region->vm_file, *pr = region->vm_prfile;
++Also you can view all branches by
++ $ git branch -a
+
-+ prfile_trace(f, pr, func, line, __func__);
-+ return (f && pr) ? pr : f;
-+}
+
-+void vmr_do_fput(struct vm_region *region, const char func[], int line)
-+{
-+ struct file *f = region->vm_file, *pr = region->vm_prfile;
++3. Configuration and Compilation
++----------------------------------------
++Make sure you have git-checkout'ed the correct branch.
+
-+ prfile_trace(f, pr, func, line, __func__);
-+ fput(f);
-+ if (f && pr)
-+ fput(pr);
-+}
-+#endif /* !CONFIG_MMU */
-aufs4.x-rcN standalone patch
-
-diff --git a/fs/dcache.c b/fs/dcache.c
-index e3719a5..3203470 100644
---- a/fs/dcache.c
-+++ b/fs/dcache.c
-@@ -1305,6 +1305,7 @@ void d_walk(struct dentry *parent, void *data,
- seq = 1;
- goto again;
- }
-+EXPORT_SYMBOL_GPL(d_walk);
-
- struct check_mount {
- struct vfsmount *mnt;
-@@ -2894,6 +2895,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
-
- write_sequnlock(&rename_lock);
- }
-+EXPORT_SYMBOL_GPL(d_exchange);
-
- /**
- * d_ancestor - search for an ancestor
-diff --git a/fs/exec.c b/fs/exec.c
-index 3e14ba2..6818b01 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
- return (path->mnt->mnt_flags & MNT_NOEXEC) ||
- (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
- }
-+EXPORT_SYMBOL_GPL(path_noexec);
-
- #ifdef CONFIG_USELIB
- /*
-diff --git a/fs/fcntl.c b/fs/fcntl.c
-index f51c2cf..58bf222 100644
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -84,6 +84,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
- out:
- return error;
- }
-+EXPORT_SYMBOL_GPL(setfl);
-
- static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
- int force)
-diff --git a/fs/file_table.c b/fs/file_table.c
-index 61517f5..c6bab39c 100644
---- a/fs/file_table.c
-+++ b/fs/file_table.c
-@@ -148,6 +148,7 @@ struct file *get_empty_filp(void)
- }
- return ERR_PTR(-ENFILE);
- }
-+EXPORT_SYMBOL_GPL(get_empty_filp);
-
- /**
- * alloc_file - allocate and initialize a 'struct file'
-@@ -258,6 +259,7 @@ void flush_delayed_fput(void)
- {
- delayed_fput(NULL);
- }
-+EXPORT_SYMBOL_GPL(flush_delayed_fput);
-
- static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
-
-@@ -300,6 +302,7 @@ void __fput_sync(struct file *file)
- }
-
- EXPORT_SYMBOL(fput);
-+EXPORT_SYMBOL_GPL(__fput_sync);
-
- void put_filp(struct file *file)
- {
-@@ -308,6 +311,7 @@ void put_filp(struct file *file)
- file_free(file);
- }
- }
-+EXPORT_SYMBOL_GPL(put_filp);
-
- void __init files_init(void)
- {
-diff --git a/fs/inode.c b/fs/inode.c
-index f7800d6..f31a6c7 100644
---- a/fs/inode.c
-+++ b/fs/inode.c
-@@ -1664,6 +1664,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
-
- return update_time(inode, time, flags);
- }
-+EXPORT_SYMBOL_GPL(update_time);
-
- /**
- * touch_atime - update the access time
-diff --git a/fs/namespace.c b/fs/namespace.c
-index e5a4a7f..6d0c376 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
- mnt_dec_writers(real_mount(mnt));
- preempt_enable();
- }
-+EXPORT_SYMBOL_GPL(__mnt_drop_write);
-
- /**
- * mnt_drop_write - give up write access to a mount
-@@ -851,6 +852,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
- {
- return check_mnt(real_mount(mnt));
- }
-+EXPORT_SYMBOL_GPL(is_current_mnt_ns);
-
- /*
- * vfsmount lock must be held for write
-@@ -1887,6 +1889,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
- }
- return 0;
- }
-+EXPORT_SYMBOL_GPL(iterate_mounts);
-
- static void cleanup_group_ids(struct mount *mnt, struct mount *end)
- {
-diff --git a/fs/notify/group.c b/fs/notify/group.c
-index 3235753..14a2d48 100644
---- a/fs/notify/group.c
-+++ b/fs/notify/group.c
-@@ -22,6 +22,7 @@
- #include <linux/srcu.h>
- #include <linux/rculist.h>
- #include <linux/wait.h>
-+#include <linux/module.h>
-
- #include <linux/fsnotify_backend.h>
- #include "fsnotify.h"
-@@ -109,6 +110,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
- {
- atomic_inc(&group->refcnt);
- }
-+EXPORT_SYMBOL_GPL(fsnotify_get_group);
-
- /*
- * Drop a reference to a group. Free it if it's through.
-@@ -118,6 +120,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
- if (atomic_dec_and_test(&group->refcnt))
- fsnotify_final_destroy_group(group);
- }
-+EXPORT_SYMBOL_GPL(fsnotify_put_group);
-
- /*
- * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -147,6 +150,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
-
- return group;
- }
-+EXPORT_SYMBOL_GPL(fsnotify_alloc_group);
-
- int fsnotify_fasync(int fd, struct file *file, int on)
- {
-diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 9991f88..117042c 100644
---- a/fs/notify/mark.c
-+++ b/fs/notify/mark.c
-@@ -118,6 +118,7 @@ static bool fsnotify_get_mark_safe(struct fsnotify_mark *mark)
- {
- return atomic_inc_not_zero(&mark->refcnt);
- }
-+EXPORT_SYMBOL_GPL(fsnotify_put_mark);
-
- static void __fsnotify_recalc_mask(struct fsnotify_mark_connector *conn)
- {
-@@ -395,6 +396,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
- mutex_unlock(&group->mark_mutex);
- fsnotify_free_mark(mark);
- }
-+EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
-
- /*
- * Sorting function for lists of fsnotify marks.
-@@ -607,6 +609,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark, struct inode *inode,
- fsnotify_put_mark(mark);
- return ret;
- }
-+EXPORT_SYMBOL_GPL(fsnotify_add_mark);
-
- int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
- struct vfsmount *mnt, int allow_dups)
-@@ -742,6 +745,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
- fsnotify_get_group(group);
- mark->group = group;
- }
-+EXPORT_SYMBOL_GPL(fsnotify_init_mark);
-
- /*
- * Destroy all marks in destroy_list, waits for SRCU period to finish before
-diff --git a/fs/open.c b/fs/open.c
-index 7ea1184..6e2e241 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
- inode_unlock(dentry->d_inode);
- return ret;
- }
-+EXPORT_SYMBOL_GPL(do_truncate);
-
- long vfs_truncate(const struct path *path, loff_t length)
- {
-@@ -691,6 +692,7 @@ int open_check_o_direct(struct file *f)
- }
- return 0;
- }
-+EXPORT_SYMBOL_GPL(open_check_o_direct);
-
- static int do_dentry_open(struct file *f,
- struct inode *inode,
-diff --git a/fs/read_write.c b/fs/read_write.c
-index 6aa8c7a..b5d392e 100644
---- a/fs/read_write.c
-+++ b/fs/read_write.c
-@@ -453,6 +453,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
-
- return ret;
- }
-+EXPORT_SYMBOL_GPL(vfs_read);
-
- static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
- {
-@@ -493,6 +494,7 @@ vfs_readf_t vfs_readf(struct file *file)
- return new_sync_read;
- return ERR_PTR(-ENOSYS);
- }
-+EXPORT_SYMBOL_GPL(vfs_readf);
-
- vfs_writef_t vfs_writef(struct file *file)
- {
-@@ -504,6 +506,7 @@ vfs_writef_t vfs_writef(struct file *file)
- return new_sync_write;
- return ERR_PTR(-ENOSYS);
- }
-+EXPORT_SYMBOL_GPL(vfs_writef);
-
- ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
- {
-@@ -573,6 +576,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
-
- return ret;
- }
-+EXPORT_SYMBOL_GPL(vfs_write);
-
- static inline loff_t file_pos_read(struct file *file)
- {
-diff --git a/fs/splice.c b/fs/splice.c
-index eb888c6..7ab89d2 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -850,6 +850,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-
- return splice_write(pipe, out, ppos, len, flags);
- }
-+EXPORT_SYMBOL_GPL(do_splice_from);
-
- /*
- * Attempt to initiate a splice from a file to a pipe.
-@@ -879,6 +880,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
-
- return splice_read(in, ppos, pipe, len, flags);
- }
-+EXPORT_SYMBOL_GPL(do_splice_to);
-
- /**
- * splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/fs/sync.c b/fs/sync.c
-index eb61780..32c5a05 100644
---- a/fs/sync.c
-+++ b/fs/sync.c
-@@ -38,6 +38,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
- sb->s_op->sync_fs(sb, wait);
- return __sync_blockdev(sb->s_bdev, wait);
- }
-+EXPORT_SYMBOL_GPL(__sync_filesystem);
-
- /*
- * Write out and wait upon all dirty data associated with this
-diff --git a/fs/xattr.c b/fs/xattr.c
-index 61cd28b..35570cd 100644
---- a/fs/xattr.c
-+++ b/fs/xattr.c
-@@ -297,6 +297,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
- *xattr_value = value;
- return error;
- }
-+EXPORT_SYMBOL_GPL(vfs_getxattr_alloc);
-
- ssize_t
- __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index bc97a97..895a1ba 100644
---- a/kernel/locking/lockdep.c
-+++ b/kernel/locking/lockdep.c
-@@ -155,6 +155,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
- }
- return lock_classes + hlock->class_idx - 1;
- }
-+EXPORT_SYMBOL_GPL(lockdep_hlock_class);
- #define hlock_class(hlock) lockdep_hlock_class(hlock)
-
- #ifdef CONFIG_LOCK_STAT
-diff --git a/kernel/task_work.c b/kernel/task_work.c
-index 836a72a..aa00d49 100644
---- a/kernel/task_work.c
-+++ b/kernel/task_work.c
-@@ -115,3 +115,4 @@ void task_work_run(void)
- } while (work);
- }
- }
-+EXPORT_SYMBOL_GPL(task_work_run);
-diff --git a/security/commoncap.c b/security/commoncap.c
-index fc46f5b..90543ef 100644
---- a/security/commoncap.c
-+++ b/security/commoncap.c
-@@ -1270,12 +1270,14 @@ int cap_mmap_addr(unsigned long addr)
- }
- return ret;
- }
-+EXPORT_SYMBOL_GPL(cap_mmap_addr);
-
- int cap_mmap_file(struct file *file, unsigned long reqprot,
- unsigned long prot, unsigned long flags)
- {
- return 0;
- }
-+EXPORT_SYMBOL_GPL(cap_mmap_file);
-
- #ifdef CONFIG_SECURITY
-
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 03c1652..f88c84b 100644
---- a/security/device_cgroup.c
-+++ b/security/device_cgroup.c
-@@ -7,6 +7,7 @@
- #include <linux/device_cgroup.h>
- #include <linux/cgroup.h>
- #include <linux/ctype.h>
-+#include <linux/export.h>
- #include <linux/list.h>
- #include <linux/uaccess.h>
- #include <linux/seq_file.h>
-@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask)
- return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
- access);
- }
-+EXPORT_SYMBOL_GPL(__devcgroup_inode_permission);
-
- int devcgroup_inode_mknod(int mode, dev_t dev)
- {
-diff --git a/security/security.c b/security/security.c
-index 4bf0f57..b30d1e1 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -530,6 +530,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
- return 0;
- return call_int_hook(path_rmdir, 0, dir, dentry);
- }
-+EXPORT_SYMBOL_GPL(security_path_rmdir);
-
- int security_path_unlink(const struct path *dir, struct dentry *dentry)
- {
-@@ -546,6 +547,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
- return 0;
- return call_int_hook(path_symlink, 0, dir, dentry, old_name);
- }
-+EXPORT_SYMBOL_GPL(security_path_symlink);
-
- int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
- struct dentry *new_dentry)
-@@ -554,6 +556,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
- return 0;
- return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
- }
-+EXPORT_SYMBOL_GPL(security_path_link);
-
- int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
- const struct path *new_dir, struct dentry *new_dentry,
-@@ -581,6 +584,7 @@ int security_path_truncate(const struct path *path)
- return 0;
- return call_int_hook(path_truncate, 0, path);
- }
-+EXPORT_SYMBOL_GPL(security_path_truncate);
-
- int security_path_chmod(const struct path *path, umode_t mode)
- {
-@@ -588,6 +592,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
- return 0;
- return call_int_hook(path_chmod, 0, path, mode);
- }
-+EXPORT_SYMBOL_GPL(security_path_chmod);
-
- int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
- {
-@@ -595,6 +600,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
- return 0;
- return call_int_hook(path_chown, 0, path, uid, gid);
- }
-+EXPORT_SYMBOL_GPL(security_path_chown);
-
- int security_path_chroot(const struct path *path)
- {
-@@ -680,6 +686,7 @@ int security_inode_readlink(struct dentry *dentry)
- return 0;
- return call_int_hook(inode_readlink, 0, dentry);
- }
-+EXPORT_SYMBOL_GPL(security_inode_readlink);
-
- int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
- bool rcu)
-@@ -695,6 +702,7 @@ int security_inode_permission(struct inode *inode, int mask)
- return 0;
- return call_int_hook(inode_permission, 0, inode, mask);
- }
-+EXPORT_SYMBOL_GPL(security_inode_permission);
-
- int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
- {
-@@ -866,6 +874,7 @@ int security_file_permission(struct file *file, int mask)
-
- return fsnotify_perm(file, mask);
- }
-+EXPORT_SYMBOL_GPL(security_file_permission);
-
- int security_file_alloc(struct file *file)
- {
-@@ -925,6 +934,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
- return ret;
- return ima_file_mmap(file, prot);
- }
-+EXPORT_SYMBOL_GPL(security_mmap_file);
-
- int security_mmap_addr(unsigned long addr)
- {
-diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs
---- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/debugfs-aufs 2017-07-29 12:14:25.893041746 +0200
-@@ -0,0 +1,50 @@
-+What: /debug/aufs/si_<id>/
-+Date: March 2009
-+Contact: J. R. Okajima <hooanon05g@gmail.com>
-+Description:
-+ Under /debug/aufs, a directory named si_<id> is created
-+ per aufs mount, where <id> is a unique id generated
-+ internally.
++For aufs4-linux tree,
++- enable CONFIG_AUFS_FS.
++- set other aufs configurations if necessary.
++
++For aufs4-standalone tree,
++There are several ways to build.
++
++1.
++- apply ./aufs4-kbuild.patch to your kernel source files.
++- apply ./aufs4-base.patch too.
++- apply ./aufs4-mmap.patch too.
++- apply ./aufs4-standalone.patch too, if you have a plan to set
++ CONFIG_AUFS_FS=m. otherwise you don't need ./aufs4-standalone.patch.
++- copy ./{Documentation,fs,include/uapi/linux/aufs_type.h} files to your
++ kernel source tree. Never copy $PWD/include/uapi/linux/Kbuild.
++- enable CONFIG_AUFS_FS, you can select either
++ =m or =y.
++- and build your kernel as usual.
++- install the built kernel.
++ Note: Since linux-3.9, every filesystem module requires an alias
++ "fs-<fsname>". You should make sure that "fs-aufs" is listed in your
++ modules.aliases file if you set CONFIG_AUFS_FS=m.
++- install the header files too by "make headers_install" to the
++ directory where you specify. By default, it is $PWD/usr.
++ "make help" shows a brief note for headers_install.
++- and reboot your system.
+
-+What: /debug/aufs/si_<id>/plink
-+Date: Apr 2013
-+Contact: J. R. Okajima <hooanon05g@gmail.com>
-+Description:
-+ It has three lines and shows the information about the
-+ pseudo-link. The first line is a single number
-+ representing a number of buckets. The second line is a
-+ number of pseudo-links per buckets (separated by a
-+ blank). The last line is a single number representing a
-+ total number of psedo-links.
-+ When the aufs mount option 'noplink' is specified, it
-+ will show "1\n0\n0\n".
++2.
++- module only (CONFIG_AUFS_FS=m).
++- apply ./aufs4-base.patch to your kernel source files.
++- apply ./aufs4-mmap.patch too.
++- apply ./aufs4-standalone.patch too.
++- build your kernel, don't forget "make headers_install", and reboot.
++- edit ./config.mk and set other aufs configurations if necessary.
++ Note: You should read $PWD/fs/aufs/Kconfig carefully which describes
++ every aufs configurations.
++- build the module by simple "make".
++ Note: Since linux-3.9, every filesystem module requires an alias
++ "fs-<fsname>". You should make sure that "fs-aufs" is listed in your
++ modules.aliases file.
++- you can specify ${KDIR} make variable which points to your kernel
++ source tree.
++- install the files
++ + run "make install" to install the aufs module, or copy the built
++ $PWD/aufs.ko to /lib/modules/... and run depmod -a (or reboot simply).
++ + run "make install_headers" (instead of headers_install) to install
++ the modified aufs header file (you can specify DESTDIR which is
++ available in aufs standalone version's Makefile only), or copy
++ $PWD/usr/include/linux/aufs_type.h to /usr/include/linux or wherever
++ you like manually. By default, the target directory is $PWD/usr.
++- no need to apply aufs4-kbuild.patch, nor copying source files to your
++ kernel source tree.
+
-+What: /debug/aufs/si_<id>/xib
-+Date: March 2009
-+Contact: J. R. Okajima <hooanon05g@gmail.com>
-+Description:
-+ It shows the consumed blocks by xib (External Inode Number
-+ Bitmap), its block size and file size.
-+ When the aufs mount option 'noxino' is specified, it
-+ will be empty. About XINO files, see the aufs manual.
++Note: The header file aufs_type.h is necessary to build aufs-util
++ as well as "make headers_install" in the kernel source tree.
++ headers_install is subject to be forgotten, but it is essentially
++ necessary, not only for building aufs-util.
++ You may not meet problems without headers_install in some older
++ version though.
+
-+What: /debug/aufs/si_<id>/xino0, xino1 ... xinoN
-+Date: March 2009
-+Contact: J. R. Okajima <hooanon05g@gmail.com>
-+Description:
-+ It shows the consumed blocks by xino (External Inode Number
-+ Translation Table), its link count, block size and file
-+ size.
-+ When the aufs mount option 'noxino' is specified, it
-+ will be empty. About XINO files, see the aufs manual.
++And then,
++- read README in aufs-util, build and install it
++- note that your distribution may contain an obsoleted version of
++ aufs_type.h in /usr/include/linux or something. When you build aufs
++ utilities, make sure that your compiler refers the correct aufs header
++ file which is built by "make headers_install."
++- if you want to use readdir(3) in userspace or pathconf(3) wrapper,
++ then run "make install_ulib" too. And refer to the aufs manual in
++ detail.
+
-+What: /debug/aufs/si_<id>/xigen
-+Date: March 2009
-+Contact: J. R. Okajima <hooanon05g@gmail.com>
-+Description:
-+ It shows the consumed blocks by xigen (External Inode
-+ Generation Table), its block size and file size.
-+ If CONFIG_AUFS_EXPORT is disabled, this entry will not
-+ be created.
-+ When the aufs mount option 'noxino' is specified, it
-+ will be empty. About XINO files, see the aufs manual.
-diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
---- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs 2017-07-29 12:14:25.893041746 +0200
-@@ -0,0 +1,31 @@
-+What: /sys/fs/aufs/si_<id>/
-+Date: March 2009
-+Contact: J. R. Okajima <hooanon05g@gmail.com>
-+Description:
-+ Under /sys/fs/aufs, a directory named si_<id> is created
-+ per aufs mount, where <id> is a unique id generated
-+ internally.
++There several other patches in aufs4-standalone.git. They are all
++optional. When you meet some problems, they will help you.
++- aufs4-loopback.patch
++ Supports a nested loopback mount in a branch-fs. This patch is
++ unnecessary until aufs produces a message like "you may want to try
++ another patch for loopback file".
++- vfs-ino.patch
++ Modifies a system global kernel internal function get_next_ino() in
++ order to stop assigning 0 for an inode-number. Not directly related to
++ aufs, but recommended generally.
++- tmpfs-idr.patch
++ Keeps the tmpfs inode number as the lowest value. Effective to reduce
++ the size of aufs XINO files for tmpfs branch. Also it prevents the
++ duplication of inode number, which is important for backup tools and
++ other utilities. When you find aufs XINO files for tmpfs branch
++ growing too much, try this patch.
++- lockdep-debug.patch
++ Because aufs is not only an ordinary filesystem (callee of VFS), but
++ also a caller of VFS functions for branch filesystems, subclassing of
++ the internal locks for LOCKDEP is necessary. LOCKDEP is a debugging
++ feature of linux kernel. If you enable CONFIG_LOCKDEP, then you will
++ need to apply this debug patch to expand several constant values.
++ If don't know what LOCKDEP, then you don't have apply this patch.
+
-+What: /sys/fs/aufs/si_<id>/br0, br1 ... brN
-+Date: March 2009
-+Contact: J. R. Okajima <hooanon05g@gmail.com>
-+Description:
-+ It shows the abolute path of a member directory (which
-+ is called branch) in aufs, and its permission.
+
-+What: /sys/fs/aufs/si_<id>/brid0, brid1 ... bridN
-+Date: July 2013
-+Contact: J. R. Okajima <hooanon05g@gmail.com>
-+Description:
-+ It shows the id of a member directory (which is called
-+ branch) in aufs.
++4. Usage
++----------------------------------------
++At first, make sure aufs-util are installed, and please read the aufs
++manual, aufs.5 in aufs-util.git tree.
++$ man -l aufs.5
+
-+What: /sys/fs/aufs/si_<id>/xi_path
-+Date: March 2009
-+Contact: J. R. Okajima <hooanon05g@gmail.com>
-+Description:
-+ It shows the abolute path of XINO (External Inode Number
-+ Bitmap, Translation Table and Generation Table) file
-+ even if it is the default path.
-+ When the aufs mount option 'noxino' is specified, it
-+ will be empty. About XINO files, see the aufs manual.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
---- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt 2017-11-12 22:24:42.257509799 +0100
++And then,
++$ mkdir /tmp/rw /tmp/aufs
++# mount -t aufs -o br=/tmp/rw:${HOME} none /tmp/aufs
++
++Here is another example. The result is equivalent.
++# mount -t aufs -o br=/tmp/rw=rw:${HOME}=ro none /tmp/aufs
++ Or
++# mount -t aufs -o br:/tmp/rw none /tmp/aufs
++# mount -o remount,append:${HOME} /tmp/aufs
++
++Then, you can see whole tree of your home dir through /tmp/aufs. If
++you modify a file under /tmp/aufs, the one on your home directory is
++not affected, instead the same named file will be newly created under
++/tmp/rw. And all of your modification to a file will be applied to
++the one under /tmp/rw. This is called the file based Copy on Write
++(COW) method.
++Aufs mount options are described in aufs.5.
++If you run chroot or something and make your aufs as a root directory,
++then you need to customize the shutdown script. See the aufs manual in
++detail.
++
++Additionally, there are some sample usages of aufs which are a
++diskless system with network booting, and LiveCD over NFS.
++See sample dir in CVS tree on SourceForge.
++
++
++5. Contact
++----------------------------------------
++When you have any problems or strange behaviour in aufs, please let me
++know with:
++- /proc/mounts (instead of the output of mount(8))
++- /sys/module/aufs/*
++- /sys/fs/aufs/* (if you have them)
++- /debug/aufs/* (if you have them)
++- linux kernel version
++ if your kernel is not plain, for example modified by distributor,
++ the url where i can download its source is necessary too.
++- aufs version which was printed at loading the module or booting the
++ system, instead of the date you downloaded.
++- configuration (define/undefine CONFIG_AUFS_xxx)
++- kernel configuration or /proc/config.gz (if you have it)
++- behaviour which you think to be incorrect
++- actual operation, reproducible one is better
++- mailto: aufs-users at lists.sourceforge.net
++
++Usually, I don't watch the Public Areas(Bugs, Support Requests, Patches,
++and Feature Requests) on SourceForge. Please join and write to
++aufs-users ML.
++
++
++6. Acknowledgements
++----------------------------------------
++Thanks to everyone who have tried and are using aufs, whoever
++have reported a bug or any feedback.
++
++Especially donators:
++Tomas Matejicek(slax.org) made a donation (much more than once).
++ Since Apr 2010, Tomas M (the author of Slax and Linux Live
++ scripts) is making "doubling" donations.
++ Unfortunately I cannot list all of the donators, but I really
++ appreciate.
++ It ends Aug 2010, but the ordinary donation URL is still available.
++ <http://sourceforge.net/donate/index.php?group_id=167503>
++Dai Itasaka made a donation (2007/8).
++Chuck Smith made a donation (2008/4, 10 and 12).
++Henk Schoneveld made a donation (2008/9).
++Chih-Wei Huang, ASUS, CTC donated Eee PC 4G (2008/10).
++Francois Dupoux made a donation (2008/11).
++Bruno Cesar Ribas and Luis Carlos Erpen de Bona, C3SL serves public
++ aufs2 GIT tree (2009/2).
++William Grant made a donation (2009/3).
++Patrick Lane made a donation (2009/4).
++The Mail Archive (mail-archive.com) made donations (2009/5).
++Nippy Networks (Ed Wildgoose) made a donation (2009/7).
++New Dream Network, LLC (www.dreamhost.com) made a donation (2009/11).
++Pavel Pronskiy made a donation (2011/2).
++Iridium and Inmarsat satellite phone retailer (www.mailasail.com), Nippy
++ Networks (Ed Wildgoose) made a donation for hardware (2011/3).
++Max Lekomcev (DOM-TV project) made a donation (2011/7, 12, 2012/3, 6 and
++11).
++Sam Liddicott made a donation (2011/9).
++Era Scarecrow made a donation (2013/4).
++Bor Ratajc made a donation (2013/4).
++Alessandro Gorreta made a donation (2013/4).
++POIRETTE Marc made a donation (2013/4).
++Alessandro Gorreta made a donation (2013/4).
++lauri kasvandik made a donation (2013/5).
++"pemasu from Finland" made a donation (2013/7).
++The Parted Magic Project made a donation (2013/9 and 11).
++Pavel Barta made a donation (2013/10).
++Nikolay Pertsev made a donation (2014/5).
++James B made a donation (2014/7 and 2015/7).
++Stefano Di Biase made a donation (2014/8).
++Daniel Epellei made a donation (2015/1).
++OmegaPhil made a donation (2016/1).
++Tomasz Szewczyk made a donation (2016/4).
++James Burry made a donation (2016/12).
++
++Thank you very much.
++Donations are always, including future donations, very important and
++helpful for me to keep on developing aufs.
++
++
++7.
++----------------------------------------
++If you are an experienced user, no explanation is needed. Aufs is
++just a linux filesystem.
++
++
++Enjoy!
++
++# Local variables: ;
++# mode: text;
++# End: ;
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/01intro.txt linux-4.14/Documentation/filesystems/aufs/design/01intro.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/01intro.txt 2021-02-24 21:42:43.437781422 +0100
@@ -0,0 +1,171 @@
+
+# Copyright (C) 2005-2017 Junjiro R. Okajima
+Some people may think it is better to pass such work to user space
+helper, instead of doing in kernel space. Actually I am still thinking
+about it. But currently I have implemented it in kernel space.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
---- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt 2017-07-29 12:14:25.893041746 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/02struct.txt linux-4.14/Documentation/filesystems/aufs/design/02struct.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/02struct.txt 2021-02-24 21:42:43.437781422 +0100
@@ -0,0 +1,258 @@
+
+# Copyright (C) 2005-2017 Junjiro R. Okajima
+- 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 2017-07-29 12:14:25.893041746 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/03atomic_open.txt linux-4.14/Documentation/filesystems/aufs/design/03atomic_open.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/03atomic_open.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/03atomic_open.txt 2021-02-24 21:42:43.437781422 +0100
@@ -0,0 +1,85 @@
+
+# Copyright (C) 2015-2017 Junjiro R. Okajima
+ ->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 2017-07-29 12:14:25.893041746 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/03lookup.txt linux-4.14/Documentation/filesystems/aufs/design/03lookup.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/03lookup.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/03lookup.txt 2021-02-24 21:42:43.437781422 +0100
@@ -0,0 +1,113 @@
+
+# Copyright (C) 2005-2017 Junjiro R. Okajima
+ 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 2017-07-29 12:14:25.893041746 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/04branch.txt linux-4.14/Documentation/filesystems/aufs/design/04branch.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/04branch.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/04branch.txt 2021-02-24 21:42:43.437781422 +0100
@@ -0,0 +1,74 @@
+
+# Copyright (C) 2005-2017 Junjiro R. Okajima
+ - a file on the branch is mmap-ed.
+ - a regular file on the branch is opened for write and there is no
+ same named entry on the upper branch.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
---- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2017-07-29 12:14:25.893041746 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-4.14/Documentation/filesystems/aufs/design/05wbr_policy.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/05wbr_policy.txt 2021-02-24 21:42:43.437781422 +0100
@@ -0,0 +1,64 @@
+
+# Copyright (C) 2005-2017 Junjiro R. Okajima
+ where the source and the target exists and selects the higher
+ one. If the selected branch is readonly, then aufs follows the
+ copyup policy.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot linux/Documentation/filesystems/aufs/design/06dirren.dot
---- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2017-11-12 22:24:44.694244127 +0100
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/06dirren.dot linux-4.14/Documentation/filesystems/aufs/design/06dirren.dot
+--- linux-4.14/Documentation/filesystems/aufs/design/06dirren.dot 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/06dirren.dot 2021-02-24 21:42:43.437781422 +0100
@@ -0,0 +1,31 @@
+
+// to view this graph, run dot(1) command in GRAPHVIZ.
+
+aufs_lookup -> whinfo [label="load/remove"];
+}
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt linux/Documentation/filesystems/aufs/design/06dirren.txt
---- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2017-11-12 22:24:44.694244127 +0100
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/06dirren.txt linux-4.14/Documentation/filesystems/aufs/design/06dirren.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/06dirren.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/06dirren.txt 2021-02-24 21:42:43.437781422 +0100
@@ -0,0 +1,102 @@
+
+# Copyright (C) 2017 Junjiro R. Okajima
+contains two names, before- and after-rename, the name comparision in
+UDBA handler may not work correctly. In this case, the behaviour will be
+equivalen to udba=reval case.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linux/Documentation/filesystems/aufs/design/06fhsm.txt
---- /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2017-07-29 12:14:25.896375188 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/06fhsm.txt linux-4.14/Documentation/filesystems/aufs/design/06fhsm.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/06fhsm.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/06fhsm.txt 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,120 @@
+
+# Copyright (C) 2011-2017 Junjiro R. Okajima
+
+And of course, in every step, an error may happen. So the operation
+should restore the original file state after an error happens.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
---- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2017-07-29 12:14:25.896375188 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/06mmap.txt linux-4.14/Documentation/filesystems/aufs/design/06mmap.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/06mmap.txt 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,72 @@
+
+# Copyright (C) 2005-2017 Junjiro R. Okajima
+ 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 2017-07-29 12:14:25.896375188 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/06xattr.txt linux-4.14/Documentation/filesystems/aufs/design/06xattr.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/06xattr.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/06xattr.txt 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,96 @@
+
+# Copyright (C) 2014-2017 Junjiro R. Okajima
+Some contradiction may happen I am afraid.
+Do we need another attribute to stop copying XATTR? I am unsure. For
+now, aufs implements the branch attributes to ignore the error.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
---- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt 2017-07-29 12:14:25.896375188 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/07export.txt linux-4.14/Documentation/filesystems/aufs/design/07export.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/07export.txt 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,58 @@
+
+# Copyright (C) 2005-2017 Junjiro R. Okajima
+ convert it into ESTALE for NFSD.
+- readdir(): call lockdep_on/off() because filldir in NFSD calls
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
---- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2017-07-29 12:14:25.896375188 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/08shwh.txt linux-4.14/Documentation/filesystems/aufs/design/08shwh.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/08shwh.txt 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,52 @@
+
+# Copyright (C) 2005-2017 Junjiro R. Okajima
+
+This new squashfs archive can be stored on the boot device and the
+initramfs will use it to replace the old one at the next boot.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
---- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2017-07-29 12:14:25.896375188 +0200
+diff -urNp -x '*.orig' linux-4.14/Documentation/filesystems/aufs/design/10dynop.txt linux-4.14/Documentation/filesystems/aufs/design/10dynop.txt
+--- linux-4.14/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/Documentation/filesystems/aufs/design/10dynop.txt 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2010-2017 Junjiro R. Okajima
+XIP (DAX) mainly.
+Currently this approach is applied to address_space_operations for
+regular files only.
-diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
---- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/README 2017-07-29 12:14:25.893041746 +0200
-@@ -0,0 +1,393 @@
-+
-+Aufs4 -- advanced multi layered unification filesystem version 4.x
-+http://aufs.sf.net
-+Junjiro R. Okajima
-+
-+
-+0. Introduction
-+----------------------------------------
-+In the early days, aufs was entirely re-designed and re-implemented
-+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
-+approaches to aufs1's.
-+Unionfs is being developed by Professor Erez Zadok at Stony Brook
-+University and his team.
-+
-+Aufs4 supports linux-4.0 and later, and for linux-3.x series try aufs3.
-+If you want older kernel version support, try aufs2-2.6.git or
-+aufs2-standalone.git repository, aufs1 from CVS on SourceForge.
-+
-+Note: it becomes clear that "Aufs was rejected. Let's give it up."
-+ According to Christoph Hellwig, linux rejects all union-type
-+ filesystems but UnionMount.
-+<http://marc.info/?l=linux-kernel&m=123938533724484&w=2>
-+
-+PS. Al Viro seems have a plan to merge aufs as well as overlayfs and
-+ UnionMount, and he pointed out an issue around a directory mutex
-+ lock and aufs addressed it. But it is still unsure whether aufs will
-+ be merged (or any other union solution).
-+<http://marc.info/?l=linux-kernel&m=136312705029295&w=1>
-+
-+
-+1. Features
-+----------------------------------------
-+- unite several directories into a single virtual filesystem. The member
-+ directory is called as a branch.
-+- you can specify the permission flags to the branch, which are 'readonly',
-+ 'readwrite' and 'whiteout-able.'
-+- by upper writable branch, internal copyup and whiteout, files/dirs on
-+ readonly branch are modifiable logically.
-+- dynamic branch manipulation, add, del.
-+- etc...
-+
-+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
-+- seekable directory, supporting NFS readdir.
-+- whiteout is hardlinked in order to reduce the consumption of inodes
-+ on branch
-+- do not copyup, nor create a whiteout when it is unnecessary
-+- revert a single systemcall when an error occurs in aufs
-+- remount interface instead of ioctl
-+- maintain /etc/mtab by an external command, /sbin/mount.aufs.
-+- loopback mounted filesystem as a branch
-+- kernel thread for removing the dir who has a plenty of whiteouts
-+- support copyup sparse file (a file which has a 'hole' in it)
-+- default permission flags for branches
-+- selectable permission flags for ro branch, whether whiteout can
-+ exist or not
-+- export via NFS.
-+- support <sysfs>/fs/aufs and <debugfs>/aufs.
-+- support multiple writable branches, some policies to select one
-+ among multiple writable branches.
-+- a new semantics for link(2) and rename(2) to support multiple
-+ writable branches.
-+- no glibc changes are required.
-+- pseudo hardlink (hardlink over branches)
-+- allow a direct access manually to a file on branch, e.g. bypassing aufs.
-+ including NFS or remote filesystem branch.
-+- userspace wrapper for pathconf(3)/fpathconf(3) with _PC_LINK_MAX.
-+- and more...
-+
-+Currently these features are dropped temporary from aufs4.
-+See design/08plan.txt in detail.
-+- nested mount, i.e. aufs as readonly no-whiteout branch of another aufs
-+ (robr)
-+- statistics of aufs thread (/sys/fs/aufs/stat)
-+
-+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
-+- light version, without branch manipulation. (unnecessary?)
-+- copyup in userspace
-+- inotify in userspace
-+- readv/writev
-+
-+
-+2. Download
-+----------------------------------------
-+There are three GIT trees for aufs4, aufs4-linux.git,
-+aufs4-standalone.git, and aufs-util.git. Note that there is no "4" in
-+"aufs-util.git."
-+While the aufs-util is always necessary, you need either of aufs4-linux
-+or aufs4-standalone.
-+
-+The aufs4-linux tree includes the whole linux mainline GIT tree,
-+git://git.kernel.org/.../torvalds/linux.git.
-+And you cannot select CONFIG_AUFS_FS=m for this version, eg. you cannot
-+build aufs4 as an external kernel module.
-+Several extra patches are not included in this tree. Only
-+aufs4-standalone tree contains them. They are described in the later
-+section "Configuration and Compilation."
-+
-+On the other hand, the aufs4-standalone tree has only aufs source files
-+and necessary patches, and you can select CONFIG_AUFS_FS=m.
-+But you need to apply all aufs patches manually.
-+
-+You will find GIT branches whose name is in form of "aufs4.x" where "x"
-+represents the linux kernel version, "linux-4.x". For instance,
-+"aufs4.0" is for linux-4.0. For latest "linux-4.x-rcN", use
-+"aufs4.x-rcN" branch.
-+
-+o aufs4-linux tree
-+$ git clone --reference /your/linux/git/tree \
-+ git://github.com/sfjro/aufs4-linux.git aufs4-linux.git
-+- if you don't have linux GIT tree, then remove "--reference ..."
-+$ cd aufs4-linux.git
-+$ git checkout origin/aufs4.0
-+
-+Or You may want to directly git-pull aufs into your linux GIT tree, and
-+leave the patch-work to GIT.
-+$ cd /your/linux/git/tree
-+$ git remote add aufs4 git://github.com/sfjro/aufs4-linux.git
-+$ git fetch aufs4
-+$ git checkout -b my4.0 v4.0
-+$ (add your local change...)
-+$ git pull aufs4 aufs4.0
-+- now you have v4.0 + your_changes + aufs4.0 in you my4.0 branch.
-+- you may need to solve some conflicts between your_changes and
-+ aufs4.0. in this case, git-rerere is recommended so that you can
-+ solve the similar conflicts automatically when you upgrade to 4.1 or
-+ later in the future.
-+
-+o aufs4-standalone tree
-+$ git clone git://github.com/sfjro/aufs4-standalone.git aufs4-standalone.git
-+$ cd aufs4-standalone.git
-+$ git checkout origin/aufs4.0
-+
-+o aufs-util tree
-+$ git clone git://git.code.sf.net/p/aufs/aufs-util aufs-util.git
-+- note that the public aufs-util.git is on SourceForge instead of
-+ GitHUB.
-+$ cd aufs-util.git
-+$ git checkout origin/aufs4.0
-+
-+Note: The 4.x-rcN branch is to be used with `rc' kernel versions ONLY.
-+The minor version number, 'x' in '4.x', of aufs may not always
-+follow the minor version number of the kernel.
-+Because changes in the kernel that cause the use of a new
-+minor version number do not always require changes to aufs-util.
-+
-+Since aufs-util has its own minor version number, you may not be
-+able to find a GIT branch in aufs-util for your kernel's
-+exact minor version number.
-+In this case, you should git-checkout the branch for the
-+nearest lower number.
-+
-+For (an unreleased) example:
-+If you are using "linux-4.10" and the "aufs4.10" branch
-+does not exist in aufs-util repository, then "aufs4.9", "aufs4.8"
-+or something numerically smaller is the branch for your kernel.
-+
-+Also you can view all branches by
-+ $ git branch -a
+diff -urNp -x '*.orig' linux-4.14/MAINTAINERS linux-4.14/MAINTAINERS
+--- linux-4.14/MAINTAINERS 2021-02-24 21:42:34.681134057 +0100
++++ linux-4.14/MAINTAINERS 2021-02-24 21:42:43.431114768 +0100
+@@ -2465,6 +2465,19 @@ F: include/linux/audit.h
+ F: include/uapi/linux/audit.h
+ F: kernel/audit*
+
++AUFS (advanced multi layered unification filesystem) FILESYSTEM
++M: "J. R. Okajima" <hooanon05g@gmail.com>
++L: linux-unionfs@vger.kernel.org
++L: aufs-users@lists.sourceforge.net (members only)
++W: http://aufs.sourceforge.net
++T: git://github.com/sfjro/aufs4-linux.git
++S: Supported
++F: Documentation/filesystems/aufs/
++F: Documentation/ABI/testing/debugfs-aufs
++F: Documentation/ABI/testing/sysfs-aufs
++F: fs/aufs/
++F: include/uapi/linux/aufs_type.h
+
+ AUXILIARY DISPLAY DRIVERS
+ M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
+ W: http://miguelojeda.es/auxdisplay.htm
+diff -urNp -x '*.orig' linux-4.14/drivers/block/loop.c linux-4.14/drivers/block/loop.c
+--- linux-4.14/drivers/block/loop.c 2021-02-24 21:42:34.864466934 +0100
++++ linux-4.14/drivers/block/loop.c 2021-02-24 21:42:43.447781402 +0100
+@@ -605,6 +605,15 @@ static inline void loop_update_dio(struc
+ lo->use_dio);
+ }
+
++static struct file *loop_real_file(struct file *file)
++{
++ struct file *f = NULL;
+
-+3. Configuration and Compilation
-+----------------------------------------
-+Make sure you have git-checkout'ed the correct branch.
++ 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;
++}
+
-+For aufs4-linux tree,
-+- enable CONFIG_AUFS_FS.
-+- set other aufs configurations if necessary.
+ static void loop_reread_partitions(struct loop_device *lo,
+ struct block_device *bdev)
+ {
+@@ -669,6 +678,7 @@ static int loop_change_fd(struct loop_de
+ unsigned int arg)
+ {
+ struct file *file, *old_file;
++ struct file *f, *virt_file = NULL, *old_virt_file;
+ struct inode *inode;
+ int error;
+
+@@ -685,6 +695,12 @@ static int loop_change_fd(struct loop_de
+ file = fget(arg);
+ if (!file)
+ goto out;
++ f = loop_real_file(file);
++ if (f) {
++ virt_file = file;
++ file = f;
++ get_file(file);
++ }
+
+ error = loop_validate_file(file, bdev);
+ if (error)
+@@ -692,6 +708,7 @@ static int loop_change_fd(struct loop_de
+
+ inode = file->f_mapping->host;
+ old_file = lo->lo_backing_file;
++ old_virt_file = lo->lo_backing_virt_file;
+
+ error = -EINVAL;
+
+@@ -703,6 +720,7 @@ static int loop_change_fd(struct loop_de
+ blk_mq_freeze_queue(lo->lo_queue);
+ mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
+ lo->lo_backing_file = file;
++ lo->lo_backing_virt_file = virt_file;
+ lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
+ mapping_set_gfp_mask(file->f_mapping,
+ lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
+@@ -710,16 +728,38 @@ static int loop_change_fd(struct loop_de
+ blk_mq_unfreeze_queue(lo->lo_queue);
+
+ fput(old_file);
++ if (old_virt_file)
++ fput(old_virt_file);
+ if (lo->lo_flags & LO_FLAGS_PARTSCAN)
+ loop_reread_partitions(lo, bdev);
+ return 0;
+
+ out_putf:
+ fput(file);
++ if (virt_file)
++ fput(virt_file);
+ out:
+ return error;
+ }
+
++/*
++ * for AUFS
++ * no get/put for file.
++ */
++struct file *loop_backing_file(struct super_block *sb)
++{
++ struct file *ret;
++ struct loop_device *l;
+
-+For aufs4-standalone tree,
-+There are several ways to build.
++ ret = NULL;
++ if (MAJOR(sb->s_dev) == LOOP_MAJOR) {
++ l = sb->s_bdev->bd_disk->private_data;
++ ret = l->lo_backing_file;
++ }
++ return ret;
++}
++EXPORT_SYMBOL_GPL(loop_backing_file);
+
-+1.
-+- apply ./aufs4-kbuild.patch to your kernel source files.
-+- apply ./aufs4-base.patch too.
-+- apply ./aufs4-mmap.patch too.
-+- apply ./aufs4-standalone.patch too, if you have a plan to set
-+ CONFIG_AUFS_FS=m. otherwise you don't need ./aufs4-standalone.patch.
-+- copy ./{Documentation,fs,include/uapi/linux/aufs_type.h} files to your
-+ kernel source tree. Never copy $PWD/include/uapi/linux/Kbuild.
-+- enable CONFIG_AUFS_FS, you can select either
-+ =m or =y.
-+- and build your kernel as usual.
-+- install the built kernel.
-+ Note: Since linux-3.9, every filesystem module requires an alias
-+ "fs-<fsname>". You should make sure that "fs-aufs" is listed in your
-+ modules.aliases file if you set CONFIG_AUFS_FS=m.
-+- install the header files too by "make headers_install" to the
-+ directory where you specify. By default, it is $PWD/usr.
-+ "make help" shows a brief note for headers_install.
-+- and reboot your system.
+ /* loop sysfs attributes */
+
+ static ssize_t loop_attr_show(struct device *dev, char *page,
+@@ -885,7 +925,7 @@ static int loop_prepare_queue(struct loo
+ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+ struct block_device *bdev, unsigned int arg)
+ {
+- struct file *file;
++ struct file *file, *f, *virt_file = NULL;
+ struct inode *inode;
+ struct address_space *mapping;
+ int lo_flags = 0;
+@@ -899,6 +939,12 @@ static int loop_set_fd(struct loop_devic
+ 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)
+@@ -931,6 +977,7 @@ static int loop_set_fd(struct loop_devic
+ lo->lo_device = bdev;
+ lo->lo_flags = lo_flags;
+ lo->lo_backing_file = file;
++ lo->lo_backing_virt_file = virt_file;
+ lo->transfer = NULL;
+ lo->ioctl = NULL;
+ lo->lo_sizelimit = 0;
+@@ -964,6 +1011,8 @@ static int loop_set_fd(struct loop_devic
+
+ out_putf:
+ fput(file);
++ if (virt_file)
++ fput(virt_file);
+ out:
+ /* This is safe: open() is still holding a reference. */
+ module_put(THIS_MODULE);
+@@ -1010,6 +1059,7 @@ loop_init_xfer(struct loop_device *lo, s
+ 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;
+
+@@ -1041,6 +1091,7 @@ static int loop_clr_fd(struct loop_devic
+ spin_lock_irq(&lo->lo_lock);
+ lo->lo_state = Lo_rundown;
+ lo->lo_backing_file = NULL;
++ lo->lo_backing_virt_file = NULL;
+ spin_unlock_irq(&lo->lo_lock);
+
+ loop_release_xfer(lo);
+@@ -1088,6 +1139,8 @@ static int loop_clr_fd(struct loop_devic
+ * bd_mutex which is usually taken before lo_ctl_mutex.
+ */
+ fput(filp);
++ if (virt_filp)
++ fput(virt_filp);
+ return 0;
+ }
+
+diff -urNp -x '*.orig' linux-4.14/drivers/block/loop.h linux-4.14/drivers/block/loop.h
+--- linux-4.14/drivers/block/loop.h 2021-02-24 21:42:34.864466934 +0100
++++ linux-4.14/drivers/block/loop.h 2021-02-24 21:42:43.447781402 +0100
+@@ -46,7 +46,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;
+ void *key_data;
+
+diff -urNp -x '*.orig' linux-4.14/fs/Kconfig linux-4.14/fs/Kconfig
+--- linux-4.14/fs/Kconfig 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/fs/Kconfig 2021-02-24 21:42:43.431114768 +0100
+@@ -248,6 +248,7 @@ source "fs/pstore/Kconfig"
+ source "fs/sysv/Kconfig"
+ source "fs/ufs/Kconfig"
+ source "fs/exofs/Kconfig"
++source "fs/aufs/Kconfig"
+
+ endif # MISC_FILESYSTEMS
+
+diff -urNp -x '*.orig' linux-4.14/fs/Makefile linux-4.14/fs/Makefile
+--- linux-4.14/fs/Makefile 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/fs/Makefile 2021-02-24 21:42:43.431114768 +0100
+@@ -129,3 +129,4 @@ obj-y += exofs/ # Multiple modules
+ obj-$(CONFIG_CEPH_FS) += ceph/
+ obj-$(CONFIG_PSTORE) += pstore/
+ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
++obj-$(CONFIG_AUFS_FS) += aufs/
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/Kconfig linux-4.14/fs/aufs/Kconfig
+--- linux-4.14/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/Kconfig 2021-02-24 21:42:43.444448075 +0100
+@@ -0,0 +1,198 @@
++config AUFS_FS
++ tristate "Aufs (Advanced multi layered unification filesystem) support"
++ help
++ Aufs is a stackable unification filesystem such as Unionfs,
++ which unifies several directories and provides a merged single
++ directory.
++ In the early days, aufs was entirely re-designed and
++ re-implemented Unionfs Version 1.x series. Introducing many
++ original ideas, approaches and improvements, it becomes totally
++ different from Unionfs while keeping the basic features.
+
-+2.
-+- module only (CONFIG_AUFS_FS=m).
-+- apply ./aufs4-base.patch to your kernel source files.
-+- apply ./aufs4-mmap.patch too.
-+- apply ./aufs4-standalone.patch too.
-+- build your kernel, don't forget "make headers_install", and reboot.
-+- edit ./config.mk and set other aufs configurations if necessary.
-+ Note: You should read $PWD/fs/aufs/Kconfig carefully which describes
-+ every aufs configurations.
-+- build the module by simple "make".
-+ Note: Since linux-3.9, every filesystem module requires an alias
-+ "fs-<fsname>". You should make sure that "fs-aufs" is listed in your
-+ modules.aliases file.
-+- you can specify ${KDIR} make variable which points to your kernel
-+ source tree.
-+- install the files
-+ + run "make install" to install the aufs module, or copy the built
-+ $PWD/aufs.ko to /lib/modules/... and run depmod -a (or reboot simply).
-+ + run "make install_headers" (instead of headers_install) to install
-+ the modified aufs header file (you can specify DESTDIR which is
-+ available in aufs standalone version's Makefile only), or copy
-+ $PWD/usr/include/linux/aufs_type.h to /usr/include/linux or wherever
-+ you like manually. By default, the target directory is $PWD/usr.
-+- no need to apply aufs4-kbuild.patch, nor copying source files to your
-+ kernel source tree.
++if AUFS_FS
++choice
++ prompt "Maximum number of branches"
++ default AUFS_BRANCH_MAX_127
++ help
++ Specifies the maximum number of branches (or member directories)
++ in a single aufs. The larger value consumes more system
++ resources and has a minor impact to performance.
++config AUFS_BRANCH_MAX_127
++ bool "127"
++ help
++ Specifies the maximum number of branches (or member directories)
++ in a single aufs. The larger value consumes more system
++ resources and has a minor impact to performance.
++config AUFS_BRANCH_MAX_511
++ bool "511"
++ help
++ Specifies the maximum number of branches (or member directories)
++ in a single aufs. The larger value consumes more system
++ resources and has a minor impact to performance.
++config AUFS_BRANCH_MAX_1023
++ bool "1023"
++ help
++ Specifies the maximum number of branches (or member directories)
++ in a single aufs. The larger value consumes more system
++ resources and has a minor impact to performance.
++config AUFS_BRANCH_MAX_32767
++ bool "32767"
++ help
++ Specifies the maximum number of branches (or member directories)
++ in a single aufs. The larger value consumes more system
++ resources and has a minor impact to performance.
++endchoice
+
-+Note: The header file aufs_type.h is necessary to build aufs-util
-+ as well as "make headers_install" in the kernel source tree.
-+ headers_install is subject to be forgotten, but it is essentially
-+ necessary, not only for building aufs-util.
-+ You may not meet problems without headers_install in some older
-+ version though.
++config AUFS_SBILIST
++ bool
++ depends on AUFS_MAGIC_SYSRQ || PROC_FS
++ default y
++ help
++ Automatic configuration for internal use.
++ When aufs supports Magic SysRq or /proc, enabled automatically.
+
-+And then,
-+- read README in aufs-util, build and install it
-+- note that your distribution may contain an obsoleted version of
-+ aufs_type.h in /usr/include/linux or something. When you build aufs
-+ utilities, make sure that your compiler refers the correct aufs header
-+ file which is built by "make headers_install."
-+- if you want to use readdir(3) in userspace or pathconf(3) wrapper,
-+ then run "make install_ulib" too. And refer to the aufs manual in
-+ detail.
++config AUFS_HNOTIFY
++ bool "Detect direct branch access (bypassing aufs)"
++ help
++ If you want to modify files on branches directly, eg. bypassing aufs,
++ and want aufs to detect the changes of them fully, then enable this
++ option and use 'udba=notify' mount option.
++ Currently there is only one available configuration, "fsnotify".
++ It will have a negative impact to the performance.
++ See detail in aufs.5.
+
-+There several other patches in aufs4-standalone.git. They are all
-+optional. When you meet some problems, they will help you.
-+- aufs4-loopback.patch
-+ Supports a nested loopback mount in a branch-fs. This patch is
-+ unnecessary until aufs produces a message like "you may want to try
-+ another patch for loopback file".
-+- vfs-ino.patch
-+ Modifies a system global kernel internal function get_next_ino() in
-+ order to stop assigning 0 for an inode-number. Not directly related to
-+ aufs, but recommended generally.
-+- tmpfs-idr.patch
-+ Keeps the tmpfs inode number as the lowest value. Effective to reduce
-+ the size of aufs XINO files for tmpfs branch. Also it prevents the
-+ duplication of inode number, which is important for backup tools and
-+ other utilities. When you find aufs XINO files for tmpfs branch
-+ growing too much, try this patch.
-+- lockdep-debug.patch
-+ Because aufs is not only an ordinary filesystem (callee of VFS), but
-+ also a caller of VFS functions for branch filesystems, subclassing of
-+ the internal locks for LOCKDEP is necessary. LOCKDEP is a debugging
-+ feature of linux kernel. If you enable CONFIG_LOCKDEP, then you will
-+ need to apply this debug patch to expand several constant values.
-+ If don't know what LOCKDEP, then you don't have apply this patch.
++choice
++ prompt "method" if AUFS_HNOTIFY
++ default AUFS_HFSNOTIFY
++config AUFS_HFSNOTIFY
++ bool "fsnotify"
++ select FSNOTIFY
++endchoice
+
++config AUFS_EXPORT
++ bool "NFS-exportable aufs"
++ depends on EXPORTFS
++ help
++ If you want to export your mounted aufs via NFS, then enable this
++ option. There are several requirements for this configuration.
++ See detail in aufs.5.
+
-+4. Usage
-+----------------------------------------
-+At first, make sure aufs-util are installed, and please read the aufs
-+manual, aufs.5 in aufs-util.git tree.
-+$ man -l aufs.5
++config AUFS_INO_T_64
++ bool
++ depends on AUFS_EXPORT
++ depends on 64BIT && !(ALPHA || S390)
++ default y
++ help
++ Automatic configuration for internal use.
++ /* typedef unsigned long/int __kernel_ino_t */
++ /* alpha and s390x are int */
+
-+And then,
-+$ mkdir /tmp/rw /tmp/aufs
-+# mount -t aufs -o br=/tmp/rw:${HOME} none /tmp/aufs
++config AUFS_XATTR
++ bool "support for XATTR/EA (including Security Labels)"
++ help
++ If your branch fs supports XATTR/EA and you want to make them
++ available in aufs too, then enable this opsion and specify the
++ branch attributes for EA.
++ See detail in aufs.5.
+
-+Here is another example. The result is equivalent.
-+# mount -t aufs -o br=/tmp/rw=rw:${HOME}=ro none /tmp/aufs
-+ Or
-+# mount -t aufs -o br:/tmp/rw none /tmp/aufs
-+# mount -o remount,append:${HOME} /tmp/aufs
++config AUFS_FHSM
++ bool "File-based Hierarchical Storage Management"
++ help
++ Hierarchical Storage Management (or HSM) is a well-known feature
++ in the storage world. Aufs provides this feature as file-based.
++ with multiple branches.
++ These multiple branches are prioritized, ie. the topmost one
++ should be the fastest drive and be used heavily.
+
-+Then, you can see whole tree of your home dir through /tmp/aufs. If
-+you modify a file under /tmp/aufs, the one on your home directory is
-+not affected, instead the same named file will be newly created under
-+/tmp/rw. And all of your modification to a file will be applied to
-+the one under /tmp/rw. This is called the file based Copy on Write
-+(COW) method.
-+Aufs mount options are described in aufs.5.
-+If you run chroot or something and make your aufs as a root directory,
-+then you need to customize the shutdown script. See the aufs manual in
-+detail.
++config AUFS_RDU
++ bool "Readdir in userspace"
++ help
++ Aufs has two methods to provide a merged view for a directory,
++ by a user-space library and by kernel-space natively. The latter
++ is always enabled but sometimes large and slow.
++ If you enable this option, install the library in aufs2-util
++ package, and set some environment variables for your readdir(3),
++ then the work will be handled in user-space which generally
++ shows better performance in most cases.
++ See detail in aufs.5.
+
-+Additionally, there are some sample usages of aufs which are a
-+diskless system with network booting, and LiveCD over NFS.
-+See sample dir in CVS tree on SourceForge.
++config AUFS_DIRREN
++ bool "Workaround for rename(2)-ing a directory"
++ help
++ By default, aufs returns EXDEV error in renameing a dir who has
++ his child on the lower branch, since it is a bad idea to issue
++ rename(2) internally for every lower branch. But user may not
++ accept this behaviour. So here is a workaround to allow such
++ rename(2) and store some extra infromation on the writable
++ branch. Obviously this costs high (and I don't like it).
++ To use this feature, you need to enable this configuration AND
++ to specify the mount option `dirren.'
++ See details in aufs.5 and the design documents.
+
++config AUFS_SHWH
++ bool "Show whiteouts"
++ help
++ If you want to make the whiteouts in aufs visible, then enable
++ this option and specify 'shwh' mount option. Although it may
++ sounds like philosophy or something, but in technically it
++ simply shows the name of whiteout with keeping its behaviour.
+
-+5. Contact
-+----------------------------------------
-+When you have any problems or strange behaviour in aufs, please let me
-+know with:
-+- /proc/mounts (instead of the output of mount(8))
-+- /sys/module/aufs/*
-+- /sys/fs/aufs/* (if you have them)
-+- /debug/aufs/* (if you have them)
-+- linux kernel version
-+ if your kernel is not plain, for example modified by distributor,
-+ the url where i can download its source is necessary too.
-+- aufs version which was printed at loading the module or booting the
-+ system, instead of the date you downloaded.
-+- configuration (define/undefine CONFIG_AUFS_xxx)
-+- kernel configuration or /proc/config.gz (if you have it)
-+- behaviour which you think to be incorrect
-+- actual operation, reproducible one is better
-+- mailto: aufs-users at lists.sourceforge.net
++config AUFS_BR_RAMFS
++ bool "Ramfs (initramfs/rootfs) as an aufs branch"
++ help
++ If you want to use ramfs as an aufs branch fs, then enable this
++ option. Generally tmpfs is recommended.
++ Aufs prohibited them to be a branch fs by default, because
++ initramfs becomes unusable after switch_root or something
++ generally. If you sets initramfs as an aufs branch and boot your
++ system by switch_root, you will meet a problem easily since the
++ files in initramfs may be inaccessible.
++ Unless you are going to use ramfs as an aufs branch fs without
++ switch_root or something, leave it N.
+
-+Usually, I don't watch the Public Areas(Bugs, Support Requests, Patches,
-+and Feature Requests) on SourceForge. Please join and write to
-+aufs-users ML.
++config AUFS_BR_FUSE
++ bool "Fuse fs as an aufs branch"
++ depends on FUSE_FS
++ select AUFS_POLL
++ help
++ If you want to use fuse-based userspace filesystem as an aufs
++ branch fs, then enable this option.
++ It implements the internal poll(2) operation which is
++ implemented by fuse only (curretnly).
+
++config AUFS_POLL
++ bool
++ help
++ Automatic configuration for internal use.
+
-+6. Acknowledgements
-+----------------------------------------
-+Thanks to everyone who have tried and are using aufs, whoever
-+have reported a bug or any feedback.
++config AUFS_BR_HFSPLUS
++ bool "Hfsplus as an aufs branch"
++ depends on HFSPLUS_FS
++ default y
++ help
++ If you want to use hfsplus fs as an aufs branch fs, then enable
++ this option. This option introduces a small overhead at
++ copying-up a file on hfsplus.
+
-+Especially donators:
-+Tomas Matejicek(slax.org) made a donation (much more than once).
-+ Since Apr 2010, Tomas M (the author of Slax and Linux Live
-+ scripts) is making "doubling" donations.
-+ Unfortunately I cannot list all of the donators, but I really
-+ appreciate.
-+ It ends Aug 2010, but the ordinary donation URL is still available.
-+ <http://sourceforge.net/donate/index.php?group_id=167503>
-+Dai Itasaka made a donation (2007/8).
-+Chuck Smith made a donation (2008/4, 10 and 12).
-+Henk Schoneveld made a donation (2008/9).
-+Chih-Wei Huang, ASUS, CTC donated Eee PC 4G (2008/10).
-+Francois Dupoux made a donation (2008/11).
-+Bruno Cesar Ribas and Luis Carlos Erpen de Bona, C3SL serves public
-+ aufs2 GIT tree (2009/2).
-+William Grant made a donation (2009/3).
-+Patrick Lane made a donation (2009/4).
-+The Mail Archive (mail-archive.com) made donations (2009/5).
-+Nippy Networks (Ed Wildgoose) made a donation (2009/7).
-+New Dream Network, LLC (www.dreamhost.com) made a donation (2009/11).
-+Pavel Pronskiy made a donation (2011/2).
-+Iridium and Inmarsat satellite phone retailer (www.mailasail.com), Nippy
-+ Networks (Ed Wildgoose) made a donation for hardware (2011/3).
-+Max Lekomcev (DOM-TV project) made a donation (2011/7, 12, 2012/3, 6 and
-+11).
-+Sam Liddicott made a donation (2011/9).
-+Era Scarecrow made a donation (2013/4).
-+Bor Ratajc made a donation (2013/4).
-+Alessandro Gorreta made a donation (2013/4).
-+POIRETTE Marc made a donation (2013/4).
-+Alessandro Gorreta made a donation (2013/4).
-+lauri kasvandik made a donation (2013/5).
-+"pemasu from Finland" made a donation (2013/7).
-+The Parted Magic Project made a donation (2013/9 and 11).
-+Pavel Barta made a donation (2013/10).
-+Nikolay Pertsev made a donation (2014/5).
-+James B made a donation (2014/7 and 2015/7).
-+Stefano Di Biase made a donation (2014/8).
-+Daniel Epellei made a donation (2015/1).
-+OmegaPhil made a donation (2016/1).
-+Tomasz Szewczyk made a donation (2016/4).
-+James Burry made a donation (2016/12).
++config AUFS_BDEV_LOOP
++ bool
++ depends on BLK_DEV_LOOP
++ default y
++ help
++ Automatic configuration for internal use.
++ Convert =[ym] into =y.
+
-+Thank you very much.
-+Donations are always, including future donations, very important and
-+helpful for me to keep on developing aufs.
++config AUFS_DEBUG
++ bool "Debug aufs"
++ help
++ Enable this to compile aufs internal debug code.
++ It will have a negative impact to the performance.
+
++config AUFS_MAGIC_SYSRQ
++ bool
++ depends on AUFS_DEBUG && MAGIC_SYSRQ
++ default y
++ help
++ Automatic configuration for internal use.
++ When aufs supports Magic SysRq, enabled automatically.
++endif
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/Makefile linux-4.14/fs/aufs/Makefile
+--- linux-4.14/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/Makefile 2021-02-24 21:42:43.444448075 +0100
+@@ -0,0 +1,45 @@
+
-+7.
-+----------------------------------------
-+If you are an experienced user, no explanation is needed. Aufs is
-+just a linux filesystem.
++include ${src}/magic.mk
++ifeq (${CONFIG_AUFS_FS},m)
++include ${src}/conf.mk
++endif
++-include ${src}/priv_def.mk
+
++# cf. include/linux/kernel.h
++# enable pr_debug
++ccflags-y += -DDEBUG
++# sparse requires the full pathname
++ifdef M
++ccflags-y += -include ${M}/../../include/uapi/linux/aufs_type.h
++else
++ccflags-y += -include ${srctree}/include/uapi/linux/aufs_type.h
++endif
+
-+Enjoy!
++obj-$(CONFIG_AUFS_FS) += aufs.o
++aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \
++ wkq.o vfsub.o dcsub.o \
++ cpup.o whout.o wbr_policy.o \
++ dinfo.o dentry.o \
++ dynop.o \
++ finfo.o file.o f_op.o \
++ dir.o vdir.o \
++ iinfo.o inode.o i_op.o i_op_add.o i_op_del.o i_op_ren.o \
++ mvdown.o ioctl.o
+
-+# Local variables: ;
-+# mode: text;
-+# End: ;
-diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
---- /usr/share/empty/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h 2017-11-12 22:24:44.697577553 +0100
++# all are boolean
++aufs-$(CONFIG_PROC_FS) += procfs.o plink.o
++aufs-$(CONFIG_SYSFS) += sysfs.o
++aufs-$(CONFIG_DEBUG_FS) += dbgaufs.o
++aufs-$(CONFIG_AUFS_BDEV_LOOP) += loop.o
++aufs-$(CONFIG_AUFS_HNOTIFY) += hnotify.o
++aufs-$(CONFIG_AUFS_HFSNOTIFY) += hfsnotify.o
++aufs-$(CONFIG_AUFS_EXPORT) += export.o
++aufs-$(CONFIG_AUFS_XATTR) += xattr.o
++aufs-$(CONFIG_FS_POSIX_ACL) += posix_acl.o
++aufs-$(CONFIG_AUFS_DIRREN) += dirren.o
++aufs-$(CONFIG_AUFS_FHSM) += fhsm.o
++aufs-$(CONFIG_AUFS_POLL) += poll.o
++aufs-$(CONFIG_AUFS_RDU) += rdu.o
++aufs-$(CONFIG_AUFS_BR_HFSPLUS) += hfsplus.o
++aufs-$(CONFIG_AUFS_DEBUG) += debug.o
++aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/aufs.h linux-4.14/fs/aufs/aufs.h
+--- linux-4.14/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/aufs.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_H__ */
-diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
---- /usr/share/empty/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c 2017-11-12 22:24:44.697577553 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/branch.c linux-4.14/fs/aufs/branch.c
+--- linux-4.14/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/branch.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,1432 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
---- /usr/share/empty/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.h 2017-11-12 22:24:44.697577553 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/branch.h linux-4.14/fs/aufs/branch.h
+--- linux-4.14/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/branch.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,333 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_BRANCH_H__ */
-diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
---- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/conf.mk 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/conf.mk linux-4.14/fs/aufs/conf.mk
+--- linux-4.14/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/conf.mk 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,39 @@
+
+AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
+${obj}/sysfs.o: ${AuConfName}
+
+-include ${srctree}/${src}/conf_priv.mk
-diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
---- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/cpup.c linux-4.14/fs/aufs/cpup.c
+--- linux-4.14/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/cpup.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,1443 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ dput(parent);
+ return 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 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/cpup.h linux-4.14/fs/aufs/cpup.h
+--- linux-4.14/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/cpup.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_CPUP_H__ */
-diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
---- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dbgaufs.c linux-4.14/fs/aufs/dbgaufs.c
+--- linux-4.14/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dbgaufs.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,437 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ err = 0;
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
---- /usr/share/empty/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.h 2017-07-29 12:14:25.899708630 +0200
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dbgaufs.h linux-4.14/fs/aufs/dbgaufs.h
+--- linux-4.14/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dbgaufs.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __DBGAUFS_H__ */
-diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
---- /usr/share/empty/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.c 2017-11-12 22:24:42.267510077 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dcsub.c linux-4.14/fs/aufs/dcsub.c
+--- linux-4.14/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dcsub.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+ return path_is_under(path + 0, path + 1);
+}
-diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
---- /usr/share/empty/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.h 2017-07-29 12:14:25.899708630 +0200
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dcsub.h linux-4.14/fs/aufs/dcsub.h
+--- linux-4.14/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dcsub.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DCSUB_H__ */
-diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
---- /usr/share/empty/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c 2017-11-12 22:24:42.267510077 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/debug.c linux-4.14/fs/aufs/debug.c
+--- linux-4.14/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/debug.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,440 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+ 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 2017-07-29 12:14:25.899708630 +0200
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/debug.h linux-4.14/fs/aufs/debug.h
+--- linux-4.14/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/debug.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DEBUG_H__ */
-diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
---- /usr/share/empty/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dentry.c linux-4.14/fs/aufs/dentry.c
+--- linux-4.14/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dentry.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,1152 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+const struct dentry_operations aufs_dop_noreval = {
+ .d_release = aufs_d_release
+};
-diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
---- /usr/share/empty/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dentry.h linux-4.14/fs/aufs/dentry.h
+--- linux-4.14/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dentry.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DENTRY_H__ */
-diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
---- /usr/share/empty/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dinfo.c 2017-11-12 22:24:42.267510077 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dinfo.c linux-4.14/fs/aufs/dinfo.c
+--- linux-4.14/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dinfo.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,553 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ return bindex;
+ return -1;
+}
-diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
---- /usr/share/empty/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dir.c linux-4.14/fs/aufs/dir.c
+--- linux-4.14/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dir.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,759 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ .flush = aufs_flush_dir,
+ .fsync = aufs_fsync_dir
+};
-diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
---- /usr/share/empty/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.h 2017-11-12 22:24:42.267510077 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dir.h linux-4.14/fs/aufs/dir.h
+--- linux-4.14/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dir.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DIR_H__ */
-diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
---- /usr/share/empty/fs/aufs/dirren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.c 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dirren.c linux-4.14/fs/aufs/dirren.c
+--- linux-4.14/fs/aufs/dirren.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dirren.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,1315 @@
+/*
+ * Copyright (C) 2017 Junjiro R. Okajima
+out:
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
---- /usr/share/empty/fs/aufs/dirren.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.h 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dirren.h linux-4.14/fs/aufs/dirren.h
+--- linux-4.14/fs/aufs/dirren.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dirren.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DIRREN_H__ */
-diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
---- /usr/share/empty/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dynop.c linux-4.14/fs/aufs/dynop.c
+--- linux-4.14/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dynop.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2010-2017 Junjiro R. Okajima
+ for (i = 0; i < AuDyLast; i++)
+ WARN_ON(!hlist_bl_empty(dynop + i));
+}
-diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
---- /usr/share/empty/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.h 2017-11-12 22:24:44.704244405 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/dynop.h linux-4.14/fs/aufs/dynop.h
+--- linux-4.14/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/dynop.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2010-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DYNOP_H__ */
-diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
---- /usr/share/empty/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c 2017-11-12 22:24:42.267510077 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/export.c linux-4.14/fs/aufs/export.c
+--- linux-4.14/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/export.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,836 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ /* branch id may be wrapped around */
+ br = NULL;
+ if (unlikely(si_nfsd_read_lock(sb, &nsi_lock)))
-+ goto out;
-+ nsi_lock.force_lock = 1;
-+
-+ /* is this inode still cached? */
-+ ino = decode_ino(fh + Fh_ino);
-+ /* it should never happen */
-+ if (unlikely(ino == AUFS_ROOT_INO))
-+ goto out_unlock;
-+
-+ dir_ino = decode_ino(fh + Fh_dir_ino);
-+ dentry = decode_by_ino(sb, ino, dir_ino);
-+ if (IS_ERR(dentry))
-+ goto out_unlock;
-+ if (dentry)
-+ goto accept;
-+
-+ /* is the parent dir cached? */
-+ br = au_sbr(sb, nsi_lock.bindex);
-+ au_br_get(br);
-+ dentry = decode_by_dir_ino(sb, ino, dir_ino, &nsi_lock);
-+ if (IS_ERR(dentry))
-+ goto out_unlock;
-+ if (dentry)
-+ goto accept;
-+
-+ /* lookup path */
-+ dentry = decode_by_path(sb, ino, fh, fh_len, &nsi_lock);
-+ if (IS_ERR(dentry))
-+ goto out_unlock;
-+ if (unlikely(!dentry))
-+ /* todo?: make it ESTALE */
-+ goto out_unlock;
-+
-+accept:
-+ if (!au_digen_test(dentry, au_sigen(sb))
-+ && d_inode(dentry)->i_generation == fh[Fh_igen])
-+ goto out_unlock; /* success */
-+
-+ dput(dentry);
-+ dentry = ERR_PTR(-ESTALE);
-+out_unlock:
-+ if (br)
-+ au_br_put(br);
-+ si_read_unlock(sb);
-+out:
-+ AuTraceErrPtr(dentry);
-+ return dentry;
-+}
-+
-+#if 0 /* reserved for future use */
-+/* support subtreecheck option */
-+static struct dentry *aufs_fh_to_parent(struct super_block *sb, struct fid *fid,
-+ int fh_len, int fh_type)
-+{
-+ struct dentry *parent;
-+ __u32 *fh = fid->raw;
-+ ino_t dir_ino;
-+
-+ dir_ino = decode_ino(fh + Fh_dir_ino);
-+ parent = decode_by_ino(sb, dir_ino, 0);
-+ if (IS_ERR(parent))
-+ goto out;
-+ if (!parent)
-+ parent = decode_by_path(sb, au_br_index(sb, fh[Fh_br_id]),
-+ dir_ino, fh, fh_len);
-+
-+out:
-+ AuTraceErrPtr(parent);
-+ return parent;
-+}
-+#endif
-+
-+/* ---------------------------------------------------------------------- */
-+
-+static int aufs_encode_fh(struct inode *inode, __u32 *fh, int *max_len,
-+ struct inode *dir)
-+{
-+ int err;
-+ aufs_bindex_t bindex;
-+ struct super_block *sb, *h_sb;
-+ struct dentry *dentry, *parent, *h_parent;
-+ struct inode *h_dir;
-+ struct au_branch *br;
-+
-+ err = -ENOSPC;
-+ if (unlikely(*max_len <= Fh_tail)) {
-+ AuWarn1("NFSv2 client (max_len %d)?\n", *max_len);
-+ goto out;
-+ }
-+
-+ err = FILEID_ROOT;
-+ if (inode->i_ino == AUFS_ROOT_INO) {
-+ AuDebugOn(inode->i_ino != AUFS_ROOT_INO);
-+ goto out;
-+ }
-+
-+ h_parent = NULL;
-+ sb = inode->i_sb;
-+ err = si_read_lock(sb, AuLock_FLUSH);
-+ if (unlikely(err))
-+ goto out;
-+
-+#ifdef CONFIG_AUFS_DEBUG
-+ if (unlikely(!au_opt_test(au_mntflags(sb), XINO)))
-+ AuWarn1("NFS-exporting requires xino\n");
-+#endif
-+ err = -EIO;
-+ parent = NULL;
-+ ii_read_lock_child(inode);
-+ bindex = au_ibtop(inode);
-+ if (!dir) {
-+ dentry = d_find_any_alias(inode);
-+ if (unlikely(!dentry))
-+ goto out_unlock;
-+ AuDebugOn(au_test_anon(dentry));
-+ parent = dget_parent(dentry);
-+ dput(dentry);
-+ if (unlikely(!parent))
-+ goto out_unlock;
-+ if (d_really_is_positive(parent))
-+ dir = d_inode(parent);
-+ }
-+
-+ ii_read_lock_parent(dir);
-+ h_dir = au_h_iptr(dir, bindex);
-+ ii_read_unlock(dir);
-+ if (unlikely(!h_dir))
-+ goto out_parent;
-+ h_parent = d_find_any_alias(h_dir);
-+ if (unlikely(!h_parent))
-+ goto out_hparent;
-+
-+ err = -EPERM;
-+ br = au_sbr(sb, bindex);
-+ h_sb = au_br_sb(br);
-+ if (unlikely(!h_sb->s_export_op)) {
-+ AuErr1("%s branch is not exportable\n", au_sbtype(h_sb));
-+ goto out_hparent;
-+ }
-+
-+ fh[Fh_br_id] = br->br_id;
-+ fh[Fh_sigen] = au_sigen(sb);
-+ encode_ino(fh + Fh_ino, inode->i_ino);
-+ encode_ino(fh + Fh_dir_ino, dir->i_ino);
-+ fh[Fh_igen] = inode->i_generation;
-+
-+ *max_len -= Fh_tail;
-+ fh[Fh_h_type] = exportfs_encode_fh(h_parent, (void *)(fh + Fh_tail),
-+ max_len,
-+ /*connectable or subtreecheck*/0);
-+ err = fh[Fh_h_type];
-+ *max_len += Fh_tail;
-+ /* todo: macros? */
-+ if (err != FILEID_INVALID)
-+ err = 99;
-+ else
-+ AuWarn1("%s encode_fh failed\n", au_sbtype(h_sb));
-+
-+out_hparent:
-+ dput(h_parent);
-+out_parent:
-+ dput(parent);
-+out_unlock:
-+ ii_read_unlock(inode);
-+ si_read_unlock(sb);
-+out:
-+ if (unlikely(err < 0))
-+ err = FILEID_INVALID;
-+ return err;
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+static int aufs_commit_metadata(struct inode *inode)
-+{
-+ int err;
-+ aufs_bindex_t bindex;
-+ struct super_block *sb;
-+ struct inode *h_inode;
-+ int (*f)(struct inode *inode);
-+
-+ sb = inode->i_sb;
-+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
-+ ii_write_lock_child(inode);
-+ bindex = au_ibtop(inode);
-+ AuDebugOn(bindex < 0);
-+ h_inode = au_h_iptr(inode, bindex);
-+
-+ f = h_inode->i_sb->s_export_op->commit_metadata;
-+ if (f)
-+ err = f(h_inode);
-+ else {
-+ struct writeback_control wbc = {
-+ .sync_mode = WB_SYNC_ALL,
-+ .nr_to_write = 0 /* metadata only */
-+ };
-+
-+ err = sync_inode(h_inode, &wbc);
-+ }
-+
-+ au_cpup_attr_timesizes(inode);
-+ ii_write_unlock(inode);
-+ si_read_unlock(sb);
-+ return err;
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+static struct export_operations aufs_export_op = {
-+ .fh_to_dentry = aufs_fh_to_dentry,
-+ /* .fh_to_parent = aufs_fh_to_parent, */
-+ .encode_fh = aufs_encode_fh,
-+ .commit_metadata = aufs_commit_metadata
-+};
-+
-+void au_export_init(struct super_block *sb)
-+{
-+ struct au_sbinfo *sbinfo;
-+ __u32 u;
-+
-+ BUILD_BUG_ON_MSG(IS_BUILTIN(CONFIG_AUFS_FS)
-+ && IS_MODULE(CONFIG_EXPORTFS),
-+ AUFS_NAME ": unsupported configuration "
-+ "CONFIG_EXPORTFS=m and CONFIG_AUFS_FS=y");
-+
-+ sb->s_export_op = &aufs_export_op;
-+ sbinfo = au_sbi(sb);
-+ sbinfo->si_xigen = NULL;
-+ get_random_bytes(&u, sizeof(u));
-+ BUILD_BUG_ON(sizeof(u) != sizeof(int));
-+ atomic_set(&sbinfo->si_xigen_next, u);
-+}
-diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
---- /usr/share/empty/fs/aufs/fhsm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fhsm.c 2017-07-29 12:14:25.903042072 +0200
-@@ -0,0 +1,426 @@
-+/*
-+ * Copyright (C) 2011-2017 Junjiro R. Okajima
-+ *
-+ * This program, aufs 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, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/*
-+ * File-based Hierarchy Storage Management
-+ */
-+
-+#include <linux/anon_inodes.h>
-+#include <linux/poll.h>
-+#include <linux/seq_file.h>
-+#include <linux/statfs.h>
-+#include "aufs.h"
-+
-+static aufs_bindex_t au_fhsm_bottom(struct super_block *sb)
-+{
-+ struct au_sbinfo *sbinfo;
-+ struct au_fhsm *fhsm;
-+
-+ SiMustAnyLock(sb);
-+
-+ sbinfo = au_sbi(sb);
-+ fhsm = &sbinfo->si_fhsm;
-+ AuDebugOn(!fhsm);
-+ return fhsm->fhsm_bottom;
-+}
-+
-+void au_fhsm_set_bottom(struct super_block *sb, aufs_bindex_t bindex)
-+{
-+ struct au_sbinfo *sbinfo;
-+ struct au_fhsm *fhsm;
-+
-+ SiMustWriteLock(sb);
-+
-+ sbinfo = au_sbi(sb);
-+ fhsm = &sbinfo->si_fhsm;
-+ AuDebugOn(!fhsm);
-+ fhsm->fhsm_bottom = bindex;
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+static int au_fhsm_test_jiffy(struct au_sbinfo *sbinfo, struct au_branch *br)
-+{
-+ struct au_br_fhsm *bf;
-+
-+ bf = br->br_fhsm;
-+ MtxMustLock(&bf->bf_lock);
-+
-+ return !bf->bf_readable
-+ || time_after(jiffies,
-+ bf->bf_jiffy + sbinfo->si_fhsm.fhsm_expire);
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+static void au_fhsm_notify(struct super_block *sb, int val)
-+{
-+ struct au_sbinfo *sbinfo;
-+ struct au_fhsm *fhsm;
-+
-+ SiMustAnyLock(sb);
-+
-+ sbinfo = au_sbi(sb);
-+ fhsm = &sbinfo->si_fhsm;
-+ if (au_fhsm_pid(fhsm)
-+ && atomic_read(&fhsm->fhsm_readable) != -1) {
-+ atomic_set(&fhsm->fhsm_readable, val);
-+ if (val)
-+ wake_up(&fhsm->fhsm_wqh);
-+ }
-+}
-+
-+static int au_fhsm_stfs(struct super_block *sb, aufs_bindex_t bindex,
-+ struct aufs_stfs *rstfs, int do_lock, int do_notify)
-+{
-+ int err;
-+ struct au_branch *br;
-+ struct au_br_fhsm *bf;
-+
-+ br = au_sbr(sb, bindex);
-+ AuDebugOn(au_br_rdonly(br));
-+ bf = br->br_fhsm;
-+ AuDebugOn(!bf);
-+
-+ if (do_lock)
-+ mutex_lock(&bf->bf_lock);
-+ else
-+ MtxMustLock(&bf->bf_lock);
-+
-+ /* sb->s_root for NFS is unreliable */
-+ err = au_br_stfs(br, &bf->bf_stfs);
-+ if (unlikely(err)) {
-+ AuErr1("FHSM failed (%d), b%d, ignored.\n", bindex, err);
-+ goto out;
-+ }
-+
-+ bf->bf_jiffy = jiffies;
-+ bf->bf_readable = 1;
-+ if (do_notify)
-+ au_fhsm_notify(sb, /*val*/1);
-+ if (rstfs)
-+ *rstfs = bf->bf_stfs;
-+
-+out:
-+ if (do_lock)
-+ mutex_unlock(&bf->bf_lock);
-+ au_fhsm_notify(sb, /*val*/1);
-+
-+ return err;
-+}
-+
-+void au_fhsm_wrote(struct super_block *sb, aufs_bindex_t bindex, int force)
-+{
-+ int err;
-+ struct au_sbinfo *sbinfo;
-+ struct au_fhsm *fhsm;
-+ struct au_branch *br;
-+ struct au_br_fhsm *bf;
-+
-+ AuDbg("b%d, force %d\n", bindex, force);
-+ SiMustAnyLock(sb);
-+
-+ sbinfo = au_sbi(sb);
-+ fhsm = &sbinfo->si_fhsm;
-+ if (!au_ftest_si(sbinfo, FHSM)
-+ || fhsm->fhsm_bottom == bindex)
-+ return;
-+
-+ br = au_sbr(sb, bindex);
-+ bf = br->br_fhsm;
-+ AuDebugOn(!bf);
-+ mutex_lock(&bf->bf_lock);
-+ if (force
-+ || au_fhsm_pid(fhsm)
-+ || au_fhsm_test_jiffy(sbinfo, br))
-+ err = au_fhsm_stfs(sb, bindex, /*rstfs*/NULL, /*do_lock*/0,
-+ /*do_notify*/1);
-+ mutex_unlock(&bf->bf_lock);
-+}
-+
-+void au_fhsm_wrote_all(struct super_block *sb, int force)
-+{
-+ aufs_bindex_t bindex, bbot;
-+ struct au_branch *br;
-+
-+ /* exclude the bottom */
-+ bbot = au_fhsm_bottom(sb);
-+ for (bindex = 0; bindex < bbot; bindex++) {
-+ br = au_sbr(sb, bindex);
-+ if (au_br_fhsm(br->br_perm))
-+ au_fhsm_wrote(sb, bindex, force);
-+ }
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+static unsigned int au_fhsm_poll(struct file *file,
-+ struct poll_table_struct *wait)
-+{
-+ unsigned int mask;
-+ struct au_sbinfo *sbinfo;
-+ struct au_fhsm *fhsm;
-+
-+ mask = 0;
-+ sbinfo = file->private_data;
-+ fhsm = &sbinfo->si_fhsm;
-+ poll_wait(file, &fhsm->fhsm_wqh, wait);
-+ if (atomic_read(&fhsm->fhsm_readable))
-+ mask = POLLIN /* | POLLRDNORM */;
-+
-+ AuTraceErr((int)mask);
-+ return mask;
-+}
-+
-+static int au_fhsm_do_read_one(struct aufs_stbr __user *stbr,
-+ struct aufs_stfs *stfs, __s16 brid)
-+{
-+ int err;
-+
-+ err = copy_to_user(&stbr->stfs, stfs, sizeof(*stfs));
-+ if (!err)
-+ err = __put_user(brid, &stbr->brid);
-+ if (unlikely(err))
-+ err = -EFAULT;
-+
-+ return err;
-+}
-+
-+static ssize_t au_fhsm_do_read(struct super_block *sb,
-+ struct aufs_stbr __user *stbr, size_t count)
-+{
-+ ssize_t err;
-+ int nstbr;
-+ aufs_bindex_t bindex, bbot;
-+ struct au_branch *br;
-+ struct au_br_fhsm *bf;
-+
-+ /* except the bottom branch */
-+ err = 0;
-+ nstbr = 0;
-+ bbot = au_fhsm_bottom(sb);
-+ for (bindex = 0; !err && bindex < bbot; bindex++) {
-+ br = au_sbr(sb, bindex);
-+ if (!au_br_fhsm(br->br_perm))
-+ continue;
-+
-+ bf = br->br_fhsm;
-+ mutex_lock(&bf->bf_lock);
-+ if (bf->bf_readable) {
-+ err = -EFAULT;
-+ if (count >= sizeof(*stbr))
-+ err = au_fhsm_do_read_one(stbr++, &bf->bf_stfs,
-+ br->br_id);
-+ if (!err) {
-+ bf->bf_readable = 0;
-+ count -= sizeof(*stbr);
-+ nstbr++;
-+ }
-+ }
-+ mutex_unlock(&bf->bf_lock);
-+ }
-+ if (!err)
-+ err = sizeof(*stbr) * nstbr;
++ goto out;
++ nsi_lock.force_lock = 1;
+
-+ return err;
-+}
++ /* is this inode still cached? */
++ ino = decode_ino(fh + Fh_ino);
++ /* it should never happen */
++ if (unlikely(ino == AUFS_ROOT_INO))
++ goto out_unlock;
+
-+static ssize_t au_fhsm_read(struct file *file, char __user *buf, size_t count,
-+ loff_t *pos)
-+{
-+ ssize_t err;
-+ int readable;
-+ aufs_bindex_t nfhsm, bindex, bbot;
-+ struct au_sbinfo *sbinfo;
-+ struct au_fhsm *fhsm;
-+ struct au_branch *br;
-+ struct super_block *sb;
++ dir_ino = decode_ino(fh + Fh_dir_ino);
++ dentry = decode_by_ino(sb, ino, dir_ino);
++ if (IS_ERR(dentry))
++ goto out_unlock;
++ if (dentry)
++ goto accept;
+
-+ err = 0;
-+ sbinfo = file->private_data;
-+ fhsm = &sbinfo->si_fhsm;
-+need_data:
-+ spin_lock_irq(&fhsm->fhsm_wqh.lock);
-+ if (!atomic_read(&fhsm->fhsm_readable)) {
-+ if (vfsub_file_flags(file) & O_NONBLOCK)
-+ err = -EAGAIN;
-+ else
-+ err = wait_event_interruptible_locked_irq
-+ (fhsm->fhsm_wqh,
-+ atomic_read(&fhsm->fhsm_readable));
-+ }
-+ spin_unlock_irq(&fhsm->fhsm_wqh.lock);
-+ if (unlikely(err))
-+ goto out;
++ /* is the parent dir cached? */
++ br = au_sbr(sb, nsi_lock.bindex);
++ au_br_get(br);
++ dentry = decode_by_dir_ino(sb, ino, dir_ino, &nsi_lock);
++ if (IS_ERR(dentry))
++ goto out_unlock;
++ if (dentry)
++ goto accept;
+
-+ /* sb may already be dead */
-+ au_rw_read_lock(&sbinfo->si_rwsem);
-+ readable = atomic_read(&fhsm->fhsm_readable);
-+ if (readable > 0) {
-+ sb = sbinfo->si_sb;
-+ AuDebugOn(!sb);
-+ /* exclude the bottom branch */
-+ nfhsm = 0;
-+ bbot = au_fhsm_bottom(sb);
-+ for (bindex = 0; bindex < bbot; bindex++) {
-+ br = au_sbr(sb, bindex);
-+ if (au_br_fhsm(br->br_perm))
-+ nfhsm++;
-+ }
-+ err = -EMSGSIZE;
-+ if (nfhsm * sizeof(struct aufs_stbr) <= count) {
-+ atomic_set(&fhsm->fhsm_readable, 0);
-+ err = au_fhsm_do_read(sbinfo->si_sb, (void __user *)buf,
-+ count);
-+ }
-+ }
-+ au_rw_read_unlock(&sbinfo->si_rwsem);
-+ if (!readable)
-+ goto need_data;
++ /* lookup path */
++ dentry = decode_by_path(sb, ino, fh, fh_len, &nsi_lock);
++ if (IS_ERR(dentry))
++ goto out_unlock;
++ if (unlikely(!dentry))
++ /* todo?: make it ESTALE */
++ goto out_unlock;
+
++accept:
++ if (!au_digen_test(dentry, au_sigen(sb))
++ && d_inode(dentry)->i_generation == fh[Fh_igen])
++ goto out_unlock; /* success */
++
++ dput(dentry);
++ dentry = ERR_PTR(-ESTALE);
++out_unlock:
++ if (br)
++ au_br_put(br);
++ si_read_unlock(sb);
+out:
-+ return err;
++ AuTraceErrPtr(dentry);
++ return dentry;
+}
+
-+static int au_fhsm_release(struct inode *inode, struct file *file)
++#if 0 /* reserved for future use */
++/* support subtreecheck option */
++static struct dentry *aufs_fh_to_parent(struct super_block *sb, struct fid *fid,
++ int fh_len, int fh_type)
+{
-+ struct au_sbinfo *sbinfo;
-+ struct au_fhsm *fhsm;
++ struct dentry *parent;
++ __u32 *fh = fid->raw;
++ ino_t dir_ino;
+
-+ /* sb may already be dead */
-+ sbinfo = file->private_data;
-+ fhsm = &sbinfo->si_fhsm;
-+ spin_lock(&fhsm->fhsm_spin);
-+ fhsm->fhsm_pid = 0;
-+ spin_unlock(&fhsm->fhsm_spin);
-+ kobject_put(&sbinfo->si_kobj);
++ dir_ino = decode_ino(fh + Fh_dir_ino);
++ parent = decode_by_ino(sb, dir_ino, 0);
++ if (IS_ERR(parent))
++ goto out;
++ if (!parent)
++ parent = decode_by_path(sb, au_br_index(sb, fh[Fh_br_id]),
++ dir_ino, fh, fh_len);
+
-+ return 0;
++out:
++ AuTraceErrPtr(parent);
++ return parent;
+}
++#endif
+
-+static const struct file_operations au_fhsm_fops = {
-+ .owner = THIS_MODULE,
-+ .llseek = noop_llseek,
-+ .read = au_fhsm_read,
-+ .poll = au_fhsm_poll,
-+ .release = au_fhsm_release
-+};
++/* ---------------------------------------------------------------------- */
+
-+int au_fhsm_fd(struct super_block *sb, int oflags)
++static int aufs_encode_fh(struct inode *inode, __u32 *fh, int *max_len,
++ struct inode *dir)
+{
-+ int err, fd;
-+ struct au_sbinfo *sbinfo;
-+ struct au_fhsm *fhsm;
++ int err;
++ aufs_bindex_t bindex;
++ struct super_block *sb, *h_sb;
++ struct dentry *dentry, *parent, *h_parent;
++ struct inode *h_dir;
++ struct au_branch *br;
+
-+ err = -EPERM;
-+ if (unlikely(!capable(CAP_SYS_ADMIN)))
++ err = -ENOSPC;
++ if (unlikely(*max_len <= Fh_tail)) {
++ AuWarn1("NFSv2 client (max_len %d)?\n", *max_len);
+ goto out;
++ }
+
-+ err = -EINVAL;
-+ if (unlikely(oflags & ~(O_CLOEXEC | O_NONBLOCK)))
++ err = FILEID_ROOT;
++ if (inode->i_ino == AUFS_ROOT_INO) {
++ AuDebugOn(inode->i_ino != AUFS_ROOT_INO);
+ goto out;
++ }
+
-+ err = 0;
-+ sbinfo = au_sbi(sb);
-+ fhsm = &sbinfo->si_fhsm;
-+ spin_lock(&fhsm->fhsm_spin);
-+ if (!fhsm->fhsm_pid)
-+ fhsm->fhsm_pid = current->pid;
-+ else
-+ err = -EBUSY;
-+ spin_unlock(&fhsm->fhsm_spin);
++ h_parent = NULL;
++ sb = inode->i_sb;
++ err = si_read_lock(sb, AuLock_FLUSH);
+ if (unlikely(err))
+ goto out;
+
-+ oflags |= O_RDONLY;
-+ /* oflags |= FMODE_NONOTIFY; */
-+ fd = anon_inode_getfd("[aufs_fhsm]", &au_fhsm_fops, sbinfo, oflags);
-+ err = fd;
-+ if (unlikely(fd < 0))
-+ goto out_pid;
++#ifdef CONFIG_AUFS_DEBUG
++ if (unlikely(!au_opt_test(au_mntflags(sb), XINO)))
++ AuWarn1("NFS-exporting requires xino\n");
++#endif
++ err = -EIO;
++ parent = NULL;
++ ii_read_lock_child(inode);
++ bindex = au_ibtop(inode);
++ if (!dir) {
++ dentry = d_find_any_alias(inode);
++ if (unlikely(!dentry))
++ goto out_unlock;
++ AuDebugOn(au_test_anon(dentry));
++ parent = dget_parent(dentry);
++ dput(dentry);
++ if (unlikely(!parent))
++ goto out_unlock;
++ if (d_really_is_positive(parent))
++ dir = d_inode(parent);
++ }
+
-+ /* succeed reglardless 'fhsm' status */
-+ kobject_get(&sbinfo->si_kobj);
-+ si_noflush_read_lock(sb);
-+ if (au_ftest_si(sbinfo, FHSM))
-+ au_fhsm_wrote_all(sb, /*force*/0);
-+ si_read_unlock(sb);
-+ goto out; /* success */
++ ii_read_lock_parent(dir);
++ h_dir = au_h_iptr(dir, bindex);
++ ii_read_unlock(dir);
++ if (unlikely(!h_dir))
++ goto out_parent;
++ h_parent = d_find_any_alias(h_dir);
++ if (unlikely(!h_parent))
++ goto out_hparent;
+
-+out_pid:
-+ spin_lock(&fhsm->fhsm_spin);
-+ fhsm->fhsm_pid = 0;
-+ spin_unlock(&fhsm->fhsm_spin);
++ err = -EPERM;
++ br = au_sbr(sb, bindex);
++ h_sb = au_br_sb(br);
++ if (unlikely(!h_sb->s_export_op)) {
++ AuErr1("%s branch is not exportable\n", au_sbtype(h_sb));
++ goto out_hparent;
++ }
++
++ fh[Fh_br_id] = br->br_id;
++ fh[Fh_sigen] = au_sigen(sb);
++ encode_ino(fh + Fh_ino, inode->i_ino);
++ encode_ino(fh + Fh_dir_ino, dir->i_ino);
++ fh[Fh_igen] = inode->i_generation;
++
++ *max_len -= Fh_tail;
++ fh[Fh_h_type] = exportfs_encode_fh(h_parent, (void *)(fh + Fh_tail),
++ max_len,
++ /*connectable or subtreecheck*/0);
++ err = fh[Fh_h_type];
++ *max_len += Fh_tail;
++ /* todo: macros? */
++ if (err != FILEID_INVALID)
++ err = 99;
++ else
++ AuWarn1("%s encode_fh failed\n", au_sbtype(h_sb));
++
++out_hparent:
++ dput(h_parent);
++out_parent:
++ dput(parent);
++out_unlock:
++ ii_read_unlock(inode);
++ si_read_unlock(sb);
+out:
-+ AuTraceErr(err);
++ if (unlikely(err < 0))
++ err = FILEID_INVALID;
+ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
-+int au_fhsm_br_alloc(struct au_branch *br)
++static int aufs_commit_metadata(struct inode *inode)
+{
+ int err;
++ aufs_bindex_t bindex;
++ struct super_block *sb;
++ struct inode *h_inode;
++ int (*f)(struct inode *inode);
+
-+ err = 0;
-+ br->br_fhsm = kmalloc(sizeof(*br->br_fhsm), GFP_NOFS);
-+ if (br->br_fhsm)
-+ au_br_fhsm_init(br->br_fhsm);
-+ else
-+ err = -ENOMEM;
++ sb = inode->i_sb;
++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
++ ii_write_lock_child(inode);
++ bindex = au_ibtop(inode);
++ AuDebugOn(bindex < 0);
++ h_inode = au_h_iptr(inode, bindex);
+
-+ return err;
-+}
++ f = h_inode->i_sb->s_export_op->commit_metadata;
++ if (f)
++ err = f(h_inode);
++ else {
++ struct writeback_control wbc = {
++ .sync_mode = WB_SYNC_ALL,
++ .nr_to_write = 0 /* metadata only */
++ };
+
-+/* ---------------------------------------------------------------------- */
++ err = sync_inode(h_inode, &wbc);
++ }
+
-+void au_fhsm_fin(struct super_block *sb)
-+{
-+ au_fhsm_notify(sb, /*val*/-1);
++ au_cpup_attr_timesizes(inode);
++ ii_write_unlock(inode);
++ si_read_unlock(sb);
++ return err;
+}
+
-+void au_fhsm_init(struct au_sbinfo *sbinfo)
-+{
-+ struct au_fhsm *fhsm;
-+
-+ fhsm = &sbinfo->si_fhsm;
-+ spin_lock_init(&fhsm->fhsm_spin);
-+ init_waitqueue_head(&fhsm->fhsm_wqh);
-+ atomic_set(&fhsm->fhsm_readable, 0);
-+ fhsm->fhsm_expire
-+ = msecs_to_jiffies(AUFS_FHSM_CACHE_DEF_SEC * MSEC_PER_SEC);
-+ fhsm->fhsm_bottom = -1;
-+}
++/* ---------------------------------------------------------------------- */
+
-+void au_fhsm_set(struct au_sbinfo *sbinfo, unsigned int sec)
-+{
-+ sbinfo->si_fhsm.fhsm_expire
-+ = msecs_to_jiffies(sec * MSEC_PER_SEC);
-+}
++static struct export_operations aufs_export_op = {
++ .fh_to_dentry = aufs_fh_to_dentry,
++ /* .fh_to_parent = aufs_fh_to_parent, */
++ .encode_fh = aufs_encode_fh,
++ .commit_metadata = aufs_commit_metadata
++};
+
-+void au_fhsm_show(struct seq_file *seq, struct au_sbinfo *sbinfo)
++void au_export_init(struct super_block *sb)
+{
-+ unsigned int u;
++ struct au_sbinfo *sbinfo;
++ __u32 u;
+
-+ if (!au_ftest_si(sbinfo, FHSM))
-+ return;
++ BUILD_BUG_ON_MSG(IS_BUILTIN(CONFIG_AUFS_FS)
++ && IS_MODULE(CONFIG_EXPORTFS),
++ AUFS_NAME ": unsupported configuration "
++ "CONFIG_EXPORTFS=m and CONFIG_AUFS_FS=y");
+
-+ u = jiffies_to_msecs(sbinfo->si_fhsm.fhsm_expire) / MSEC_PER_SEC;
-+ if (u != AUFS_FHSM_CACHE_DEF_SEC)
-+ seq_printf(seq, ",fhsm_sec=%u", u);
++ sb->s_export_op = &aufs_export_op;
++ sbinfo = au_sbi(sb);
++ sbinfo->si_xigen = NULL;
++ get_random_bytes(&u, sizeof(u));
++ BUILD_BUG_ON(sizeof(u) != sizeof(int));
++ atomic_set(&sbinfo->si_xigen_next, u);
+}
-diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
---- /usr/share/empty/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c 2017-11-12 22:24:44.704244405 +0100
-@@ -0,0 +1,856 @@
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/f_op.c linux-4.14/fs/aufs/f_op.c
+--- linux-4.14/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/f_op.c 2021-02-24 21:42:43.447781402 +0100
+@@ -0,0 +1,817 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ *
+ */
+
+/*
-+ * handling file/dir, and address_space operation
++ * file and vm operations
+ */
+
-+#ifdef CONFIG_AUFS_DEBUG
-+#include <linux/migrate.h>
-+#endif
-+#include <linux/pagemap.h>
++#include <linux/aio.h>
++#include <linux/fs_stack.h>
++#include <linux/mman.h>
++#include <linux/security.h>
+#include "aufs.h"
+
-+/* drop flags for writing */
-+unsigned int au_file_roflags(unsigned int flags)
++int au_do_open_nondir(struct file *file, int flags, struct file *h_file)
+{
-+ flags &= ~(O_WRONLY | O_RDWR | O_APPEND | O_CREAT | O_TRUNC);
-+ flags |= O_RDONLY | O_NOATIME;
-+ return flags;
++ int err;
++ aufs_bindex_t bindex;
++ struct dentry *dentry, *h_dentry;
++ struct au_finfo *finfo;
++ struct inode *h_inode;
++
++ FiMustWriteLock(file);
++
++ 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_dbtop(dentry);
++ if (!h_file) {
++ h_dentry = au_h_dptr(dentry, bindex);
++ err = vfsub_test_mntns(file->f_path.mnt, h_dentry->d_sb);
++ if (unlikely(err))
++ goto out;
++ h_file = au_h_open(dentry, bindex, flags, file, /*force_wr*/0);
++ } else {
++ h_dentry = h_file->f_path.dentry;
++ err = vfsub_test_mntns(file->f_path.mnt, h_dentry->d_sb);
++ if (unlikely(err))
++ goto out;
++ get_file(h_file);
++ }
++ if (IS_ERR(h_file))
++ err = PTR_ERR(h_file);
++ else {
++ if ((flags & __O_TMPFILE)
++ && !(flags & O_EXCL)) {
++ h_inode = file_inode(h_file);
++ spin_lock(&h_inode->i_lock);
++ h_inode->i_state |= I_LINKABLE;
++ spin_unlock(&h_inode->i_lock);
++ }
++ au_set_fbtop(file, bindex);
++ au_set_h_fptr(file, bindex, h_file);
++ au_update_figen(file);
++ /* todo: necessary? */
++ /* file->f_ra = h_file->f_ra; */
++ }
++
++out:
++ return err;
+}
+
-+/* common functions to regular file and dir */
-+struct file *au_h_open(struct dentry *dentry, aufs_bindex_t bindex, int flags,
-+ struct file *file, int force_wr)
++static int aufs_open_nondir(struct inode *inode __maybe_unused,
++ struct file *file)
+{
-+ struct file *h_file;
-+ struct dentry *h_dentry;
-+ struct inode *h_inode;
++ int err;
+ struct super_block *sb;
-+ struct au_branch *br;
-+ struct path h_path;
++ 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, &args);
++ si_read_unlock(sb);
++ return err;
++}
++
++int aufs_release_nondir(struct inode *inode __maybe_unused, struct file *file)
++{
++ struct au_finfo *finfo;
++ aufs_bindex_t bindex;
++
++ finfo = au_fi(file);
++ au_hbl_del(&finfo->fi_hlist,
++ &au_sbi(file->f_path.dentry->d_sb)->si_files);
++ bindex = finfo->fi_btop;
++ if (bindex >= 0)
++ au_set_h_fptr(file, bindex, NULL);
++
++ au_finfo_fin(file);
++ return 0;
++}
++
++/* ---------------------------------------------------------------------- */
++
++static int au_do_flush_nondir(struct file *file, fl_owner_t id)
++{
+ int err;
++ struct file *h_file;
+
-+ /* a race condition can happen between open and unlink/rmdir */
-+ h_file = ERR_PTR(-ENOENT);
-+ h_dentry = au_h_dptr(dentry, bindex);
-+ if (au_test_nfsd() && (!h_dentry || d_is_negative(h_dentry)))
-+ goto out;
-+ h_inode = d_inode(h_dentry);
-+ spin_lock(&h_dentry->d_lock);
-+ err = (!d_unhashed(dentry) && d_unlinked(h_dentry))
-+ /* || !d_inode(dentry)->i_nlink */
-+ ;
-+ spin_unlock(&h_dentry->d_lock);
-+ if (unlikely(err))
-+ goto out;
++ err = 0;
++ h_file = au_hf_top(file);
++ if (h_file)
++ err = vfsub_flush(h_file, id);
++ return err;
++}
++
++static int aufs_flush_nondir(struct file *file, fl_owner_t id)
++{
++ return au_do_flush(file, id, au_do_flush_nondir);
++}
++
++/* ---------------------------------------------------------------------- */
++/*
++ * read and write functions acquire [fdi]_rwsem once, but release before
++ * mmap_sem. This is because to stop a race condition between mmap(2).
++ * Releasing these aufs-rwsem should be safe, no branch-mamagement (by keeping
++ * si_rwsem), no harmful copy-up should happen. Actually copy-up may happen in
++ * read functions after [fdi]_rwsem are released, but it should be harmless.
++ */
++
++/* Callers should call au_read_post() or fput() in the end */
++struct file *au_read_pre(struct file *file, int keep_fi, unsigned int lsc)
++{
++ struct file *h_file;
++ int err;
++
++ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0, lsc);
++ 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 {
++ /* input */
++ unsigned int lsc;
++
++ /* output */
++ blkcnt_t blks;
++ aufs_bindex_t btop;
++};
++
++/*
++ * 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;
++ unsigned int lsc;
++ struct au_pin pin;
+
-+ sb = dentry->d_sb;
-+ br = au_sbr(sb, bindex);
-+ err = au_br_test_oflag(flags, br);
++ lsc = 0;
++ if (wpre)
++ lsc = wpre->lsc;
++ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1, lsc);
+ h_file = ERR_PTR(err);
+ if (unlikely(err))
+ goto out;
+
-+ /* drop flags for writing */
-+ if (au_test_ro(sb, bindex, d_inode(dentry))) {
-+ if (force_wr && !(flags & O_WRONLY))
-+ force_wr = 0;
-+ flags = au_file_roflags(flags);
-+ if (force_wr) {
-+ h_file = ERR_PTR(-EROFS);
-+ flags = au_file_roflags(flags);
-+ if (unlikely(vfsub_native_ro(h_inode)
-+ || IS_APPEND(h_inode)))
-+ goto out;
-+ flags &= ~O_ACCMODE;
-+ flags |= O_WRONLY;
-+ }
-+ }
-+ flags &= ~O_CREAT;
-+ au_br_get(br);
-+ h_path.dentry = h_dentry;
-+ h_path.mnt = au_br_mnt(br);
-+ h_file = vfsub_dentry_open(&h_path, flags);
-+ if (IS_ERR(h_file))
-+ goto out_br;
-+
-+ if (flags & __FMODE_EXEC) {
-+ err = deny_write_access(h_file);
++ dentry = file->f_path.dentry;
++ if (do_ready) {
++ err = au_ready_to_write(file, -1, &pin);
+ if (unlikely(err)) {
-+ fput(h_file);
+ h_file = ERR_PTR(err);
-+ goto out_br;
++ di_write_unlock(dentry);
++ goto out_fi;
+ }
+ }
-+ fsnotify_open(h_file);
-+ goto out; /* success */
+
-+out_br:
-+ au_br_put(br);
++ di_downgrade_lock(dentry, /*flags*/0);
++ if (wpre)
++ wpre->btop = au_fbtop(file);
++ h_file = au_hf_top(file);
++ get_file(h_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 int au_cmoo(struct dentry *dentry)
++static void au_write_post(struct inode *inode, struct file *h_file,
++ struct au_write_pre *wpre, ssize_t written)
+{
-+ int err, cmoo, matched;
-+ unsigned int udba;
-+ struct path h_path;
-+ struct au_pin pin;
-+ struct au_cp_generic cpg = {
-+ .dentry = dentry,
-+ .bdst = -1,
-+ .bsrc = -1,
-+ .len = -1,
-+ .pin = &pin,
-+ .flags = AuCpup_DTIME | AuCpup_HOPEN
-+ };
-+ struct inode *delegated;
++ struct inode *h_inode;
++
++ au_cpup_attr_timesizes(inode);
++ AuDebugOn(au_ibtop(inode) != wpre->btop);
++ h_inode = file_inode(h_file);
++ inode->i_mode = h_inode->i_mode;
++ ii_write_unlock(inode);
++ /* AuDbg("blks %llu, %llu\n", (u64)blks, (u64)h_inode->i_blocks); */
++ if (written > 0)
++ au_fhsm_wrote(inode->i_sb, wpre->btop,
++ /*force*/h_inode->i_blocks > wpre->blks);
++ fput(h_file);
++}
++
++static ssize_t aufs_read(struct file *file, char __user *buf, size_t count,
++ loff_t *ppos)
++{
++ ssize_t err;
++ struct inode *inode;
++ struct file *h_file;
+ struct super_block *sb;
-+ struct au_sbinfo *sbinfo;
-+ struct au_fhsm *fhsm;
-+ pid_t pid;
-+ struct au_branch *br;
-+ struct dentry *parent;
-+ struct au_hinode *hdir;
+
-+ DiMustWriteLock(dentry);
-+ IiMustWriteLock(d_inode(dentry));
++ inode = file_inode(file);
++ sb = inode->i_sb;
++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
+
-+ err = 0;
-+ if (IS_ROOT(dentry))
-+ goto out;
-+ cpg.bsrc = au_dbtop(dentry);
-+ if (!cpg.bsrc)
++ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
+ goto out;
+
-+ sb = dentry->d_sb;
-+ sbinfo = au_sbi(sb);
-+ fhsm = &sbinfo->si_fhsm;
-+ pid = au_fhsm_pid(fhsm);
-+ rcu_read_lock();
-+ matched = (pid
-+ && (current->pid == pid
-+ || rcu_dereference(current->real_parent)->pid == pid));
-+ rcu_read_unlock();
-+ if (matched)
-+ 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; */
++ au_read_post(inode, h_file);
+
-+ br = au_sbr(sb, cpg.bsrc);
-+ cmoo = au_br_cmoo(br->br_perm);
-+ if (!cmoo)
-+ goto out;
-+ if (!d_is_reg(dentry))
-+ cmoo &= AuBrAttr_COO_ALL;
-+ if (!cmoo)
-+ goto out;
++out:
++ si_read_unlock(sb);
++ return err;
++}
+
-+ parent = dget_parent(dentry);
-+ di_write_lock_parent(parent);
-+ err = au_wbr_do_copyup_bu(dentry, cpg.bsrc - 1);
-+ cpg.bdst = err;
-+ if (unlikely(err < 0)) {
-+ err = 0; /* there is no upper writable branch */
-+ goto out_dgrade;
-+ }
-+ AuDbg("bsrc %d, bdst %d\n", cpg.bsrc, cpg.bdst);
++/*
++ * todo: very ugly
++ * it locks both of i_mutex and si_rwsem for read in safe.
++ * if the plink maintenance mode continues forever (that is the problem),
++ * may loop forever.
++ */
++static void au_mtx_and_read_lock(struct inode *inode)
++{
++ int err;
++ struct super_block *sb = inode->i_sb;
+
-+ /* do not respect the coo attrib for the target branch */
-+ err = au_cpup_dirs(dentry, cpg.bdst);
-+ if (unlikely(err))
-+ goto out_dgrade;
++ while (1) {
++ inode_lock(inode);
++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
++ if (!err)
++ break;
++ inode_unlock(inode);
++ si_read_lock(sb, AuLock_NOPLMW);
++ si_read_unlock(sb);
++ }
++}
+
-+ di_downgrade_lock(parent, AuLock_IR);
-+ udba = au_opt_udba(sb);
-+ err = au_pin(&pin, dentry, cpg.bdst, udba,
-+ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
-+ if (unlikely(err))
-+ goto out_parent;
++static ssize_t aufs_write(struct file *file, const char __user *ubuf,
++ size_t count, loff_t *ppos)
++{
++ ssize_t err;
++ struct au_write_pre wpre;
++ struct inode *inode;
++ struct file *h_file;
++ char __user *buf = (char __user *)ubuf;
+
-+ err = au_sio_cpup_simple(&cpg);
-+ au_unpin(&pin);
-+ if (unlikely(err))
-+ goto out_parent;
-+ if (!(cmoo & AuBrWAttr_MOO))
-+ goto out_parent; /* success */
++ inode = file_inode(file);
++ au_mtx_and_read_lock(inode);
+
-+ err = au_pin(&pin, dentry, cpg.bsrc, udba,
-+ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
-+ if (unlikely(err))
-+ goto out_parent;
++ wpre.lsc = 0;
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
+
-+ h_path.mnt = au_br_mnt(br);
-+ h_path.dentry = au_h_dptr(dentry, cpg.bsrc);
-+ hdir = au_hi(d_inode(parent), cpg.bsrc);
-+ delegated = NULL;
-+ err = vfsub_unlink(hdir->hi_inode, &h_path, &delegated, /*force*/1);
-+ au_unpin(&pin);
-+ /* todo: keep h_dentry or not? */
-+ if (unlikely(err == -EWOULDBLOCK)) {
-+ pr_warn("cannot retry for NFSv4 delegation"
-+ " for an internal unlink\n");
-+ iput(delegated);
-+ }
-+ if (unlikely(err)) {
-+ pr_err("unlink %pd after coo failed (%d), ignored\n",
-+ dentry, err);
-+ err = 0;
-+ }
-+ goto out_parent; /* success */
++ err = vfsub_write_u(h_file, buf, count, ppos);
++ au_write_post(inode, h_file, &wpre, err);
+
-+out_dgrade:
-+ di_downgrade_lock(parent, AuLock_IR);
-+out_parent:
-+ di_read_unlock(parent, AuLock_IR);
-+ dput(parent);
+out:
-+ AuTraceErr(err);
++ si_read_unlock(inode->i_sb);
++ inode_unlock(inode);
+ return err;
+}
+
-+int au_do_open(struct file *file, struct au_do_open_args *args)
++static ssize_t au_do_iter(struct file *h_file, int rw, struct kiocb *kio,
++ struct iov_iter *iov_iter)
+{
-+ int err, aopen = args->aopen;
-+ struct dentry *dentry;
-+ struct au_finfo *finfo;
++ ssize_t err;
++ struct file *file;
++ ssize_t (*iter)(struct kiocb *, struct iov_iter *);
+
-+ if (!aopen)
-+ err = au_finfo_init(file, args->fidir);
-+ else {
-+ lockdep_off();
-+ err = au_finfo_init(file, args->fidir);
-+ lockdep_on();
-+ }
++ err = security_file_permission(h_file, rw);
+ if (unlikely(err))
+ goto out;
+
-+ dentry = file->f_path.dentry;
-+ AuDebugOn(IS_ERR_OR_NULL(dentry));
-+ di_write_lock_child(dentry);
-+ err = au_cmoo(dentry);
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ if (!err) {
-+ if (!aopen)
-+ err = args->open(file, vfsub_file_flags(file), NULL);
-+ else {
-+ lockdep_off();
-+ err = args->open(file, vfsub_file_flags(file), NULL);
-+ lockdep_on();
-+ }
-+ }
-+ di_read_unlock(dentry, AuLock_IR);
++ err = -ENOSYS;
++ iter = NULL;
++ if (rw == MAY_READ)
++ iter = h_file->f_op->read_iter;
++ else if (rw == MAY_WRITE)
++ iter = h_file->f_op->write_iter;
+
-+ finfo = au_fi(file);
-+ if (!err) {
-+ finfo->fi_file = file;
-+ au_hbl_add(&finfo->fi_hlist,
-+ &au_sbi(file->f_path.dentry->d_sb)->si_files);
-+ }
-+ if (!aopen)
-+ fi_write_unlock(file);
-+ else {
++ file = kio->ki_filp;
++ kio->ki_filp = h_file;
++ if (iter) {
+ lockdep_off();
-+ fi_write_unlock(file);
++ err = iter(kio, iov_iter);
+ lockdep_on();
-+ }
-+ if (unlikely(err)) {
-+ finfo->fi_hdir = NULL;
-+ au_finfo_fin(file);
-+ }
++ } else
++ /* currently there is no such fs */
++ WARN_ON_ONCE(1);
++ kio->ki_filp = file;
+
+out:
-+ AuTraceErr(err);
+ return err;
+}
+
-+int au_reopen_nondir(struct file *file)
++static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
+{
-+ int err;
-+ aufs_bindex_t btop;
-+ struct dentry *dentry;
-+ struct file *h_file, *h_file_tmp;
++ ssize_t err;
++ struct file *file, *h_file;
++ struct inode *inode;
++ struct super_block *sb;
+
-+ dentry = file->f_path.dentry;
-+ btop = au_dbtop(dentry);
-+ h_file_tmp = NULL;
-+ if (au_fbtop(file) == btop) {
-+ h_file = au_hf_top(file);
-+ if (file->f_mode == h_file->f_mode)
-+ return 0; /* success */
-+ h_file_tmp = h_file;
-+ get_file(h_file_tmp);
-+ au_set_h_fptr(file, btop, NULL);
-+ }
-+ AuDebugOn(au_fi(file)->fi_hdir);
-+ /*
-+ * it can happen
-+ * file exists on both of rw and ro
-+ * open --> dbtop and fbtop are both 0
-+ * prepend a branch as rw, "rw" become ro
-+ * remove rw/file
-+ * delete the top branch, "rw" becomes rw again
-+ * --> dbtop is 1, fbtop is still 0
-+ * write --> fbtop is 0 but dbtop is 1
-+ */
-+ /* AuDebugOn(au_fbtop(file) < btop); */
++ file = kio->ki_filp;
++ inode = file_inode(file);
++ sb = inode->i_sb;
++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
+
-+ h_file = au_h_open(dentry, btop, vfsub_file_flags(file) & ~O_TRUNC,
-+ file, /*force_wr*/0);
++ h_file = au_read_pre(file, /*keep_fi*/1, /*lsc*/0);
+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file)) {
-+ if (h_file_tmp) {
-+ au_sbr_get(dentry->d_sb, btop);
-+ au_set_h_fptr(file, btop, h_file_tmp);
-+ h_file_tmp = NULL;
++ if (IS_ERR(h_file))
++ goto out;
++
++ 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;
++ smp_mb(); /* unnecessary? */
+ }
-+ goto out; /* todo: close all? */
+ }
++ fi_read_unlock(file);
+
-+ err = 0;
-+ au_set_fbtop(file, btop);
-+ au_set_h_fptr(file, btop, h_file);
-+ au_update_figen(file);
++ err = au_do_iter(h_file, MAY_READ, kio, iov_iter);
+ /* todo: necessary? */
+ /* file->f_ra = h_file->f_ra; */
++ au_read_post(inode, h_file);
+
+out:
-+ if (h_file_tmp)
-+ fput(h_file_tmp);
++ si_read_unlock(sb);
+ return err;
+}
+
-+/* ---------------------------------------------------------------------- */
++static ssize_t aufs_write_iter(struct kiocb *kio, struct iov_iter *iov_iter)
++{
++ ssize_t err;
++ struct au_write_pre wpre;
++ struct inode *inode;
++ struct file *file, *h_file;
+
-+static int au_reopen_wh(struct file *file, aufs_bindex_t btgt,
-+ struct dentry *hi_wh)
++ file = kio->ki_filp;
++ inode = file_inode(file);
++ au_mtx_and_read_lock(inode);
++
++ wpre.lsc = 0;
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
++
++ err = au_do_iter(h_file, MAY_WRITE, kio, iov_iter);
++ au_write_post(inode, h_file, &wpre, err);
++
++out:
++ si_read_unlock(inode->i_sb);
++ inode_unlock(inode);
++ return err;
++}
++
++static ssize_t aufs_splice_read(struct file *file, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags)
+{
-+ int err;
-+ aufs_bindex_t btop;
-+ struct au_dinfo *dinfo;
-+ struct dentry *h_dentry;
-+ struct au_hdentry *hdp;
++ ssize_t err;
++ struct file *h_file;
++ struct inode *inode;
++ struct super_block *sb;
+
-+ dinfo = au_di(file->f_path.dentry);
-+ AuRwMustWriteLock(&dinfo->di_rwsem);
++ inode = file_inode(file);
++ sb = inode->i_sb;
++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
+
-+ btop = dinfo->di_btop;
-+ dinfo->di_btop = btgt;
-+ hdp = au_hdentry(dinfo, btgt);
-+ h_dentry = hdp->hd_dentry;
-+ hdp->hd_dentry = hi_wh;
-+ err = au_reopen_nondir(file);
-+ hdp->hd_dentry = h_dentry;
-+ dinfo->di_btop = btop;
++ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
++
++ err = vfsub_splice_to(h_file, ppos, pipe, len, flags);
++ /* todo: necessasry? */
++ /* file->f_ra = h_file->f_ra; */
++ au_read_post(inode, h_file);
+
++out:
++ si_read_unlock(sb);
+ return err;
+}
+
-+static int au_ready_to_write_wh(struct file *file, loff_t len,
-+ aufs_bindex_t bcpup, struct au_pin *pin)
++static ssize_t
++aufs_splice_write(struct pipe_inode_info *pipe, struct file *file, loff_t *ppos,
++ size_t len, unsigned int flags)
+{
-+ int err;
-+ struct inode *inode, *h_inode;
-+ struct dentry *h_dentry, *hi_wh;
-+ struct au_cp_generic cpg = {
-+ .dentry = file->f_path.dentry,
-+ .bdst = bcpup,
-+ .bsrc = -1,
-+ .len = len,
-+ .pin = pin
-+ };
++ ssize_t err;
++ struct au_write_pre wpre;
++ struct inode *inode;
++ struct file *h_file;
+
-+ au_update_dbtop(cpg.dentry);
-+ inode = d_inode(cpg.dentry);
-+ h_inode = NULL;
-+ if (au_dbtop(cpg.dentry) <= bcpup
-+ && au_dbbot(cpg.dentry) >= bcpup) {
-+ h_dentry = au_h_dptr(cpg.dentry, bcpup);
-+ if (h_dentry && d_is_positive(h_dentry))
-+ h_inode = d_inode(h_dentry);
-+ }
-+ hi_wh = au_hi_wh(inode, bcpup);
-+ if (!hi_wh && !h_inode)
-+ err = au_sio_cpup_wh(&cpg, file);
-+ else
-+ /* already copied-up after unlink */
-+ err = au_reopen_wh(file, bcpup, hi_wh);
++ inode = file_inode(file);
++ au_mtx_and_read_lock(inode);
+
-+ if (!err
-+ && (inode->i_nlink > 1
-+ || (inode->i_state & I_LINKABLE))
-+ && au_opt_test(au_mntflags(cpg.dentry->d_sb), PLINK))
-+ au_plink_append(inode, bcpup, au_h_dptr(cpg.dentry, bcpup));
++ wpre.lsc = 0;
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
++
++ err = vfsub_splice_from(pipe, h_file, ppos, len, flags);
++ au_write_post(inode, h_file, &wpre, err);
++
++out:
++ si_read_unlock(inode->i_sb);
++ inode_unlock(inode);
++ return err;
++}
++
++static long aufs_fallocate(struct file *file, int mode, loff_t offset,
++ loff_t len)
++{
++ long err;
++ struct au_write_pre wpre;
++ struct inode *inode;
++ struct file *h_file;
++
++ inode = file_inode(file);
++ au_mtx_and_read_lock(inode);
++
++ wpre.lsc = 0;
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
+
++ lockdep_off();
++ err = vfs_fallocate(h_file, mode, offset, len);
++ lockdep_on();
++ au_write_post(inode, h_file, &wpre, /*written*/1);
++
++out:
++ si_read_unlock(inode->i_sb);
++ inode_unlock(inode);
+ return err;
+}
+
-+/*
-+ * prepare the @file for writing.
-+ */
-+int au_ready_to_write(struct file *file, loff_t len, struct au_pin *pin)
++static ssize_t aufs_copy_file_range(struct file *src, loff_t src_pos,
++ struct file *dst, loff_t dst_pos,
++ size_t len, unsigned int flags)
+{
-+ int err;
-+ aufs_bindex_t dbtop;
-+ struct dentry *parent;
-+ struct inode *inode;
-+ struct super_block *sb;
-+ struct file *h_file;
-+ struct au_cp_generic cpg = {
-+ .dentry = file->f_path.dentry,
-+ .bdst = -1,
-+ .bsrc = -1,
-+ .len = len,
-+ .pin = pin,
-+ .flags = AuCpup_DTIME
-+ };
++ ssize_t err;
++ struct au_write_pre wpre;
++ enum { SRC, DST };
++ struct {
++ struct inode *inode;
++ struct file *h_file;
++ struct super_block *h_sb;
++ } a[2];
++#define a_src a[SRC]
++#define a_dst a[DST]
+
-+ sb = cpg.dentry->d_sb;
-+ inode = d_inode(cpg.dentry);
-+ cpg.bsrc = au_fbtop(file);
-+ err = au_test_ro(sb, cpg.bsrc, inode);
-+ if (!err && (au_hf_top(file)->f_mode & FMODE_WRITE)) {
-+ err = au_pin(pin, cpg.dentry, cpg.bsrc, AuOpt_UDBA_NONE,
-+ /*flags*/0);
++ err = -EINVAL;
++ a_src.inode = file_inode(src);
++ if (unlikely(!S_ISREG(a_src.inode->i_mode)))
++ goto out;
++ a_dst.inode = file_inode(dst);
++ if (unlikely(!S_ISREG(a_dst.inode->i_mode)))
+ goto out;
-+ }
-+
-+ /* need to cpup or reopen */
-+ parent = dget_parent(cpg.dentry);
-+ di_write_lock_parent(parent);
-+ err = AuWbrCopyup(au_sbi(sb), cpg.dentry);
-+ cpg.bdst = err;
-+ if (unlikely(err < 0))
-+ goto out_dgrade;
-+ err = 0;
-+
-+ if (!d_unhashed(cpg.dentry) && !au_h_dptr(parent, cpg.bdst)) {
-+ err = au_cpup_dirs(cpg.dentry, cpg.bdst);
-+ if (unlikely(err))
-+ goto out_dgrade;
-+ }
+
-+ err = au_pin(pin, cpg.dentry, cpg.bdst, AuOpt_UDBA_NONE,
-+ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
-+ if (unlikely(err))
-+ goto out_dgrade;
++ au_mtx_and_read_lock(a_dst.inode);
++ /*
++ * in order to match the order in di_write_lock2_{child,parent}(),
++ * use f_path.dentry for this comparision.
++ */
++ if (src->f_path.dentry < dst->f_path.dentry) {
++ a_src.h_file = au_read_pre(src, /*keep_fi*/1, AuLsc_FI_1);
++ err = PTR_ERR(a_src.h_file);
++ if (IS_ERR(a_src.h_file))
++ goto out_si;
+
-+ dbtop = au_dbtop(cpg.dentry);
-+ if (dbtop <= cpg.bdst)
-+ cpg.bsrc = cpg.bdst;
++ wpre.lsc = AuLsc_FI_2;
++ a_dst.h_file = au_write_pre(dst, /*do_ready*/1, &wpre);
++ err = PTR_ERR(a_dst.h_file);
++ if (IS_ERR(a_dst.h_file)) {
++ au_read_post(a_src.inode, a_src.h_file);
++ goto out_si;
++ }
++ } else {
++ wpre.lsc = AuLsc_FI_1;
++ a_dst.h_file = au_write_pre(dst, /*do_ready*/1, &wpre);
++ err = PTR_ERR(a_dst.h_file);
++ if (IS_ERR(a_dst.h_file))
++ goto out_si;
+
-+ if (dbtop <= cpg.bdst /* just reopen */
-+ || !d_unhashed(cpg.dentry) /* copyup and reopen */
-+ ) {
-+ h_file = au_h_open_pre(cpg.dentry, cpg.bsrc, /*force_wr*/0);
-+ if (IS_ERR(h_file))
-+ err = PTR_ERR(h_file);
-+ else {
-+ di_downgrade_lock(parent, AuLock_IR);
-+ if (dbtop > cpg.bdst)
-+ err = au_sio_cpup_simple(&cpg);
-+ if (!err)
-+ err = au_reopen_nondir(file);
-+ au_h_open_post(cpg.dentry, cpg.bsrc, h_file);
++ a_src.h_file = au_read_pre(src, /*keep_fi*/1, AuLsc_FI_2);
++ err = PTR_ERR(a_src.h_file);
++ if (IS_ERR(a_src.h_file)) {
++ au_write_post(a_dst.inode, a_dst.h_file, &wpre,
++ /*written*/0);
++ goto out_si;
+ }
-+ } else { /* copyup as wh and reopen */
-+ /*
-+ * since writable hfsplus branch is not supported,
-+ * h_open_pre/post() are unnecessary.
-+ */
-+ err = au_ready_to_write_wh(file, len, cpg.bdst, pin);
-+ di_downgrade_lock(parent, AuLock_IR);
+ }
+
-+ if (!err) {
-+ au_pin_set_parent_lflag(pin, /*lflag*/0);
-+ goto out_dput; /* success */
++ err = -EXDEV;
++ a_src.h_sb = file_inode(a_src.h_file)->i_sb;
++ a_dst.h_sb = file_inode(a_dst.h_file)->i_sb;
++ if (unlikely(a_src.h_sb != a_dst.h_sb)) {
++ AuDbgFile(src);
++ AuDbgFile(dst);
++ goto out_file;
+ }
-+ au_unpin(pin);
-+ goto out_unlock;
+
-+out_dgrade:
-+ di_downgrade_lock(parent, AuLock_IR);
-+out_unlock:
-+ di_read_unlock(parent, AuLock_IR);
-+out_dput:
-+ dput(parent);
++ err = vfsub_copy_file_range(a_src.h_file, src_pos, a_dst.h_file,
++ dst_pos, len, flags);
++
++out_file:
++ au_write_post(a_dst.inode, a_dst.h_file, &wpre, err);
++ fi_read_unlock(src);
++ au_read_post(a_src.inode, a_src.h_file);
++out_si:
++ si_read_unlock(a_dst.inode->i_sb);
++ inode_unlock(a_dst.inode);
+out:
+ return err;
++#undef a_src
++#undef a_dst
+}
+
+/* ---------------------------------------------------------------------- */
+
-+int au_do_flush(struct file *file, fl_owner_t id,
-+ int (*flush)(struct file *file, fl_owner_t id))
++/*
++ * The locking order around current->mmap_sem.
++ * - in most and regular cases
++ * file I/O syscall -- aufs_read() or something
++ * -- si_rwsem for read -- mmap_sem
++ * (Note that [fdi]i_rwsem are released before mmap_sem).
++ * - in mmap case
++ * mmap(2) -- mmap_sem -- aufs_mmap() -- si_rwsem for read -- [fdi]i_rwsem
++ * This AB-BA order is definitly bad, but is not a problem since "si_rwsem for
++ * read" allows muliple processes to acquire it and [fdi]i_rwsem are not held in
++ * file I/O. Aufs needs to stop lockdep in aufs_mmap() though.
++ * It means that when aufs acquires si_rwsem for write, the process should never
++ * acquire mmap_sem.
++ *
++ * Actually aufs_iterate() holds [fdi]i_rwsem before mmap_sem, but this is not a
++ * problem either since any directory is not able to be mmap-ed.
++ * The similar scenario is applied to aufs_readlink() too.
++ */
++
++#if 0 /* stop calling security_file_mmap() */
++/* cf. linux/include/linux/mman.h: calc_vm_prot_bits() */
++#define AuConv_VM_PROT(f, b) _calc_vm_trans(f, VM_##b, PROT_##b)
++
++static unsigned long au_arch_prot_conv(unsigned long flags)
++{
++ /* currently ppc64 only */
++#ifdef CONFIG_PPC64
++ /* cf. linux/arch/powerpc/include/asm/mman.h */
++ AuDebugOn(arch_calc_vm_prot_bits(-1) != VM_SAO);
++ return AuConv_VM_PROT(flags, SAO);
++#else
++ AuDebugOn(arch_calc_vm_prot_bits(-1));
++ return 0;
++#endif
++}
++
++static unsigned long au_prot_conv(unsigned long flags)
++{
++ return AuConv_VM_PROT(flags, READ)
++ | AuConv_VM_PROT(flags, WRITE)
++ | AuConv_VM_PROT(flags, EXEC)
++ | au_arch_prot_conv(flags);
++}
++
++/* cf. linux/include/linux/mman.h: calc_vm_flag_bits() */
++#define AuConv_VM_MAP(f, b) _calc_vm_trans(f, VM_##b, MAP_##b)
++
++static unsigned long au_flag_conv(unsigned long flags)
++{
++ return AuConv_VM_MAP(flags, GROWSDOWN)
++ | AuConv_VM_MAP(flags, DENYWRITE)
++ | AuConv_VM_MAP(flags, LOCKED);
++}
++#endif
++
++static int aufs_mmap(struct file *file, struct vm_area_struct *vma)
+{
+ int err;
++ const unsigned char wlock
++ = (file->f_mode & FMODE_WRITE) && (vma->vm_flags & VM_SHARED);
+ struct super_block *sb;
++ struct file *h_file;
+ struct inode *inode;
+
++ AuDbgVmRegion(file, vma);
++
+ inode = file_inode(file);
+ sb = inode->i_sb;
-+ si_noflush_read_lock(sb);
-+ fi_read_lock(file);
-+ ii_read_lock_child(inode);
++ lockdep_off();
++ si_read_lock(sb, AuLock_NOPLMW);
+
-+ err = flush(file, id);
-+ au_cpup_attr_timesizes(inode);
++ h_file = au_write_pre(file, wlock, /*wpre*/NULL);
++ lockdep_on();
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
+
-+ ii_read_unlock(inode);
-+ fi_read_unlock(file);
++ err = 0;
++ au_set_mmapped(file);
++ au_vm_file_reset(vma, h_file);
++ /*
++ * we cannot call security_mmap_file() here since it may acquire
++ * mmap_sem or i_mutex.
++ *
++ * err = security_mmap_file(h_file, au_prot_conv(vma->vm_flags),
++ * au_flag_conv(vma->vm_flags));
++ */
++ if (!err)
++ err = call_mmap(h_file, vma);
++ 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:
++ lockdep_off();
++ ii_write_unlock(inode);
++ lockdep_on();
++ fput(h_file);
++out:
++ lockdep_off();
+ si_read_unlock(sb);
++ lockdep_on();
++ AuTraceErr(err);
+ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
-+static int au_file_refresh_by_inode(struct file *file, int *need_reopen)
++static int aufs_fsync_nondir(struct file *file, loff_t start, loff_t end,
++ int datasync)
+{
+ int err;
-+ struct au_pin pin;
-+ struct au_finfo *finfo;
-+ struct dentry *parent, *hi_wh;
++ struct au_write_pre wpre;
+ struct inode *inode;
-+ struct super_block *sb;
-+ struct au_cp_generic cpg = {
-+ .dentry = file->f_path.dentry,
-+ .bdst = -1,
-+ .bsrc = -1,
-+ .len = -1,
-+ .pin = &pin,
-+ .flags = AuCpup_DTIME
-+ };
-+
-+ FiMustWriteLock(file);
++ struct file *h_file;
+
-+ err = 0;
-+ finfo = au_fi(file);
-+ sb = cpg.dentry->d_sb;
-+ inode = d_inode(cpg.dentry);
-+ cpg.bdst = au_ibtop(inode);
-+ if (cpg.bdst == finfo->fi_btop || IS_ROOT(cpg.dentry))
++ err = 0; /* -EBADF; */ /* posix? */
++ if (unlikely(!(file->f_mode & FMODE_WRITE)))
+ goto out;
+
-+ parent = dget_parent(cpg.dentry);
-+ if (au_test_ro(sb, cpg.bdst, inode)) {
-+ di_read_lock_parent(parent, !AuLock_IR);
-+ err = AuWbrCopyup(au_sbi(sb), cpg.dentry);
-+ cpg.bdst = err;
-+ di_read_unlock(parent, !AuLock_IR);
-+ if (unlikely(err < 0))
-+ goto out_parent;
-+ err = 0;
-+ }
++ inode = file_inode(file);
++ au_mtx_and_read_lock(inode);
+
-+ di_read_lock_parent(parent, AuLock_IR);
-+ hi_wh = au_hi_wh(inode, cpg.bdst);
-+ if (!S_ISDIR(inode->i_mode)
-+ && au_opt_test(au_mntflags(sb), PLINK)
-+ && au_plink_test(inode)
-+ && !d_unhashed(cpg.dentry)
-+ && cpg.bdst < au_dbtop(cpg.dentry)) {
-+ err = au_test_and_cpup_dirs(cpg.dentry, cpg.bdst);
-+ if (unlikely(err))
-+ goto out_unlock;
++ wpre.lsc = 0;
++ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out_unlock;
+
-+ /* always superio. */
-+ err = au_pin(&pin, cpg.dentry, cpg.bdst, AuOpt_UDBA_NONE,
-+ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
-+ if (!err) {
-+ err = au_sio_cpup_simple(&cpg);
-+ au_unpin(&pin);
-+ }
-+ } else if (hi_wh) {
-+ /* already copied-up after unlink */
-+ err = au_reopen_wh(file, cpg.bdst, hi_wh);
-+ *need_reopen = 0;
-+ }
++ err = vfsub_fsync(h_file, &h_file->f_path, datasync);
++ au_write_post(inode, h_file, &wpre, /*written*/0);
+
+out_unlock:
-+ di_read_unlock(parent, AuLock_IR);
-+out_parent:
-+ dput(parent);
++ si_read_unlock(inode->i_sb);
++ inode_unlock(inode);
+out:
+ return err;
+}
+
-+static void au_do_refresh_dir(struct file *file)
++static int aufs_fasync(int fd, struct file *file, int flag)
+{
-+ aufs_bindex_t bindex, bbot, new_bindex, brid;
-+ struct au_hfile *p, tmp, *q;
-+ struct au_finfo *finfo;
++ int err;
++ struct file *h_file;
+ struct super_block *sb;
-+ struct au_fidir *fidir;
-+
-+ FiMustWriteLock(file);
+
+ sb = file->f_path.dentry->d_sb;
-+ finfo = au_fi(file);
-+ fidir = finfo->fi_hdir;
-+ AuDebugOn(!fidir);
-+ p = fidir->fd_hfile + finfo->fi_btop;
-+ brid = p->hf_br->br_id;
-+ bbot = fidir->fd_bbot;
-+ for (bindex = finfo->fi_btop; bindex <= bbot; bindex++, p++) {
-+ if (!p->hf_file)
-+ continue;
-+
-+ new_bindex = au_br_index(sb, p->hf_br->br_id);
-+ if (new_bindex == bindex)
-+ continue;
-+ if (new_bindex < 0) {
-+ au_set_h_fptr(file, bindex, NULL);
-+ continue;
-+ }
++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
+
-+ /* swap two lower inode, and loop again */
-+ q = fidir->fd_hfile + new_bindex;
-+ tmp = *q;
-+ *q = *p;
-+ *p = tmp;
-+ if (tmp.hf_file) {
-+ bindex--;
-+ p--;
-+ }
-+ }
++ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
+
-+ p = fidir->fd_hfile;
-+ if (!au_test_mmapped(file) && !d_unlinked(file->f_path.dentry)) {
-+ bbot = au_sbbot(sb);
-+ for (finfo->fi_btop = 0; finfo->fi_btop <= bbot;
-+ finfo->fi_btop++, p++)
-+ if (p->hf_file) {
-+ if (file_inode(p->hf_file))
-+ break;
-+ au_hfput(p, /*execed*/0);
-+ }
-+ } else {
-+ bbot = au_br_index(sb, brid);
-+ for (finfo->fi_btop = 0; finfo->fi_btop < bbot;
-+ finfo->fi_btop++, p++)
-+ if (p->hf_file)
-+ au_hfput(p, /*execed*/0);
-+ bbot = au_sbbot(sb);
-+ }
++ if (h_file->f_op->fasync)
++ err = h_file->f_op->fasync(fd, h_file, flag);
++ fput(h_file); /* instead of au_read_post() */
+
-+ p = fidir->fd_hfile + bbot;
-+ for (fidir->fd_bbot = bbot; fidir->fd_bbot >= finfo->fi_btop;
-+ fidir->fd_bbot--, p--)
-+ if (p->hf_file) {
-+ if (file_inode(p->hf_file))
-+ break;
-+ au_hfput(p, /*execed*/0);
-+ }
-+ AuDebugOn(fidir->fd_bbot < finfo->fi_btop);
++out:
++ si_read_unlock(sb);
++ return err;
+}
+
-+/*
-+ * after branch manipulating, refresh the file.
-+ */
-+static int refresh_file(struct file *file, int (*reopen)(struct file *file))
++static int aufs_setfl(struct file *file, unsigned long arg)
+{
-+ int err, need_reopen, nbr;
-+ aufs_bindex_t bbot, bindex;
-+ struct dentry *dentry;
++ int err;
++ struct file *h_file;
+ struct super_block *sb;
-+ struct au_finfo *finfo;
-+ struct au_hfile *hfile;
+
-+ dentry = file->f_path.dentry;
-+ sb = dentry->d_sb;
-+ nbr = au_sbbot(sb) + 1;
-+ finfo = au_fi(file);
-+ if (!finfo->fi_hdir) {
-+ hfile = &finfo->fi_htop;
-+ AuDebugOn(!hfile->hf_file);
-+ bindex = au_br_index(sb, hfile->hf_br->br_id);
-+ AuDebugOn(bindex < 0);
-+ if (bindex != finfo->fi_btop)
-+ au_set_fbtop(file, bindex);
-+ } else {
-+ err = au_fidir_realloc(finfo, nbr, /*may_shrink*/0);
-+ if (unlikely(err))
-+ goto out;
-+ au_do_refresh_dir(file);
-+ }
++ sb = file->f_path.dentry->d_sb;
++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
+
-+ err = 0;
-+ need_reopen = 1;
-+ if (!au_test_mmapped(file))
-+ err = au_file_refresh_by_inode(file, &need_reopen);
-+ if (finfo->fi_hdir)
-+ /* harmless if err */
-+ au_fidir_realloc(finfo, nbr, /*may_shrink*/1);
-+ if (!err && need_reopen && !d_unlinked(dentry))
-+ err = reopen(file);
-+ if (!err) {
-+ au_update_figen(file);
-+ goto out; /* success */
-+ }
++ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out;
+
-+ /* error, close all lower files */
-+ if (finfo->fi_hdir) {
-+ bbot = au_fbbot_dir(file);
-+ for (bindex = au_fbtop(file); bindex <= bbot; bindex++)
-+ au_set_h_fptr(file, bindex, NULL);
-+ }
++ /* stop calling h_file->fasync */
++ arg |= vfsub_file_flags(file) & FASYNC;
++ err = setfl(/*unused fd*/-1, h_file, arg);
++ fput(h_file); /* instead of au_read_post() */
+
+out:
++ si_read_unlock(sb);
+ return err;
+}
+
-+/* common function to regular file and dir */
-+int au_reval_and_lock_fdi(struct file *file, int (*reopen)(struct file *file),
-+ int wlock, unsigned int fi_lsc)
-+{
-+ int err;
-+ unsigned int sigen, figen;
-+ aufs_bindex_t btop;
-+ unsigned char pseudo_link;
-+ struct dentry *dentry;
-+ struct inode *inode;
-+
-+ err = 0;
-+ dentry = file->f_path.dentry;
-+ inode = d_inode(dentry);
-+ sigen = au_sigen(dentry->d_sb);
-+ fi_write_lock_nested(file, fi_lsc);
-+ figen = au_figen(file);
-+ if (!fi_lsc)
-+ di_write_lock_child(dentry);
-+ else
-+ di_write_lock_child2(dentry);
-+ btop = au_dbtop(dentry);
-+ pseudo_link = (btop != au_ibtop(inode));
-+ if (sigen == figen && !pseudo_link && au_fbtop(file) == btop) {
-+ if (!wlock) {
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ fi_downgrade_lock(file);
-+ }
-+ goto out; /* success */
-+ }
-+
-+ AuDbg("sigen %d, figen %d\n", sigen, figen);
-+ if (au_digen_test(dentry, sigen)) {
-+ err = au_reval_dpath(dentry, sigen);
-+ AuDebugOn(!err && au_digen_test(dentry, sigen));
-+ }
-+
-+ if (!err)
-+ err = refresh_file(file, reopen);
-+ if (!err) {
-+ if (!wlock) {
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ fi_downgrade_lock(file);
-+ }
-+ } else {
-+ di_write_unlock(dentry);
-+ fi_write_unlock(file);
-+ }
++/* ---------------------------------------------------------------------- */
+
-+out:
-+ return err;
++/* no one supports this operation, currently */
++#if 0
++static ssize_t aufs_sendpage(struct file *file, struct page *page, int offset,
++ size_t len, loff_t *pos, int more)
++{
+}
++#endif
+
+/* ---------------------------------------------------------------------- */
+
-+/* cf. aufs_nopage() */
-+/* for madvise(2) */
-+static int aufs_readpage(struct file *file __maybe_unused, struct page *page)
-+{
-+ unlock_page(page);
-+ return 0;
-+}
++const struct file_operations aufs_file_fop = {
++ .owner = THIS_MODULE,
+
-+/* it will never be called, but necessary to support O_DIRECT */
-+static ssize_t aufs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
-+{ BUG(); return 0; }
++ .llseek = default_llseek,
+
-+/* they will never be called. */
-+#ifdef CONFIG_AUFS_DEBUG
-+static int aufs_write_begin(struct file *file, struct address_space *mapping,
-+ loff_t pos, unsigned len, unsigned flags,
-+ struct page **pagep, void **fsdata)
-+{ AuUnsupport(); return 0; }
-+static int aufs_write_end(struct file *file, struct address_space *mapping,
-+ loff_t pos, unsigned len, unsigned copied,
-+ struct page *page, void *fsdata)
-+{ AuUnsupport(); return 0; }
-+static int aufs_writepage(struct page *page, struct writeback_control *wbc)
-+{ AuUnsupport(); return 0; }
++ .read = aufs_read,
++ .write = aufs_write,
++ .read_iter = aufs_read_iter,
++ .write_iter = aufs_write_iter,
+
-+static int aufs_set_page_dirty(struct page *page)
-+{ AuUnsupport(); return 0; }
-+static void aufs_invalidatepage(struct page *page, unsigned int offset,
-+ unsigned int length)
-+{ AuUnsupport(); }
-+static int aufs_releasepage(struct page *page, gfp_t gfp)
-+{ AuUnsupport(); return 0; }
-+#if 0 /* called by memory compaction regardless file */
-+static int aufs_migratepage(struct address_space *mapping, struct page *newpage,
-+ struct page *page, enum migrate_mode mode)
-+{ AuUnsupport(); return 0; }
++#ifdef CONFIG_AUFS_POLL
++ .poll = aufs_poll,
+#endif
-+static bool aufs_isolate_page(struct page *page, isolate_mode_t mode)
-+{ AuUnsupport(); return true; }
-+static void aufs_putback_page(struct page *page)
-+{ AuUnsupport(); }
-+static int aufs_launder_page(struct page *page)
-+{ AuUnsupport(); return 0; }
-+static int aufs_is_partially_uptodate(struct page *page,
-+ unsigned long from,
-+ unsigned long count)
-+{ AuUnsupport(); return 0; }
-+static void aufs_is_dirty_writeback(struct page *page, bool *dirty,
-+ bool *writeback)
-+{ AuUnsupport(); }
-+static int aufs_error_remove_page(struct address_space *mapping,
-+ struct page *page)
-+{ AuUnsupport(); return 0; }
-+static int aufs_swap_activate(struct swap_info_struct *sis, struct file *file,
-+ sector_t *span)
-+{ AuUnsupport(); return 0; }
-+static void aufs_swap_deactivate(struct file *file)
-+{ AuUnsupport(); }
-+#endif /* CONFIG_AUFS_DEBUG */
-+
-+const struct address_space_operations aufs_aop = {
-+ .readpage = aufs_readpage,
-+ .direct_IO = aufs_direct_IO,
-+#ifdef CONFIG_AUFS_DEBUG
-+ .writepage = aufs_writepage,
-+ /* no writepages, because of writepage */
-+ .set_page_dirty = aufs_set_page_dirty,
-+ /* no readpages, because of readpage */
-+ .write_begin = aufs_write_begin,
-+ .write_end = aufs_write_end,
-+ /* no bmap, no block device */
-+ .invalidatepage = aufs_invalidatepage,
-+ .releasepage = aufs_releasepage,
-+ /* is fallback_migrate_page ok? */
-+ /* .migratepage = aufs_migratepage, */
-+ .isolate_page = aufs_isolate_page,
-+ .putback_page = aufs_putback_page,
-+ .launder_page = aufs_launder_page,
-+ .is_partially_uptodate = aufs_is_partially_uptodate,
-+ .is_dirty_writeback = aufs_is_dirty_writeback,
-+ .error_remove_page = aufs_error_remove_page,
-+ .swap_activate = aufs_swap_activate,
-+ .swap_deactivate = aufs_swap_deactivate
-+#endif /* CONFIG_AUFS_DEBUG */
++ .unlocked_ioctl = aufs_ioctl_nondir,
++#ifdef CONFIG_COMPAT
++ .compat_ioctl = aufs_compat_ioctl_nondir,
++#endif
++ .mmap = aufs_mmap,
++ .open = aufs_open_nondir,
++ .flush = aufs_flush_nondir,
++ .release = aufs_release_nondir,
++ .fsync = aufs_fsync_nondir,
++ .fasync = aufs_fasync,
++ /* .sendpage = aufs_sendpage, */
++ .setfl = aufs_setfl,
++ .splice_write = aufs_splice_write,
++ .splice_read = aufs_splice_read,
++#if 0
++ .aio_splice_write = aufs_aio_splice_write,
++ .aio_splice_read = aufs_aio_splice_read,
++#endif
++ .fallocate = aufs_fallocate,
++ .copy_file_range = aufs_copy_file_range
+};
-diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
---- /usr/share/empty/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.h 2017-11-12 22:24:44.704244405 +0100
-@@ -0,0 +1,340 @@
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/fhsm.c linux-4.14/fs/aufs/fhsm.c
+--- linux-4.14/fs/aufs/fhsm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/fhsm.c 2021-02-24 21:42:43.441114748 +0100
+@@ -0,0 +1,426 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2011-2017 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/>.
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
-+ * file operations
++ * File-based Hierarchy Storage Management
+ */
+
-+#ifndef __AUFS_FILE_H__
-+#define __AUFS_FILE_H__
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/file.h>
-+#include <linux/fs.h>
-+#include <linux/mm_types.h>
++#include <linux/anon_inodes.h>
+#include <linux/poll.h>
-+#include "rwsem.h"
++#include <linux/seq_file.h>
++#include <linux/statfs.h>
++#include "aufs.h"
+
-+struct au_branch;
-+struct au_hfile {
-+ struct file *hf_file;
-+ struct au_branch *hf_br;
-+};
++static aufs_bindex_t au_fhsm_bottom(struct super_block *sb)
++{
++ struct au_sbinfo *sbinfo;
++ struct au_fhsm *fhsm;
+
-+struct au_vdir;
-+struct au_fidir {
-+ aufs_bindex_t fd_bbot;
-+ aufs_bindex_t fd_nent;
-+ struct au_vdir *fd_vdir_cache;
-+ struct au_hfile fd_hfile[];
-+};
++ SiMustAnyLock(sb);
+
-+static inline int au_fidir_sz(int nent)
++ sbinfo = au_sbi(sb);
++ fhsm = &sbinfo->si_fhsm;
++ AuDebugOn(!fhsm);
++ return fhsm->fhsm_bottom;
++}
++
++void au_fhsm_set_bottom(struct super_block *sb, aufs_bindex_t bindex)
+{
-+ AuDebugOn(nent < 0);
-+ return sizeof(struct au_fidir) + sizeof(struct au_hfile) * nent;
++ struct au_sbinfo *sbinfo;
++ struct au_fhsm *fhsm;
++
++ SiMustWriteLock(sb);
++
++ sbinfo = au_sbi(sb);
++ fhsm = &sbinfo->si_fhsm;
++ AuDebugOn(!fhsm);
++ fhsm->fhsm_bottom = bindex;
+}
+
-+struct au_finfo {
-+ atomic_t fi_generation;
++/* ---------------------------------------------------------------------- */
+
-+ struct au_rwsem fi_rwsem;
-+ aufs_bindex_t fi_btop;
++static int au_fhsm_test_jiffy(struct au_sbinfo *sbinfo, struct au_branch *br)
++{
++ struct au_br_fhsm *bf;
+
-+ /* do not union them */
-+ struct { /* for non-dir */
-+ struct au_hfile fi_htop;
-+ atomic_t fi_mmapped;
-+ };
-+ struct au_fidir *fi_hdir; /* for dir only */
++ bf = br->br_fhsm;
++ MtxMustLock(&bf->bf_lock);
+
-+ struct hlist_bl_node fi_hlist;
-+ struct file *fi_file; /* very ugly */
-+} ____cacheline_aligned_in_smp;
++ return !bf->bf_readable
++ || time_after(jiffies,
++ bf->bf_jiffy + sbinfo->si_fhsm.fhsm_expire);
++}
+
+/* ---------------------------------------------------------------------- */
+
-+/* file.c */
-+extern const struct address_space_operations aufs_aop;
-+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);
-+struct au_do_open_args {
-+ int aopen;
-+ 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);
-+int au_reval_and_lock_fdi(struct file *file, int (*reopen)(struct file *file),
-+ int wlock, unsigned int fi_lsc);
-+int au_do_flush(struct file *file, fl_owner_t id,
-+ int (*flush)(struct file *file, fl_owner_t id));
++static void au_fhsm_notify(struct super_block *sb, int val)
++{
++ struct au_sbinfo *sbinfo;
++ struct au_fhsm *fhsm;
+
-+/* poll.c */
-+#ifdef CONFIG_AUFS_POLL
-+unsigned int aufs_poll(struct file *file, poll_table *wait);
-+#endif
++ SiMustAnyLock(sb);
+
-+#ifdef CONFIG_AUFS_BR_HFSPLUS
-+/* hfsplus.c */
-+struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex,
-+ int force_wr);
-+void au_h_open_post(struct dentry *dentry, aufs_bindex_t bindex,
-+ struct file *h_file);
-+#else
-+AuStub(struct file *, au_h_open_pre, return NULL, struct dentry *dentry,
-+ aufs_bindex_t bindex, int force_wr)
-+AuStubVoid(au_h_open_post, struct dentry *dentry, aufs_bindex_t bindex,
-+ struct file *h_file);
-+#endif
++ sbinfo = au_sbi(sb);
++ fhsm = &sbinfo->si_fhsm;
++ if (au_fhsm_pid(fhsm)
++ && atomic_read(&fhsm->fhsm_readable) != -1) {
++ atomic_set(&fhsm->fhsm_readable, val);
++ if (val)
++ wake_up(&fhsm->fhsm_wqh);
++ }
++}
+
-+/* f_op.c */
-+extern const struct file_operations aufs_file_fop;
-+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, unsigned int lsc);
++static int au_fhsm_stfs(struct super_block *sb, aufs_bindex_t bindex,
++ struct aufs_stfs *rstfs, int do_lock, int do_notify)
++{
++ int err;
++ struct au_branch *br;
++ struct au_br_fhsm *bf;
+
-+/* finfo.c */
-+void au_hfput(struct au_hfile *hf, int execed);
-+void au_set_h_fptr(struct file *file, aufs_bindex_t bindex,
-+ struct file *h_file);
++ br = au_sbr(sb, bindex);
++ AuDebugOn(au_br_rdonly(br));
++ bf = br->br_fhsm;
++ AuDebugOn(!bf);
+
-+void au_update_figen(struct file *file);
-+struct au_fidir *au_fidir_alloc(struct super_block *sb);
-+int au_fidir_realloc(struct au_finfo *finfo, int nbr, int may_shrink);
++ if (do_lock)
++ mutex_lock(&bf->bf_lock);
++ else
++ MtxMustLock(&bf->bf_lock);
+
-+void au_fi_init_once(void *_fi);
-+void au_finfo_fin(struct file *file);
-+int au_finfo_init(struct file *file, struct au_fidir *fidir);
++ /* sb->s_root for NFS is unreliable */
++ err = au_br_stfs(br, &bf->bf_stfs);
++ if (unlikely(err)) {
++ AuErr1("FHSM failed (%d), b%d, ignored.\n", bindex, err);
++ goto out;
++ }
+
-+/* ioctl.c */
-+long aufs_ioctl_nondir(struct file *file, unsigned int cmd, unsigned long arg);
-+#ifdef CONFIG_COMPAT
-+long aufs_compat_ioctl_dir(struct file *file, unsigned int cmd,
-+ unsigned long arg);
-+long aufs_compat_ioctl_nondir(struct file *file, unsigned int cmd,
-+ unsigned long arg);
-+#endif
++ bf->bf_jiffy = jiffies;
++ bf->bf_readable = 1;
++ if (do_notify)
++ au_fhsm_notify(sb, /*val*/1);
++ if (rstfs)
++ *rstfs = bf->bf_stfs;
+
-+/* ---------------------------------------------------------------------- */
++out:
++ if (do_lock)
++ mutex_unlock(&bf->bf_lock);
++ au_fhsm_notify(sb, /*val*/1);
+
-+static inline struct au_finfo *au_fi(struct file *file)
-+{
-+ return file->private_data;
++ return err;
+}
+
-+/* ---------------------------------------------------------------------- */
-+
-+#define fi_read_lock(f) au_rw_read_lock(&au_fi(f)->fi_rwsem)
-+#define fi_write_lock(f) au_rw_write_lock(&au_fi(f)->fi_rwsem)
-+#define fi_read_trylock(f) au_rw_read_trylock(&au_fi(f)->fi_rwsem)
-+#define fi_write_trylock(f) au_rw_write_trylock(&au_fi(f)->fi_rwsem)
-+/*
-+#define fi_read_trylock_nested(f) \
-+ au_rw_read_trylock_nested(&au_fi(f)->fi_rwsem)
-+#define fi_write_trylock_nested(f) \
-+ au_rw_write_trylock_nested(&au_fi(f)->fi_rwsem)
-+*/
++void au_fhsm_wrote(struct super_block *sb, aufs_bindex_t bindex, int force)
++{
++ int err;
++ struct au_sbinfo *sbinfo;
++ struct au_fhsm *fhsm;
++ struct au_branch *br;
++ struct au_br_fhsm *bf;
+
-+#define fi_read_unlock(f) au_rw_read_unlock(&au_fi(f)->fi_rwsem)
-+#define fi_write_unlock(f) au_rw_write_unlock(&au_fi(f)->fi_rwsem)
-+#define fi_downgrade_lock(f) au_rw_dgrade_lock(&au_fi(f)->fi_rwsem)
++ AuDbg("b%d, force %d\n", bindex, force);
++ SiMustAnyLock(sb);
+
-+/* lock subclass for finfo */
-+enum {
-+ AuLsc_FI_1,
-+ AuLsc_FI_2
-+};
++ sbinfo = au_sbi(sb);
++ fhsm = &sbinfo->si_fhsm;
++ if (!au_ftest_si(sbinfo, FHSM)
++ || fhsm->fhsm_bottom == bindex)
++ return;
+
-+static inline void fi_read_lock_nested(struct file *f, unsigned int lsc)
-+{
-+ au_rw_read_lock_nested(&au_fi(f)->fi_rwsem, lsc);
++ br = au_sbr(sb, bindex);
++ bf = br->br_fhsm;
++ AuDebugOn(!bf);
++ mutex_lock(&bf->bf_lock);
++ if (force
++ || au_fhsm_pid(fhsm)
++ || au_fhsm_test_jiffy(sbinfo, br))
++ err = au_fhsm_stfs(sb, bindex, /*rstfs*/NULL, /*do_lock*/0,
++ /*do_notify*/1);
++ mutex_unlock(&bf->bf_lock);
+}
+
-+static inline void fi_write_lock_nested(struct file *f, unsigned int lsc)
++void au_fhsm_wrote_all(struct super_block *sb, int force)
+{
-+ au_rw_write_lock_nested(&au_fi(f)->fi_rwsem, lsc);
-+}
++ aufs_bindex_t bindex, bbot;
++ struct au_branch *br;
+
-+/*
-+ * fi_read_lock_1, fi_write_lock_1,
-+ * fi_read_lock_2, fi_write_lock_2
-+ */
-+#define AuReadLockFunc(name) \
-+static inline void fi_read_lock_##name(struct file *f) \
-+{ fi_read_lock_nested(f, AuLsc_FI_##name); }
++ /* exclude the bottom */
++ bbot = au_fhsm_bottom(sb);
++ for (bindex = 0; bindex < bbot; bindex++) {
++ br = au_sbr(sb, bindex);
++ if (au_br_fhsm(br->br_perm))
++ au_fhsm_wrote(sb, bindex, force);
++ }
++}
+
-+#define AuWriteLockFunc(name) \
-+static inline void fi_write_lock_##name(struct file *f) \
-+{ fi_write_lock_nested(f, AuLsc_FI_##name); }
++/* ---------------------------------------------------------------------- */
+
-+#define AuRWLockFuncs(name) \
-+ AuReadLockFunc(name) \
-+ AuWriteLockFunc(name)
++static unsigned int au_fhsm_poll(struct file *file,
++ struct poll_table_struct *wait)
++{
++ unsigned int mask;
++ struct au_sbinfo *sbinfo;
++ struct au_fhsm *fhsm;
+
-+AuRWLockFuncs(1);
-+AuRWLockFuncs(2);
++ mask = 0;
++ sbinfo = file->private_data;
++ fhsm = &sbinfo->si_fhsm;
++ poll_wait(file, &fhsm->fhsm_wqh, wait);
++ if (atomic_read(&fhsm->fhsm_readable))
++ mask = POLLIN /* | POLLRDNORM */;
+
-+#undef AuReadLockFunc
-+#undef AuWriteLockFunc
-+#undef AuRWLockFuncs
++ AuTraceErr((int)mask);
++ return mask;
++}
+
-+#define FiMustNoWaiters(f) AuRwMustNoWaiters(&au_fi(f)->fi_rwsem)
-+#define FiMustAnyLock(f) AuRwMustAnyLock(&au_fi(f)->fi_rwsem)
-+#define FiMustWriteLock(f) AuRwMustWriteLock(&au_fi(f)->fi_rwsem)
++static int au_fhsm_do_read_one(struct aufs_stbr __user *stbr,
++ struct aufs_stfs *stfs, __s16 brid)
++{
++ int err;
+
-+/* ---------------------------------------------------------------------- */
++ err = copy_to_user(&stbr->stfs, stfs, sizeof(*stfs));
++ if (!err)
++ err = __put_user(brid, &stbr->brid);
++ if (unlikely(err))
++ err = -EFAULT;
+
-+/* todo: hard/soft set? */
-+static inline aufs_bindex_t au_fbtop(struct file *file)
-+{
-+ FiMustAnyLock(file);
-+ return au_fi(file)->fi_btop;
++ return err;
+}
+
-+static inline aufs_bindex_t au_fbbot_dir(struct file *file)
++static ssize_t au_fhsm_do_read(struct super_block *sb,
++ struct aufs_stbr __user *stbr, size_t count)
+{
-+ FiMustAnyLock(file);
-+ AuDebugOn(!au_fi(file)->fi_hdir);
-+ return au_fi(file)->fi_hdir->fd_bbot;
++ ssize_t err;
++ int nstbr;
++ aufs_bindex_t bindex, bbot;
++ struct au_branch *br;
++ struct au_br_fhsm *bf;
++
++ /* except the bottom branch */
++ err = 0;
++ nstbr = 0;
++ bbot = au_fhsm_bottom(sb);
++ for (bindex = 0; !err && bindex < bbot; bindex++) {
++ br = au_sbr(sb, bindex);
++ if (!au_br_fhsm(br->br_perm))
++ continue;
++
++ bf = br->br_fhsm;
++ mutex_lock(&bf->bf_lock);
++ if (bf->bf_readable) {
++ err = -EFAULT;
++ if (count >= sizeof(*stbr))
++ err = au_fhsm_do_read_one(stbr++, &bf->bf_stfs,
++ br->br_id);
++ if (!err) {
++ bf->bf_readable = 0;
++ count -= sizeof(*stbr);
++ nstbr++;
++ }
++ }
++ mutex_unlock(&bf->bf_lock);
++ }
++ if (!err)
++ err = sizeof(*stbr) * nstbr;
++
++ return err;
+}
+
-+static inline struct au_vdir *au_fvdir_cache(struct file *file)
++static ssize_t au_fhsm_read(struct file *file, char __user *buf, size_t count,
++ loff_t *pos)
+{
-+ FiMustAnyLock(file);
-+ AuDebugOn(!au_fi(file)->fi_hdir);
-+ return au_fi(file)->fi_hdir->fd_vdir_cache;
-+}
++ ssize_t err;
++ int readable;
++ aufs_bindex_t nfhsm, bindex, bbot;
++ struct au_sbinfo *sbinfo;
++ struct au_fhsm *fhsm;
++ struct au_branch *br;
++ struct super_block *sb;
++
++ err = 0;
++ sbinfo = file->private_data;
++ fhsm = &sbinfo->si_fhsm;
++need_data:
++ spin_lock_irq(&fhsm->fhsm_wqh.lock);
++ if (!atomic_read(&fhsm->fhsm_readable)) {
++ if (vfsub_file_flags(file) & O_NONBLOCK)
++ err = -EAGAIN;
++ else
++ err = wait_event_interruptible_locked_irq
++ (fhsm->fhsm_wqh,
++ atomic_read(&fhsm->fhsm_readable));
++ }
++ spin_unlock_irq(&fhsm->fhsm_wqh.lock);
++ if (unlikely(err))
++ goto out;
++
++ /* sb may already be dead */
++ au_rw_read_lock(&sbinfo->si_rwsem);
++ readable = atomic_read(&fhsm->fhsm_readable);
++ if (readable > 0) {
++ sb = sbinfo->si_sb;
++ AuDebugOn(!sb);
++ /* exclude the bottom branch */
++ nfhsm = 0;
++ bbot = au_fhsm_bottom(sb);
++ for (bindex = 0; bindex < bbot; bindex++) {
++ br = au_sbr(sb, bindex);
++ if (au_br_fhsm(br->br_perm))
++ nfhsm++;
++ }
++ err = -EMSGSIZE;
++ if (nfhsm * sizeof(struct aufs_stbr) <= count) {
++ atomic_set(&fhsm->fhsm_readable, 0);
++ err = au_fhsm_do_read(sbinfo->si_sb, (void __user *)buf,
++ count);
++ }
++ }
++ au_rw_read_unlock(&sbinfo->si_rwsem);
++ if (!readable)
++ goto need_data;
+
-+static inline void au_set_fbtop(struct file *file, aufs_bindex_t bindex)
-+{
-+ FiMustWriteLock(file);
-+ au_fi(file)->fi_btop = bindex;
++out:
++ return err;
+}
+
-+static inline void au_set_fbbot_dir(struct file *file, aufs_bindex_t bindex)
++static int au_fhsm_release(struct inode *inode, struct file *file)
+{
-+ FiMustWriteLock(file);
-+ AuDebugOn(!au_fi(file)->fi_hdir);
-+ au_fi(file)->fi_hdir->fd_bbot = bindex;
-+}
++ struct au_sbinfo *sbinfo;
++ struct au_fhsm *fhsm;
+
-+static inline void au_set_fvdir_cache(struct file *file,
-+ struct au_vdir *vdir_cache)
-+{
-+ FiMustWriteLock(file);
-+ AuDebugOn(!au_fi(file)->fi_hdir);
-+ au_fi(file)->fi_hdir->fd_vdir_cache = vdir_cache;
-+}
++ /* sb may already be dead */
++ sbinfo = file->private_data;
++ fhsm = &sbinfo->si_fhsm;
++ spin_lock(&fhsm->fhsm_spin);
++ fhsm->fhsm_pid = 0;
++ spin_unlock(&fhsm->fhsm_spin);
++ kobject_put(&sbinfo->si_kobj);
+
-+static inline struct file *au_hf_top(struct file *file)
-+{
-+ FiMustAnyLock(file);
-+ AuDebugOn(au_fi(file)->fi_hdir);
-+ return au_fi(file)->fi_htop.hf_file;
++ return 0;
+}
+
-+static inline struct file *au_hf_dir(struct file *file, aufs_bindex_t bindex)
-+{
-+ FiMustAnyLock(file);
-+ AuDebugOn(!au_fi(file)->fi_hdir);
-+ return au_fi(file)->fi_hdir->fd_hfile[0 + bindex].hf_file;
-+}
++static const struct file_operations au_fhsm_fops = {
++ .owner = THIS_MODULE,
++ .llseek = noop_llseek,
++ .read = au_fhsm_read,
++ .poll = au_fhsm_poll,
++ .release = au_fhsm_release
++};
+
-+/* todo: memory barrier? */
-+static inline unsigned int au_figen(struct file *f)
++int au_fhsm_fd(struct super_block *sb, int oflags)
+{
-+ return atomic_read(&au_fi(f)->fi_generation);
-+}
++ int err, fd;
++ struct au_sbinfo *sbinfo;
++ struct au_fhsm *fhsm;
+
-+static inline void au_set_mmapped(struct file *f)
-+{
-+ if (atomic_inc_return(&au_fi(f)->fi_mmapped))
-+ return;
-+ pr_warn("fi_mmapped wrapped around\n");
-+ while (!atomic_inc_return(&au_fi(f)->fi_mmapped))
-+ ;
-+}
++ err = -EPERM;
++ if (unlikely(!capable(CAP_SYS_ADMIN)))
++ goto out;
+
-+static inline void au_unset_mmapped(struct file *f)
-+{
-+ atomic_dec(&au_fi(f)->fi_mmapped);
-+}
++ err = -EINVAL;
++ if (unlikely(oflags & ~(O_CLOEXEC | O_NONBLOCK)))
++ goto out;
+
-+static inline int au_test_mmapped(struct file *f)
-+{
-+ return atomic_read(&au_fi(f)->fi_mmapped);
++ err = 0;
++ sbinfo = au_sbi(sb);
++ fhsm = &sbinfo->si_fhsm;
++ spin_lock(&fhsm->fhsm_spin);
++ if (!fhsm->fhsm_pid)
++ fhsm->fhsm_pid = current->pid;
++ else
++ err = -EBUSY;
++ spin_unlock(&fhsm->fhsm_spin);
++ if (unlikely(err))
++ goto out;
++
++ oflags |= O_RDONLY;
++ /* oflags |= FMODE_NONOTIFY; */
++ fd = anon_inode_getfd("[aufs_fhsm]", &au_fhsm_fops, sbinfo, oflags);
++ err = fd;
++ if (unlikely(fd < 0))
++ goto out_pid;
++
++ /* succeed reglardless 'fhsm' status */
++ kobject_get(&sbinfo->si_kobj);
++ si_noflush_read_lock(sb);
++ if (au_ftest_si(sbinfo, FHSM))
++ au_fhsm_wrote_all(sb, /*force*/0);
++ si_read_unlock(sb);
++ goto out; /* success */
++
++out_pid:
++ spin_lock(&fhsm->fhsm_spin);
++ fhsm->fhsm_pid = 0;
++ spin_unlock(&fhsm->fhsm_spin);
++out:
++ AuTraceErr(err);
++ return err;
+}
+
-+/* customize vma->vm_file */
++/* ---------------------------------------------------------------------- */
+
-+static inline void au_do_vm_file_reset(struct vm_area_struct *vma,
-+ struct file *file)
++int au_fhsm_br_alloc(struct au_branch *br)
+{
-+ struct file *f;
++ int err;
+
-+ f = vma->vm_file;
-+ get_file(file);
-+ vma->vm_file = file;
-+ fput(f);
++ err = 0;
++ br->br_fhsm = kmalloc(sizeof(*br->br_fhsm), GFP_NOFS);
++ if (br->br_fhsm)
++ au_br_fhsm_init(br->br_fhsm);
++ else
++ err = -ENOMEM;
++
++ return err;
+}
+
-+#ifdef CONFIG_MMU
-+#define AuDbgVmRegion(file, vma) do {} while (0)
++/* ---------------------------------------------------------------------- */
+
-+static inline void au_vm_file_reset(struct vm_area_struct *vma,
-+ struct file *file)
++void au_fhsm_fin(struct super_block *sb)
+{
-+ au_do_vm_file_reset(vma, file);
++ au_fhsm_notify(sb, /*val*/-1);
+}
-+#else
-+#define AuDbgVmRegion(file, vma) \
-+ AuDebugOn((vma)->vm_region && (vma)->vm_region->vm_file != (file))
+
-+static inline void au_vm_file_reset(struct vm_area_struct *vma,
-+ struct file *file)
++void au_fhsm_init(struct au_sbinfo *sbinfo)
+{
-+ struct file *f;
++ struct au_fhsm *fhsm;
+
-+ au_do_vm_file_reset(vma, file);
-+ f = vma->vm_region->vm_file;
-+ get_file(file);
-+ vma->vm_region->vm_file = file;
-+ fput(f);
++ fhsm = &sbinfo->si_fhsm;
++ spin_lock_init(&fhsm->fhsm_spin);
++ init_waitqueue_head(&fhsm->fhsm_wqh);
++ atomic_set(&fhsm->fhsm_readable, 0);
++ fhsm->fhsm_expire
++ = msecs_to_jiffies(AUFS_FHSM_CACHE_DEF_SEC * MSEC_PER_SEC);
++ fhsm->fhsm_bottom = -1;
+}
-+#endif /* CONFIG_MMU */
+
-+/* handle vma->vm_prfile */
-+static inline void au_vm_prfile_set(struct vm_area_struct *vma,
-+ struct file *file)
++void au_fhsm_set(struct au_sbinfo *sbinfo, unsigned int sec)
+{
-+ get_file(file);
-+ vma->vm_prfile = file;
-+#ifndef CONFIG_MMU
-+ get_file(file);
-+ vma->vm_region->vm_prfile = file;
-+#endif
++ sbinfo->si_fhsm.fhsm_expire
++ = msecs_to_jiffies(sec * MSEC_PER_SEC);
+}
+
-+#endif /* __KERNEL__ */
-+#endif /* __AUFS_FILE_H__ */
-diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
---- /usr/share/empty/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/finfo.c 2017-11-12 22:24:42.270843503 +0100
-@@ -0,0 +1,148 @@
++void au_fhsm_show(struct seq_file *seq, struct au_sbinfo *sbinfo)
++{
++ unsigned int u;
++
++ if (!au_ftest_si(sbinfo, FHSM))
++ return;
++
++ u = jiffies_to_msecs(sbinfo->si_fhsm.fhsm_expire) / MSEC_PER_SEC;
++ if (u != AUFS_FHSM_CACHE_DEF_SEC)
++ seq_printf(seq, ",fhsm_sec=%u", u);
++}
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/file.c linux-4.14/fs/aufs/file.c
+--- linux-4.14/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/file.c 2021-02-24 21:42:43.441114748 +0100
+@@ -0,0 +1,856 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ *
+ */
+
+/*
-+ * file private data
++ * handling file/dir, and address_space operation
+ */
+
++#ifdef CONFIG_AUFS_DEBUG
++#include <linux/migrate.h>
++#endif
++#include <linux/pagemap.h>
+#include "aufs.h"
+
-+void au_hfput(struct au_hfile *hf, int execed)
++/* drop flags for writing */
++unsigned int au_file_roflags(unsigned int flags)
+{
-+ if (execed)
-+ allow_write_access(hf->hf_file);
-+ fput(hf->hf_file);
-+ hf->hf_file = NULL;
-+ au_br_put(hf->hf_br);
-+ hf->hf_br = NULL;
++ flags &= ~(O_WRONLY | O_RDWR | O_APPEND | O_CREAT | O_TRUNC);
++ flags |= O_RDONLY | O_NOATIME;
++ return flags;
+}
+
-+void au_set_h_fptr(struct file *file, aufs_bindex_t bindex, struct file *val)
++/* common functions to regular file and dir */
++struct file *au_h_open(struct dentry *dentry, aufs_bindex_t bindex, int flags,
++ struct file *file, int force_wr)
+{
-+ struct au_finfo *finfo = au_fi(file);
-+ struct au_hfile *hf;
-+ struct au_fidir *fidir;
++ struct file *h_file;
++ struct dentry *h_dentry;
++ struct inode *h_inode;
++ struct super_block *sb;
++ struct au_branch *br;
++ struct path h_path;
++ int err;
+
-+ fidir = finfo->fi_hdir;
-+ if (!fidir) {
-+ AuDebugOn(finfo->fi_btop != bindex);
-+ hf = &finfo->fi_htop;
-+ } else
-+ hf = fidir->fd_hfile + bindex;
++ /* a race condition can happen between open and unlink/rmdir */
++ h_file = ERR_PTR(-ENOENT);
++ h_dentry = au_h_dptr(dentry, bindex);
++ if (au_test_nfsd() && (!h_dentry || d_is_negative(h_dentry)))
++ goto out;
++ h_inode = d_inode(h_dentry);
++ spin_lock(&h_dentry->d_lock);
++ err = (!d_unhashed(dentry) && d_unlinked(h_dentry))
++ /* || !d_inode(dentry)->i_nlink */
++ ;
++ spin_unlock(&h_dentry->d_lock);
++ if (unlikely(err))
++ goto out;
+
-+ if (hf && hf->hf_file)
-+ au_hfput(hf, vfsub_file_execed(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);
++ sb = dentry->d_sb;
++ br = au_sbr(sb, bindex);
++ err = au_br_test_oflag(flags, br);
++ h_file = ERR_PTR(err);
++ if (unlikely(err))
++ goto out;
++
++ /* drop flags for writing */
++ if (au_test_ro(sb, bindex, d_inode(dentry))) {
++ if (force_wr && !(flags & O_WRONLY))
++ force_wr = 0;
++ flags = au_file_roflags(flags);
++ if (force_wr) {
++ h_file = ERR_PTR(-EROFS);
++ flags = au_file_roflags(flags);
++ if (unlikely(vfsub_native_ro(h_inode)
++ || IS_APPEND(h_inode)))
++ goto out;
++ flags &= ~O_ACCMODE;
++ flags |= O_WRONLY;
++ }
++ }
++ flags &= ~O_CREAT;
++ au_br_get(br);
++ h_path.dentry = h_dentry;
++ h_path.mnt = au_br_mnt(br);
++ h_file = vfsub_dentry_open(&h_path, flags);
++ if (IS_ERR(h_file))
++ goto out_br;
++
++ if (flags & __FMODE_EXEC) {
++ err = deny_write_access(h_file);
++ if (unlikely(err)) {
++ fput(h_file);
++ h_file = ERR_PTR(err);
++ goto out_br;
++ }
+ }
++ fsnotify_open(h_file);
++ goto out; /* success */
++
++out_br:
++ au_br_put(br);
++out:
++ return h_file;
+}
+
-+void au_update_figen(struct file *file)
++static int au_cmoo(struct dentry *dentry)
+{
-+ atomic_set(&au_fi(file)->fi_generation, au_digen(file->f_path.dentry));
-+ /* smp_mb(); */ /* atomic_set */
++ int err, cmoo, matched;
++ unsigned int udba;
++ struct path h_path;
++ struct au_pin pin;
++ struct au_cp_generic cpg = {
++ .dentry = dentry,
++ .bdst = -1,
++ .bsrc = -1,
++ .len = -1,
++ .pin = &pin,
++ .flags = AuCpup_DTIME | AuCpup_HOPEN
++ };
++ struct inode *delegated;
++ struct super_block *sb;
++ struct au_sbinfo *sbinfo;
++ struct au_fhsm *fhsm;
++ pid_t pid;
++ struct au_branch *br;
++ struct dentry *parent;
++ struct au_hinode *hdir;
++
++ DiMustWriteLock(dentry);
++ IiMustWriteLock(d_inode(dentry));
++
++ err = 0;
++ if (IS_ROOT(dentry))
++ goto out;
++ cpg.bsrc = au_dbtop(dentry);
++ if (!cpg.bsrc)
++ goto out;
++
++ sb = dentry->d_sb;
++ sbinfo = au_sbi(sb);
++ fhsm = &sbinfo->si_fhsm;
++ pid = au_fhsm_pid(fhsm);
++ rcu_read_lock();
++ matched = (pid
++ && (current->pid == pid
++ || rcu_dereference(current->real_parent)->pid == pid));
++ rcu_read_unlock();
++ if (matched)
++ goto out;
++
++ br = au_sbr(sb, cpg.bsrc);
++ cmoo = au_br_cmoo(br->br_perm);
++ if (!cmoo)
++ goto out;
++ if (!d_is_reg(dentry))
++ cmoo &= AuBrAttr_COO_ALL;
++ if (!cmoo)
++ goto out;
++
++ parent = dget_parent(dentry);
++ di_write_lock_parent(parent);
++ err = au_wbr_do_copyup_bu(dentry, cpg.bsrc - 1);
++ cpg.bdst = err;
++ if (unlikely(err < 0)) {
++ err = 0; /* there is no upper writable branch */
++ goto out_dgrade;
++ }
++ AuDbg("bsrc %d, bdst %d\n", cpg.bsrc, cpg.bdst);
++
++ /* do not respect the coo attrib for the target branch */
++ err = au_cpup_dirs(dentry, cpg.bdst);
++ if (unlikely(err))
++ goto out_dgrade;
++
++ di_downgrade_lock(parent, AuLock_IR);
++ udba = au_opt_udba(sb);
++ err = au_pin(&pin, dentry, cpg.bdst, udba,
++ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
++ if (unlikely(err))
++ goto out_parent;
++
++ err = au_sio_cpup_simple(&cpg);
++ au_unpin(&pin);
++ if (unlikely(err))
++ goto out_parent;
++ if (!(cmoo & AuBrWAttr_MOO))
++ goto out_parent; /* success */
++
++ err = au_pin(&pin, dentry, cpg.bsrc, udba,
++ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
++ if (unlikely(err))
++ goto out_parent;
++
++ h_path.mnt = au_br_mnt(br);
++ h_path.dentry = au_h_dptr(dentry, cpg.bsrc);
++ hdir = au_hi(d_inode(parent), cpg.bsrc);
++ delegated = NULL;
++ err = vfsub_unlink(hdir->hi_inode, &h_path, &delegated, /*force*/1);
++ au_unpin(&pin);
++ /* todo: keep h_dentry or not? */
++ if (unlikely(err == -EWOULDBLOCK)) {
++ pr_warn("cannot retry for NFSv4 delegation"
++ " for an internal unlink\n");
++ iput(delegated);
++ }
++ if (unlikely(err)) {
++ pr_err("unlink %pd after coo failed (%d), ignored\n",
++ dentry, err);
++ err = 0;
++ }
++ goto out_parent; /* success */
++
++out_dgrade:
++ di_downgrade_lock(parent, AuLock_IR);
++out_parent:
++ di_read_unlock(parent, AuLock_IR);
++ dput(parent);
++out:
++ AuTraceErr(err);
++ return err;
++}
++
++int au_do_open(struct file *file, struct au_do_open_args *args)
++{
++ int err, aopen = args->aopen;
++ struct dentry *dentry;
++ struct au_finfo *finfo;
++
++ if (!aopen)
++ 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;
++ AuDebugOn(IS_ERR_OR_NULL(dentry));
++ di_write_lock_child(dentry);
++ err = au_cmoo(dentry);
++ di_downgrade_lock(dentry, AuLock_IR);
++ if (!err) {
++ if (!aopen)
++ err = args->open(file, vfsub_file_flags(file), NULL);
++ else {
++ lockdep_off();
++ err = args->open(file, vfsub_file_flags(file), NULL);
++ lockdep_on();
++ }
++ }
++ di_read_unlock(dentry, AuLock_IR);
++
++ finfo = au_fi(file);
++ if (!err) {
++ finfo->fi_file = file;
++ au_hbl_add(&finfo->fi_hlist,
++ &au_sbi(file->f_path.dentry->d_sb)->si_files);
++ }
++ if (!aopen)
++ fi_write_unlock(file);
++ else {
++ lockdep_off();
++ fi_write_unlock(file);
++ lockdep_on();
++ }
++ if (unlikely(err)) {
++ finfo->fi_hdir = NULL;
++ au_finfo_fin(file);
++ }
++
++out:
++ AuTraceErr(err);
++ return err;
++}
++
++int au_reopen_nondir(struct file *file)
++{
++ int err;
++ aufs_bindex_t btop;
++ struct dentry *dentry;
++ struct file *h_file, *h_file_tmp;
++
++ dentry = file->f_path.dentry;
++ btop = au_dbtop(dentry);
++ h_file_tmp = NULL;
++ if (au_fbtop(file) == btop) {
++ h_file = au_hf_top(file);
++ if (file->f_mode == h_file->f_mode)
++ return 0; /* success */
++ h_file_tmp = h_file;
++ get_file(h_file_tmp);
++ au_set_h_fptr(file, btop, NULL);
++ }
++ AuDebugOn(au_fi(file)->fi_hdir);
++ /*
++ * it can happen
++ * file exists on both of rw and ro
++ * open --> dbtop and fbtop are both 0
++ * prepend a branch as rw, "rw" become ro
++ * remove rw/file
++ * delete the top branch, "rw" becomes rw again
++ * --> dbtop is 1, fbtop is still 0
++ * write --> fbtop is 0 but dbtop is 1
++ */
++ /* AuDebugOn(au_fbtop(file) < btop); */
++
++ h_file = au_h_open(dentry, btop, vfsub_file_flags(file) & ~O_TRUNC,
++ file, /*force_wr*/0);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file)) {
++ if (h_file_tmp) {
++ au_sbr_get(dentry->d_sb, btop);
++ au_set_h_fptr(file, btop, h_file_tmp);
++ h_file_tmp = NULL;
++ }
++ goto out; /* todo: close all? */
++ }
++
++ err = 0;
++ au_set_fbtop(file, btop);
++ au_set_h_fptr(file, btop, h_file);
++ au_update_figen(file);
++ /* todo: necessary? */
++ /* file->f_ra = h_file->f_ra; */
++
++out:
++ if (h_file_tmp)
++ fput(h_file_tmp);
++ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
-+struct au_fidir *au_fidir_alloc(struct super_block *sb)
++static int au_reopen_wh(struct file *file, aufs_bindex_t btgt,
++ struct dentry *hi_wh)
+{
-+ struct au_fidir *fidir;
-+ int nbr;
++ int err;
++ aufs_bindex_t btop;
++ struct au_dinfo *dinfo;
++ struct dentry *h_dentry;
++ struct au_hdentry *hdp;
+
-+ nbr = au_sbbot(sb) + 1;
-+ if (nbr < 2)
-+ nbr = 2; /* initial allocate for 2 branches */
-+ fidir = kzalloc(au_fidir_sz(nbr), GFP_NOFS);
-+ if (fidir) {
-+ fidir->fd_bbot = -1;
-+ fidir->fd_nent = nbr;
-+ }
++ dinfo = au_di(file->f_path.dentry);
++ AuRwMustWriteLock(&dinfo->di_rwsem);
+
-+ return fidir;
++ btop = dinfo->di_btop;
++ dinfo->di_btop = btgt;
++ hdp = au_hdentry(dinfo, btgt);
++ h_dentry = hdp->hd_dentry;
++ hdp->hd_dentry = hi_wh;
++ err = au_reopen_nondir(file);
++ hdp->hd_dentry = h_dentry;
++ dinfo->di_btop = btop;
++
++ return err;
+}
+
-+int au_fidir_realloc(struct au_finfo *finfo, int nbr, int may_shrink)
++static int au_ready_to_write_wh(struct file *file, loff_t len,
++ aufs_bindex_t bcpup, struct au_pin *pin)
+{
+ int err;
-+ struct au_fidir *fidir, *p;
-+
-+ AuRwMustWriteLock(&finfo->fi_rwsem);
-+ fidir = finfo->fi_hdir;
-+ AuDebugOn(!fidir);
++ struct inode *inode, *h_inode;
++ struct dentry *h_dentry, *hi_wh;
++ struct au_cp_generic cpg = {
++ .dentry = file->f_path.dentry,
++ .bdst = bcpup,
++ .bsrc = -1,
++ .len = len,
++ .pin = pin
++ };
+
-+ err = -ENOMEM;
-+ p = au_kzrealloc(fidir, au_fidir_sz(fidir->fd_nent), au_fidir_sz(nbr),
-+ GFP_NOFS, may_shrink);
-+ if (p) {
-+ p->fd_nent = nbr;
-+ finfo->fi_hdir = p;
-+ err = 0;
++ au_update_dbtop(cpg.dentry);
++ inode = d_inode(cpg.dentry);
++ h_inode = NULL;
++ if (au_dbtop(cpg.dentry) <= bcpup
++ && au_dbbot(cpg.dentry) >= bcpup) {
++ h_dentry = au_h_dptr(cpg.dentry, bcpup);
++ if (h_dentry && d_is_positive(h_dentry))
++ h_inode = d_inode(h_dentry);
+ }
++ hi_wh = au_hi_wh(inode, bcpup);
++ if (!hi_wh && !h_inode)
++ err = au_sio_cpup_wh(&cpg, file);
++ else
++ /* already copied-up after unlink */
++ err = au_reopen_wh(file, bcpup, hi_wh);
++
++ if (!err
++ && (inode->i_nlink > 1
++ || (inode->i_state & I_LINKABLE))
++ && au_opt_test(au_mntflags(cpg.dentry->d_sb), PLINK))
++ au_plink_append(inode, bcpup, au_h_dptr(cpg.dentry, bcpup));
+
+ return err;
+}
+
-+/* ---------------------------------------------------------------------- */
-+
-+void au_finfo_fin(struct file *file)
++/*
++ * prepare the @file for writing.
++ */
++int au_ready_to_write(struct file *file, loff_t len, struct au_pin *pin)
+{
-+ struct au_finfo *finfo;
++ int err;
++ aufs_bindex_t dbtop;
++ struct dentry *parent;
++ struct inode *inode;
++ struct super_block *sb;
++ struct file *h_file;
++ struct au_cp_generic cpg = {
++ .dentry = file->f_path.dentry,
++ .bdst = -1,
++ .bsrc = -1,
++ .len = len,
++ .pin = pin,
++ .flags = AuCpup_DTIME
++ };
+
-+ au_nfiles_dec(file->f_path.dentry->d_sb);
++ sb = cpg.dentry->d_sb;
++ inode = d_inode(cpg.dentry);
++ cpg.bsrc = au_fbtop(file);
++ err = au_test_ro(sb, cpg.bsrc, inode);
++ if (!err && (au_hf_top(file)->f_mode & FMODE_WRITE)) {
++ err = au_pin(pin, cpg.dentry, cpg.bsrc, AuOpt_UDBA_NONE,
++ /*flags*/0);
++ goto out;
++ }
+
-+ finfo = au_fi(file);
-+ AuDebugOn(finfo->fi_hdir);
-+ AuRwDestroy(&finfo->fi_rwsem);
-+ au_cache_free_finfo(finfo);
-+}
++ /* need to cpup or reopen */
++ parent = dget_parent(cpg.dentry);
++ di_write_lock_parent(parent);
++ err = AuWbrCopyup(au_sbi(sb), cpg.dentry);
++ cpg.bdst = err;
++ if (unlikely(err < 0))
++ goto out_dgrade;
++ err = 0;
+
-+void au_fi_init_once(void *_finfo)
-+{
-+ struct au_finfo *finfo = _finfo;
++ if (!d_unhashed(cpg.dentry) && !au_h_dptr(parent, cpg.bdst)) {
++ err = au_cpup_dirs(cpg.dentry, cpg.bdst);
++ if (unlikely(err))
++ goto out_dgrade;
++ }
+
-+ au_rw_init(&finfo->fi_rwsem);
++ err = au_pin(pin, cpg.dentry, cpg.bdst, AuOpt_UDBA_NONE,
++ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
++ if (unlikely(err))
++ goto out_dgrade;
++
++ dbtop = au_dbtop(cpg.dentry);
++ if (dbtop <= cpg.bdst)
++ cpg.bsrc = cpg.bdst;
++
++ if (dbtop <= cpg.bdst /* just reopen */
++ || !d_unhashed(cpg.dentry) /* copyup and reopen */
++ ) {
++ h_file = au_h_open_pre(cpg.dentry, cpg.bsrc, /*force_wr*/0);
++ if (IS_ERR(h_file))
++ err = PTR_ERR(h_file);
++ else {
++ di_downgrade_lock(parent, AuLock_IR);
++ if (dbtop > cpg.bdst)
++ err = au_sio_cpup_simple(&cpg);
++ if (!err)
++ err = au_reopen_nondir(file);
++ au_h_open_post(cpg.dentry, cpg.bsrc, h_file);
++ }
++ } else { /* copyup as wh and reopen */
++ /*
++ * since writable hfsplus branch is not supported,
++ * h_open_pre/post() are unnecessary.
++ */
++ err = au_ready_to_write_wh(file, len, cpg.bdst, pin);
++ di_downgrade_lock(parent, AuLock_IR);
++ }
++
++ if (!err) {
++ au_pin_set_parent_lflag(pin, /*lflag*/0);
++ goto out_dput; /* success */
++ }
++ au_unpin(pin);
++ goto out_unlock;
++
++out_dgrade:
++ di_downgrade_lock(parent, AuLock_IR);
++out_unlock:
++ di_read_unlock(parent, AuLock_IR);
++out_dput:
++ dput(parent);
++out:
++ return err;
+}
+
-+int au_finfo_init(struct file *file, struct au_fidir *fidir)
++/* ---------------------------------------------------------------------- */
++
++int au_do_flush(struct file *file, fl_owner_t id,
++ int (*flush)(struct file *file, fl_owner_t id))
+{
+ int err;
-+ struct au_finfo *finfo;
-+ struct dentry *dentry;
-+
-+ err = -ENOMEM;
-+ dentry = file->f_path.dentry;
-+ finfo = au_cache_alloc_finfo();
-+ if (unlikely(!finfo))
-+ goto out;
++ struct super_block *sb;
++ struct inode *inode;
+
-+ err = 0;
-+ au_nfiles_inc(dentry->d_sb);
-+ au_rw_write_lock(&finfo->fi_rwsem);
-+ finfo->fi_btop = -1;
-+ finfo->fi_hdir = fidir;
-+ atomic_set(&finfo->fi_generation, au_digen(dentry));
-+ /* smp_mb(); */ /* atomic_set */
++ inode = file_inode(file);
++ sb = inode->i_sb;
++ si_noflush_read_lock(sb);
++ fi_read_lock(file);
++ ii_read_lock_child(inode);
+
-+ file->private_data = finfo;
++ err = flush(file, id);
++ au_cpup_attr_timesizes(inode);
+
-+out:
++ ii_read_unlock(inode);
++ fi_read_unlock(file);
++ si_read_unlock(sb);
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
---- /usr/share/empty/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c 2017-11-12 22:24:44.704244405 +0100
-@@ -0,0 +1,817 @@
-+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
-+ *
-+ * This program, aufs 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/>.
-+ */
-+
-+/*
-+ * file and vm operations
-+ */
+
-+#include <linux/aio.h>
-+#include <linux/fs_stack.h>
-+#include <linux/mman.h>
-+#include <linux/security.h>
-+#include "aufs.h"
++/* ---------------------------------------------------------------------- */
+
-+int au_do_open_nondir(struct file *file, int flags, struct file *h_file)
++static int au_file_refresh_by_inode(struct file *file, int *need_reopen)
+{
+ int err;
-+ aufs_bindex_t bindex;
-+ struct dentry *dentry, *h_dentry;
++ struct au_pin pin;
+ struct au_finfo *finfo;
-+ struct inode *h_inode;
++ struct dentry *parent, *hi_wh;
++ struct inode *inode;
++ struct super_block *sb;
++ struct au_cp_generic cpg = {
++ .dentry = file->f_path.dentry,
++ .bdst = -1,
++ .bsrc = -1,
++ .len = -1,
++ .pin = &pin,
++ .flags = AuCpup_DTIME
++ };
+
+ FiMustWriteLock(file);
+
+ 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_dbtop(dentry);
-+ if (!h_file) {
-+ h_dentry = au_h_dptr(dentry, bindex);
-+ err = vfsub_test_mntns(file->f_path.mnt, h_dentry->d_sb);
-+ if (unlikely(err))
-+ goto out;
-+ h_file = au_h_open(dentry, bindex, flags, file, /*force_wr*/0);
-+ } else {
-+ h_dentry = h_file->f_path.dentry;
-+ err = vfsub_test_mntns(file->f_path.mnt, h_dentry->d_sb);
-+ if (unlikely(err))
-+ goto out;
-+ get_file(h_file);
++ sb = cpg.dentry->d_sb;
++ inode = d_inode(cpg.dentry);
++ cpg.bdst = au_ibtop(inode);
++ if (cpg.bdst == finfo->fi_btop || IS_ROOT(cpg.dentry))
++ goto out;
++
++ parent = dget_parent(cpg.dentry);
++ if (au_test_ro(sb, cpg.bdst, inode)) {
++ di_read_lock_parent(parent, !AuLock_IR);
++ err = AuWbrCopyup(au_sbi(sb), cpg.dentry);
++ cpg.bdst = err;
++ di_read_unlock(parent, !AuLock_IR);
++ if (unlikely(err < 0))
++ goto out_parent;
++ err = 0;
+ }
-+ if (IS_ERR(h_file))
-+ err = PTR_ERR(h_file);
-+ else {
-+ if ((flags & __O_TMPFILE)
-+ && !(flags & O_EXCL)) {
-+ h_inode = file_inode(h_file);
-+ spin_lock(&h_inode->i_lock);
-+ h_inode->i_state |= I_LINKABLE;
-+ spin_unlock(&h_inode->i_lock);
++
++ di_read_lock_parent(parent, AuLock_IR);
++ hi_wh = au_hi_wh(inode, cpg.bdst);
++ if (!S_ISDIR(inode->i_mode)
++ && au_opt_test(au_mntflags(sb), PLINK)
++ && au_plink_test(inode)
++ && !d_unhashed(cpg.dentry)
++ && cpg.bdst < au_dbtop(cpg.dentry)) {
++ err = au_test_and_cpup_dirs(cpg.dentry, cpg.bdst);
++ if (unlikely(err))
++ goto out_unlock;
++
++ /* always superio. */
++ err = au_pin(&pin, cpg.dentry, cpg.bdst, AuOpt_UDBA_NONE,
++ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
++ if (!err) {
++ err = au_sio_cpup_simple(&cpg);
++ au_unpin(&pin);
+ }
-+ au_set_fbtop(file, bindex);
-+ au_set_h_fptr(file, bindex, h_file);
-+ au_update_figen(file);
-+ /* todo: necessary? */
-+ /* file->f_ra = h_file->f_ra; */
++ } else if (hi_wh) {
++ /* already copied-up after unlink */
++ err = au_reopen_wh(file, cpg.bdst, hi_wh);
++ *need_reopen = 0;
+ }
+
++out_unlock:
++ di_read_unlock(parent, AuLock_IR);
++out_parent:
++ dput(parent);
+out:
+ return err;
+}
+
-+static int aufs_open_nondir(struct inode *inode __maybe_unused,
-+ struct file *file)
++static void au_do_refresh_dir(struct file *file)
+{
-+ int err;
++ aufs_bindex_t bindex, bbot, new_bindex, brid;
++ struct au_hfile *p, tmp, *q;
++ struct au_finfo *finfo;
+ struct super_block *sb;
-+ struct au_do_open_args args = {
-+ .open = au_do_open_nondir
-+ };
++ struct au_fidir *fidir;
+
-+ AuDbg("%pD, f_flags 0x%x, f_mode 0x%x\n",
-+ file, vfsub_file_flags(file), file->f_mode);
++ FiMustWriteLock(file);
+
+ sb = file->f_path.dentry->d_sb;
-+ si_read_lock(sb, AuLock_FLUSH);
-+ err = au_do_open(file, &args);
-+ si_read_unlock(sb);
-+ return err;
++ finfo = au_fi(file);
++ fidir = finfo->fi_hdir;
++ AuDebugOn(!fidir);
++ p = fidir->fd_hfile + finfo->fi_btop;
++ brid = p->hf_br->br_id;
++ bbot = fidir->fd_bbot;
++ for (bindex = finfo->fi_btop; bindex <= bbot; bindex++, p++) {
++ if (!p->hf_file)
++ continue;
++
++ new_bindex = au_br_index(sb, p->hf_br->br_id);
++ if (new_bindex == bindex)
++ continue;
++ if (new_bindex < 0) {
++ au_set_h_fptr(file, bindex, NULL);
++ continue;
++ }
++
++ /* swap two lower inode, and loop again */
++ q = fidir->fd_hfile + new_bindex;
++ tmp = *q;
++ *q = *p;
++ *p = tmp;
++ if (tmp.hf_file) {
++ bindex--;
++ p--;
++ }
++ }
++
++ p = fidir->fd_hfile;
++ if (!au_test_mmapped(file) && !d_unlinked(file->f_path.dentry)) {
++ bbot = au_sbbot(sb);
++ for (finfo->fi_btop = 0; finfo->fi_btop <= bbot;
++ finfo->fi_btop++, p++)
++ if (p->hf_file) {
++ if (file_inode(p->hf_file))
++ break;
++ au_hfput(p, /*execed*/0);
++ }
++ } else {
++ bbot = au_br_index(sb, brid);
++ for (finfo->fi_btop = 0; finfo->fi_btop < bbot;
++ finfo->fi_btop++, p++)
++ if (p->hf_file)
++ au_hfput(p, /*execed*/0);
++ bbot = au_sbbot(sb);
++ }
++
++ p = fidir->fd_hfile + bbot;
++ for (fidir->fd_bbot = bbot; fidir->fd_bbot >= finfo->fi_btop;
++ fidir->fd_bbot--, p--)
++ if (p->hf_file) {
++ if (file_inode(p->hf_file))
++ break;
++ au_hfput(p, /*execed*/0);
++ }
++ AuDebugOn(fidir->fd_bbot < finfo->fi_btop);
+}
+
-+int aufs_release_nondir(struct inode *inode __maybe_unused, struct file *file)
++/*
++ * after branch manipulating, refresh the file.
++ */
++static int refresh_file(struct file *file, int (*reopen)(struct file *file))
+{
++ int err, need_reopen, nbr;
++ aufs_bindex_t bbot, bindex;
++ struct dentry *dentry;
++ struct super_block *sb;
+ struct au_finfo *finfo;
-+ aufs_bindex_t bindex;
++ struct au_hfile *hfile;
+
++ dentry = file->f_path.dentry;
++ sb = dentry->d_sb;
++ nbr = au_sbbot(sb) + 1;
+ finfo = au_fi(file);
-+ au_hbl_del(&finfo->fi_hlist,
-+ &au_sbi(file->f_path.dentry->d_sb)->si_files);
-+ bindex = finfo->fi_btop;
-+ if (bindex >= 0)
-+ au_set_h_fptr(file, bindex, NULL);
++ if (!finfo->fi_hdir) {
++ hfile = &finfo->fi_htop;
++ AuDebugOn(!hfile->hf_file);
++ bindex = au_br_index(sb, hfile->hf_br->br_id);
++ AuDebugOn(bindex < 0);
++ if (bindex != finfo->fi_btop)
++ au_set_fbtop(file, bindex);
++ } else {
++ err = au_fidir_realloc(finfo, nbr, /*may_shrink*/0);
++ if (unlikely(err))
++ goto out;
++ au_do_refresh_dir(file);
++ }
+
-+ au_finfo_fin(file);
-+ return 0;
-+}
++ err = 0;
++ need_reopen = 1;
++ if (!au_test_mmapped(file))
++ err = au_file_refresh_by_inode(file, &need_reopen);
++ if (finfo->fi_hdir)
++ /* harmless if err */
++ au_fidir_realloc(finfo, nbr, /*may_shrink*/1);
++ if (!err && need_reopen && !d_unlinked(dentry))
++ err = reopen(file);
++ if (!err) {
++ au_update_figen(file);
++ goto out; /* success */
++ }
+
-+/* ---------------------------------------------------------------------- */
++ /* error, close all lower files */
++ if (finfo->fi_hdir) {
++ bbot = au_fbbot_dir(file);
++ for (bindex = au_fbtop(file); bindex <= bbot; bindex++)
++ au_set_h_fptr(file, bindex, NULL);
++ }
+
-+static int au_do_flush_nondir(struct file *file, fl_owner_t id)
++out:
++ return err;
++}
++
++/* common function to regular file and dir */
++int au_reval_and_lock_fdi(struct file *file, int (*reopen)(struct file *file),
++ int wlock, unsigned int fi_lsc)
+{
+ int err;
-+ struct file *h_file;
++ unsigned int sigen, figen;
++ aufs_bindex_t btop;
++ unsigned char pseudo_link;
++ struct dentry *dentry;
++ struct inode *inode;
+
+ err = 0;
-+ h_file = au_hf_top(file);
-+ if (h_file)
-+ err = vfsub_flush(h_file, id);
-+ return err;
-+}
++ dentry = file->f_path.dentry;
++ inode = d_inode(dentry);
++ sigen = au_sigen(dentry->d_sb);
++ fi_write_lock_nested(file, fi_lsc);
++ figen = au_figen(file);
++ if (!fi_lsc)
++ di_write_lock_child(dentry);
++ else
++ di_write_lock_child2(dentry);
++ btop = au_dbtop(dentry);
++ pseudo_link = (btop != au_ibtop(inode));
++ if (sigen == figen && !pseudo_link && au_fbtop(file) == btop) {
++ if (!wlock) {
++ di_downgrade_lock(dentry, AuLock_IR);
++ fi_downgrade_lock(file);
++ }
++ goto out; /* success */
++ }
++
++ AuDbg("sigen %d, figen %d\n", sigen, figen);
++ if (au_digen_test(dentry, sigen)) {
++ err = au_reval_dpath(dentry, sigen);
++ AuDebugOn(!err && au_digen_test(dentry, sigen));
++ }
++
++ if (!err)
++ err = refresh_file(file, reopen);
++ if (!err) {
++ if (!wlock) {
++ di_downgrade_lock(dentry, AuLock_IR);
++ fi_downgrade_lock(file);
++ }
++ } else {
++ di_write_unlock(dentry);
++ fi_write_unlock(file);
++ }
+
-+static int aufs_flush_nondir(struct file *file, fl_owner_t id)
-+{
-+ return au_do_flush(file, id, au_do_flush_nondir);
++out:
++ return err;
+}
+
+/* ---------------------------------------------------------------------- */
-+/*
-+ * read and write functions acquire [fdi]_rwsem once, but release before
-+ * mmap_sem. This is because to stop a race condition between mmap(2).
-+ * Releasing these aufs-rwsem should be safe, no branch-mamagement (by keeping
-+ * si_rwsem), no harmful copy-up should happen. Actually copy-up may happen in
-+ * read functions after [fdi]_rwsem are released, but it should be harmless.
-+ */
+
-+/* Callers should call au_read_post() or fput() in the end */
-+struct file *au_read_pre(struct file *file, int keep_fi, unsigned int lsc)
++/* cf. aufs_nopage() */
++/* for madvise(2) */
++static int aufs_readpage(struct file *file __maybe_unused, struct page *page)
+{
-+ struct file *h_file;
-+ int err;
-+
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0, lsc);
-+ 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;
++ unlock_page(page);
++ return 0;
+}
+
-+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);
-+}
++/* it will never be called, but necessary to support O_DIRECT */
++static ssize_t aufs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
++{ BUG(); return 0; }
+
-+struct au_write_pre {
-+ /* input */
-+ unsigned int lsc;
++/* they will never be called. */
++#ifdef CONFIG_AUFS_DEBUG
++static int aufs_write_begin(struct file *file, struct address_space *mapping,
++ loff_t pos, unsigned len, unsigned flags,
++ struct page **pagep, void **fsdata)
++{ AuUnsupport(); return 0; }
++static int aufs_write_end(struct file *file, struct address_space *mapping,
++ loff_t pos, unsigned len, unsigned copied,
++ struct page *page, void *fsdata)
++{ AuUnsupport(); return 0; }
++static int aufs_writepage(struct page *page, struct writeback_control *wbc)
++{ AuUnsupport(); return 0; }
+
-+ /* output */
-+ blkcnt_t blks;
-+ aufs_bindex_t btop;
-+};
++static int aufs_set_page_dirty(struct page *page)
++{ AuUnsupport(); return 0; }
++static void aufs_invalidatepage(struct page *page, unsigned int offset,
++ unsigned int length)
++{ AuUnsupport(); }
++static int aufs_releasepage(struct page *page, gfp_t gfp)
++{ AuUnsupport(); return 0; }
++#if 0 /* called by memory compaction regardless file */
++static int aufs_migratepage(struct address_space *mapping, struct page *newpage,
++ struct page *page, enum migrate_mode mode)
++{ AuUnsupport(); return 0; }
++#endif
++static bool aufs_isolate_page(struct page *page, isolate_mode_t mode)
++{ AuUnsupport(); return true; }
++static void aufs_putback_page(struct page *page)
++{ AuUnsupport(); }
++static int aufs_launder_page(struct page *page)
++{ AuUnsupport(); return 0; }
++static int aufs_is_partially_uptodate(struct page *page,
++ unsigned long from,
++ unsigned long count)
++{ AuUnsupport(); return 0; }
++static void aufs_is_dirty_writeback(struct page *page, bool *dirty,
++ bool *writeback)
++{ AuUnsupport(); }
++static int aufs_error_remove_page(struct address_space *mapping,
++ struct page *page)
++{ AuUnsupport(); return 0; }
++static int aufs_swap_activate(struct swap_info_struct *sis, struct file *file,
++ sector_t *span)
++{ AuUnsupport(); return 0; }
++static void aufs_swap_deactivate(struct file *file)
++{ AuUnsupport(); }
++#endif /* CONFIG_AUFS_DEBUG */
+
++const struct address_space_operations aufs_aop = {
++ .readpage = aufs_readpage,
++ .direct_IO = aufs_direct_IO,
++#ifdef CONFIG_AUFS_DEBUG
++ .writepage = aufs_writepage,
++ /* no writepages, because of writepage */
++ .set_page_dirty = aufs_set_page_dirty,
++ /* no readpages, because of readpage */
++ .write_begin = aufs_write_begin,
++ .write_end = aufs_write_end,
++ /* no bmap, no block device */
++ .invalidatepage = aufs_invalidatepage,
++ .releasepage = aufs_releasepage,
++ /* is fallback_migrate_page ok? */
++ /* .migratepage = aufs_migratepage, */
++ .isolate_page = aufs_isolate_page,
++ .putback_page = aufs_putback_page,
++ .launder_page = aufs_launder_page,
++ .is_partially_uptodate = aufs_is_partially_uptodate,
++ .is_dirty_writeback = aufs_is_dirty_writeback,
++ .error_remove_page = aufs_error_remove_page,
++ .swap_activate = aufs_swap_activate,
++ .swap_deactivate = aufs_swap_deactivate
++#endif /* CONFIG_AUFS_DEBUG */
++};
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/file.h linux-4.14/fs/aufs/file.h
+--- linux-4.14/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/file.h 2021-02-24 21:42:43.441114748 +0100
+@@ -0,0 +1,340 @@
+/*
-+ * return with iinfo is write-locked
-+ * callers should call au_write_post() or iinfo_write_unlock() + fput() in the
-+ * end
++ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ *
++ * This program, aufs 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/>.
+ */
-+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;
-+ unsigned int lsc;
-+ struct au_pin pin;
+
-+ lsc = 0;
-+ if (wpre)
-+ lsc = wpre->lsc;
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1, lsc);
-+ h_file = ERR_PTR(err);
-+ if (unlikely(err))
-+ goto out;
++/*
++ * file operations
++ */
+
-+ 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;
-+ }
-+ }
++#ifndef __AUFS_FILE_H__
++#define __AUFS_FILE_H__
+
-+ di_downgrade_lock(dentry, /*flags*/0);
-+ if (wpre)
-+ wpre->btop = au_fbtop(file);
-+ h_file = au_hf_top(file);
-+ get_file(h_file);
-+ if (wpre)
-+ wpre->blks = file_inode(h_file)->i_blocks;
-+ if (do_ready)
-+ au_unpin(&pin);
-+ di_read_unlock(dentry, /*flags*/0);
++#ifdef __KERNEL__
+
-+out_fi:
-+ fi_write_unlock(file);
-+out:
-+ return h_file;
-+}
++#include <linux/file.h>
++#include <linux/fs.h>
++#include <linux/mm_types.h>
++#include <linux/poll.h>
++#include "rwsem.h"
+
-+static void au_write_post(struct inode *inode, struct file *h_file,
-+ struct au_write_pre *wpre, ssize_t written)
-+{
-+ struct inode *h_inode;
++struct au_branch;
++struct au_hfile {
++ struct file *hf_file;
++ struct au_branch *hf_br;
++};
+
-+ au_cpup_attr_timesizes(inode);
-+ AuDebugOn(au_ibtop(inode) != wpre->btop);
-+ h_inode = file_inode(h_file);
-+ inode->i_mode = h_inode->i_mode;
-+ ii_write_unlock(inode);
-+ /* AuDbg("blks %llu, %llu\n", (u64)blks, (u64)h_inode->i_blocks); */
-+ if (written > 0)
-+ au_fhsm_wrote(inode->i_sb, wpre->btop,
-+ /*force*/h_inode->i_blocks > wpre->blks);
-+ fput(h_file);
-+}
++struct au_vdir;
++struct au_fidir {
++ aufs_bindex_t fd_bbot;
++ aufs_bindex_t fd_nent;
++ struct au_vdir *fd_vdir_cache;
++ struct au_hfile fd_hfile[];
++};
+
-+static ssize_t aufs_read(struct file *file, char __user *buf, size_t count,
-+ loff_t *ppos)
++static inline int au_fidir_sz(int nent)
+{
-+ 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, /*lsc*/0);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out;
++ AuDebugOn(nent < 0);
++ return sizeof(struct au_fidir) + sizeof(struct au_hfile) * nent;
++}
+
-+ /* 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; */
-+ au_read_post(inode, h_file);
++struct au_finfo {
++ atomic_t fi_generation;
+
-+out:
-+ si_read_unlock(sb);
-+ return err;
-+}
++ struct au_rwsem fi_rwsem;
++ aufs_bindex_t fi_btop;
+
-+/*
-+ * todo: very ugly
-+ * it locks both of i_mutex and si_rwsem for read in safe.
-+ * if the plink maintenance mode continues forever (that is the problem),
-+ * may loop forever.
-+ */
-+static void au_mtx_and_read_lock(struct inode *inode)
-+{
-+ int err;
-+ struct super_block *sb = inode->i_sb;
++ /* do not union them */
++ struct { /* for non-dir */
++ struct au_hfile fi_htop;
++ atomic_t fi_mmapped;
++ };
++ struct au_fidir *fi_hdir; /* for dir only */
+
-+ while (1) {
-+ inode_lock(inode);
-+ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
-+ if (!err)
-+ break;
-+ inode_unlock(inode);
-+ si_read_lock(sb, AuLock_NOPLMW);
-+ si_read_unlock(sb);
-+ }
-+}
++ struct hlist_bl_node fi_hlist;
++ struct file *fi_file; /* very ugly */
++} ____cacheline_aligned_in_smp;
+
-+static ssize_t aufs_write(struct file *file, const char __user *ubuf,
-+ size_t count, loff_t *ppos)
-+{
-+ ssize_t err;
-+ struct au_write_pre wpre;
-+ struct inode *inode;
-+ struct file *h_file;
-+ char __user *buf = (char __user *)ubuf;
++/* ---------------------------------------------------------------------- */
+
-+ inode = file_inode(file);
-+ au_mtx_and_read_lock(inode);
++/* file.c */
++extern const struct address_space_operations aufs_aop;
++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);
++struct au_do_open_args {
++ int aopen;
++ 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);
++int au_reval_and_lock_fdi(struct file *file, int (*reopen)(struct file *file),
++ int wlock, unsigned int fi_lsc);
++int au_do_flush(struct file *file, fl_owner_t id,
++ int (*flush)(struct file *file, fl_owner_t id));
+
-+ wpre.lsc = 0;
-+ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out;
++/* poll.c */
++#ifdef CONFIG_AUFS_POLL
++unsigned int aufs_poll(struct file *file, poll_table *wait);
++#endif
+
-+ err = vfsub_write_u(h_file, buf, count, ppos);
-+ au_write_post(inode, h_file, &wpre, err);
++#ifdef CONFIG_AUFS_BR_HFSPLUS
++/* hfsplus.c */
++struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex,
++ int force_wr);
++void au_h_open_post(struct dentry *dentry, aufs_bindex_t bindex,
++ struct file *h_file);
++#else
++AuStub(struct file *, au_h_open_pre, return NULL, struct dentry *dentry,
++ aufs_bindex_t bindex, int force_wr)
++AuStubVoid(au_h_open_post, struct dentry *dentry, aufs_bindex_t bindex,
++ struct file *h_file);
++#endif
+
-+out:
-+ si_read_unlock(inode->i_sb);
-+ inode_unlock(inode);
-+ return err;
-+}
++/* f_op.c */
++extern const struct file_operations aufs_file_fop;
++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, unsigned int lsc);
+
-+static ssize_t au_do_iter(struct file *h_file, int rw, struct kiocb *kio,
-+ struct iov_iter *iov_iter)
-+{
-+ ssize_t err;
-+ struct file *file;
-+ ssize_t (*iter)(struct kiocb *, struct iov_iter *);
++/* finfo.c */
++void au_hfput(struct au_hfile *hf, int execed);
++void au_set_h_fptr(struct file *file, aufs_bindex_t bindex,
++ struct file *h_file);
+
-+ err = security_file_permission(h_file, rw);
-+ if (unlikely(err))
-+ goto out;
++void au_update_figen(struct file *file);
++struct au_fidir *au_fidir_alloc(struct super_block *sb);
++int au_fidir_realloc(struct au_finfo *finfo, int nbr, int may_shrink);
+
-+ err = -ENOSYS;
-+ iter = NULL;
-+ if (rw == MAY_READ)
-+ iter = h_file->f_op->read_iter;
-+ else if (rw == MAY_WRITE)
-+ iter = h_file->f_op->write_iter;
++void au_fi_init_once(void *_fi);
++void au_finfo_fin(struct file *file);
++int au_finfo_init(struct file *file, struct au_fidir *fidir);
+
-+ file = kio->ki_filp;
-+ kio->ki_filp = h_file;
-+ if (iter) {
-+ lockdep_off();
-+ err = iter(kio, iov_iter);
-+ lockdep_on();
-+ } else
-+ /* currently there is no such fs */
-+ WARN_ON_ONCE(1);
-+ kio->ki_filp = file;
++/* ioctl.c */
++long aufs_ioctl_nondir(struct file *file, unsigned int cmd, unsigned long arg);
++#ifdef CONFIG_COMPAT
++long aufs_compat_ioctl_dir(struct file *file, unsigned int cmd,
++ unsigned long arg);
++long aufs_compat_ioctl_nondir(struct file *file, unsigned int cmd,
++ unsigned long arg);
++#endif
+
-+out:
-+ return err;
-+}
++/* ---------------------------------------------------------------------- */
+
-+static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
++static inline struct au_finfo *au_fi(struct file *file)
+{
-+ ssize_t err;
-+ struct file *file, *h_file;
-+ struct inode *inode;
-+ struct super_block *sb;
++ return file->private_data;
++}
+
-+ file = kio->ki_filp;
-+ inode = file_inode(file);
-+ sb = inode->i_sb;
-+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
++/* ---------------------------------------------------------------------- */
+
-+ h_file = au_read_pre(file, /*keep_fi*/1, /*lsc*/0);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out;
++#define fi_read_lock(f) au_rw_read_lock(&au_fi(f)->fi_rwsem)
++#define fi_write_lock(f) au_rw_write_lock(&au_fi(f)->fi_rwsem)
++#define fi_read_trylock(f) au_rw_read_trylock(&au_fi(f)->fi_rwsem)
++#define fi_write_trylock(f) au_rw_write_trylock(&au_fi(f)->fi_rwsem)
++/*
++#define fi_read_trylock_nested(f) \
++ au_rw_read_trylock_nested(&au_fi(f)->fi_rwsem)
++#define fi_write_trylock_nested(f) \
++ au_rw_write_trylock_nested(&au_fi(f)->fi_rwsem)
++*/
+
-+ if (au_test_loopback_kthread()) {
-+ au_warn_loopback(h_file->f_path.dentry->d_sb);
-+ if (file->f_mapping != h_file->f_mapping) {
-+ file->f_mapping = h_file->f_mapping;
-+ smp_mb(); /* unnecessary? */
-+ }
-+ }
-+ fi_read_unlock(file);
++#define fi_read_unlock(f) au_rw_read_unlock(&au_fi(f)->fi_rwsem)
++#define fi_write_unlock(f) au_rw_write_unlock(&au_fi(f)->fi_rwsem)
++#define fi_downgrade_lock(f) au_rw_dgrade_lock(&au_fi(f)->fi_rwsem)
+
-+ err = au_do_iter(h_file, MAY_READ, kio, iov_iter);
-+ /* todo: necessary? */
-+ /* file->f_ra = h_file->f_ra; */
-+ au_read_post(inode, h_file);
++/* lock subclass for finfo */
++enum {
++ AuLsc_FI_1,
++ AuLsc_FI_2
++};
+
-+out:
-+ si_read_unlock(sb);
-+ return err;
++static inline void fi_read_lock_nested(struct file *f, unsigned int lsc)
++{
++ au_rw_read_lock_nested(&au_fi(f)->fi_rwsem, lsc);
+}
+
-+static ssize_t aufs_write_iter(struct kiocb *kio, struct iov_iter *iov_iter)
++static inline void fi_write_lock_nested(struct file *f, unsigned int lsc)
+{
-+ ssize_t err;
-+ struct au_write_pre wpre;
-+ struct inode *inode;
-+ struct file *file, *h_file;
-+
-+ file = kio->ki_filp;
-+ inode = file_inode(file);
-+ au_mtx_and_read_lock(inode);
++ au_rw_write_lock_nested(&au_fi(f)->fi_rwsem, lsc);
++}
+
-+ wpre.lsc = 0;
-+ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out;
++/*
++ * fi_read_lock_1, fi_write_lock_1,
++ * fi_read_lock_2, fi_write_lock_2
++ */
++#define AuReadLockFunc(name) \
++static inline void fi_read_lock_##name(struct file *f) \
++{ fi_read_lock_nested(f, AuLsc_FI_##name); }
+
-+ err = au_do_iter(h_file, MAY_WRITE, kio, iov_iter);
-+ au_write_post(inode, h_file, &wpre, err);
++#define AuWriteLockFunc(name) \
++static inline void fi_write_lock_##name(struct file *f) \
++{ fi_write_lock_nested(f, AuLsc_FI_##name); }
+
-+out:
-+ si_read_unlock(inode->i_sb);
-+ inode_unlock(inode);
-+ return err;
-+}
++#define AuRWLockFuncs(name) \
++ AuReadLockFunc(name) \
++ AuWriteLockFunc(name)
+
-+static ssize_t aufs_splice_read(struct file *file, loff_t *ppos,
-+ struct pipe_inode_info *pipe, size_t len,
-+ unsigned int flags)
-+{
-+ ssize_t err;
-+ struct file *h_file;
-+ struct inode *inode;
-+ struct super_block *sb;
++AuRWLockFuncs(1);
++AuRWLockFuncs(2);
+
-+ inode = file_inode(file);
-+ sb = inode->i_sb;
-+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
++#undef AuReadLockFunc
++#undef AuWriteLockFunc
++#undef AuRWLockFuncs
+
-+ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out;
++#define FiMustNoWaiters(f) AuRwMustNoWaiters(&au_fi(f)->fi_rwsem)
++#define FiMustAnyLock(f) AuRwMustAnyLock(&au_fi(f)->fi_rwsem)
++#define FiMustWriteLock(f) AuRwMustWriteLock(&au_fi(f)->fi_rwsem)
+
-+ err = vfsub_splice_to(h_file, ppos, pipe, len, flags);
-+ /* todo: necessasry? */
-+ /* file->f_ra = h_file->f_ra; */
-+ au_read_post(inode, h_file);
++/* ---------------------------------------------------------------------- */
+
-+out:
-+ si_read_unlock(sb);
-+ return err;
++/* todo: hard/soft set? */
++static inline aufs_bindex_t au_fbtop(struct file *file)
++{
++ FiMustAnyLock(file);
++ return au_fi(file)->fi_btop;
+}
+
-+static ssize_t
-+aufs_splice_write(struct pipe_inode_info *pipe, struct file *file, loff_t *ppos,
-+ size_t len, unsigned int flags)
++static inline aufs_bindex_t au_fbbot_dir(struct file *file)
+{
-+ ssize_t err;
-+ struct au_write_pre wpre;
-+ struct inode *inode;
-+ struct file *h_file;
++ FiMustAnyLock(file);
++ AuDebugOn(!au_fi(file)->fi_hdir);
++ return au_fi(file)->fi_hdir->fd_bbot;
++}
+
-+ inode = file_inode(file);
-+ au_mtx_and_read_lock(inode);
++static inline struct au_vdir *au_fvdir_cache(struct file *file)
++{
++ FiMustAnyLock(file);
++ AuDebugOn(!au_fi(file)->fi_hdir);
++ return au_fi(file)->fi_hdir->fd_vdir_cache;
++}
+
-+ wpre.lsc = 0;
-+ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out;
++static inline void au_set_fbtop(struct file *file, aufs_bindex_t bindex)
++{
++ FiMustWriteLock(file);
++ au_fi(file)->fi_btop = bindex;
++}
+
-+ err = vfsub_splice_from(pipe, h_file, ppos, len, flags);
-+ au_write_post(inode, h_file, &wpre, err);
++static inline void au_set_fbbot_dir(struct file *file, aufs_bindex_t bindex)
++{
++ FiMustWriteLock(file);
++ AuDebugOn(!au_fi(file)->fi_hdir);
++ au_fi(file)->fi_hdir->fd_bbot = bindex;
++}
+
-+out:
-+ si_read_unlock(inode->i_sb);
-+ inode_unlock(inode);
-+ return err;
++static inline void au_set_fvdir_cache(struct file *file,
++ struct au_vdir *vdir_cache)
++{
++ FiMustWriteLock(file);
++ AuDebugOn(!au_fi(file)->fi_hdir);
++ au_fi(file)->fi_hdir->fd_vdir_cache = vdir_cache;
+}
+
-+static long aufs_fallocate(struct file *file, int mode, loff_t offset,
-+ loff_t len)
++static inline struct file *au_hf_top(struct file *file)
+{
-+ long err;
-+ struct au_write_pre wpre;
-+ struct inode *inode;
-+ struct file *h_file;
++ FiMustAnyLock(file);
++ AuDebugOn(au_fi(file)->fi_hdir);
++ return au_fi(file)->fi_htop.hf_file;
++}
+
-+ inode = file_inode(file);
-+ au_mtx_and_read_lock(inode);
++static inline struct file *au_hf_dir(struct file *file, aufs_bindex_t bindex)
++{
++ FiMustAnyLock(file);
++ AuDebugOn(!au_fi(file)->fi_hdir);
++ return au_fi(file)->fi_hdir->fd_hfile[0 + bindex].hf_file;
++}
+
-+ wpre.lsc = 0;
-+ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out;
++/* todo: memory barrier? */
++static inline unsigned int au_figen(struct file *f)
++{
++ return atomic_read(&au_fi(f)->fi_generation);
++}
+
-+ lockdep_off();
-+ err = vfs_fallocate(h_file, mode, offset, len);
-+ lockdep_on();
-+ au_write_post(inode, h_file, &wpre, /*written*/1);
++static inline void au_set_mmapped(struct file *f)
++{
++ if (atomic_inc_return(&au_fi(f)->fi_mmapped))
++ return;
++ pr_warn("fi_mmapped wrapped around\n");
++ while (!atomic_inc_return(&au_fi(f)->fi_mmapped))
++ ;
++}
+
-+out:
-+ si_read_unlock(inode->i_sb);
-+ inode_unlock(inode);
-+ return err;
++static inline void au_unset_mmapped(struct file *f)
++{
++ atomic_dec(&au_fi(f)->fi_mmapped);
+}
+
-+static ssize_t aufs_copy_file_range(struct file *src, loff_t src_pos,
-+ struct file *dst, loff_t dst_pos,
-+ size_t len, unsigned int flags)
++static inline int au_test_mmapped(struct file *f)
+{
-+ ssize_t err;
-+ struct au_write_pre wpre;
-+ enum { SRC, DST };
-+ struct {
-+ struct inode *inode;
-+ struct file *h_file;
-+ struct super_block *h_sb;
-+ } a[2];
-+#define a_src a[SRC]
-+#define a_dst a[DST]
++ return atomic_read(&au_fi(f)->fi_mmapped);
++}
+
-+ err = -EINVAL;
-+ a_src.inode = file_inode(src);
-+ if (unlikely(!S_ISREG(a_src.inode->i_mode)))
-+ goto out;
-+ a_dst.inode = file_inode(dst);
-+ if (unlikely(!S_ISREG(a_dst.inode->i_mode)))
-+ goto out;
++/* customize vma->vm_file */
+
-+ au_mtx_and_read_lock(a_dst.inode);
-+ /*
-+ * in order to match the order in di_write_lock2_{child,parent}(),
-+ * use f_path.dentry for this comparision.
-+ */
-+ if (src->f_path.dentry < dst->f_path.dentry) {
-+ a_src.h_file = au_read_pre(src, /*keep_fi*/1, AuLsc_FI_1);
-+ err = PTR_ERR(a_src.h_file);
-+ if (IS_ERR(a_src.h_file))
-+ goto out_si;
++static inline void au_do_vm_file_reset(struct vm_area_struct *vma,
++ struct file *file)
++{
++ struct file *f;
+
-+ wpre.lsc = AuLsc_FI_2;
-+ a_dst.h_file = au_write_pre(dst, /*do_ready*/1, &wpre);
-+ err = PTR_ERR(a_dst.h_file);
-+ if (IS_ERR(a_dst.h_file)) {
-+ au_read_post(a_src.inode, a_src.h_file);
-+ goto out_si;
-+ }
-+ } else {
-+ wpre.lsc = AuLsc_FI_1;
-+ a_dst.h_file = au_write_pre(dst, /*do_ready*/1, &wpre);
-+ err = PTR_ERR(a_dst.h_file);
-+ if (IS_ERR(a_dst.h_file))
-+ goto out_si;
++ f = vma->vm_file;
++ get_file(file);
++ vma->vm_file = file;
++ fput(f);
++}
+
-+ a_src.h_file = au_read_pre(src, /*keep_fi*/1, AuLsc_FI_2);
-+ err = PTR_ERR(a_src.h_file);
-+ if (IS_ERR(a_src.h_file)) {
-+ au_write_post(a_dst.inode, a_dst.h_file, &wpre,
-+ /*written*/0);
-+ goto out_si;
-+ }
-+ }
++#ifdef CONFIG_MMU
++#define AuDbgVmRegion(file, vma) do {} while (0)
+
-+ err = -EXDEV;
-+ a_src.h_sb = file_inode(a_src.h_file)->i_sb;
-+ a_dst.h_sb = file_inode(a_dst.h_file)->i_sb;
-+ if (unlikely(a_src.h_sb != a_dst.h_sb)) {
-+ AuDbgFile(src);
-+ AuDbgFile(dst);
-+ goto out_file;
-+ }
++static inline void au_vm_file_reset(struct vm_area_struct *vma,
++ struct file *file)
++{
++ au_do_vm_file_reset(vma, file);
++}
++#else
++#define AuDbgVmRegion(file, vma) \
++ AuDebugOn((vma)->vm_region && (vma)->vm_region->vm_file != (file))
+
-+ err = vfsub_copy_file_range(a_src.h_file, src_pos, a_dst.h_file,
-+ dst_pos, len, flags);
++static inline void au_vm_file_reset(struct vm_area_struct *vma,
++ struct file *file)
++{
++ struct file *f;
+
-+out_file:
-+ au_write_post(a_dst.inode, a_dst.h_file, &wpre, err);
-+ fi_read_unlock(src);
-+ au_read_post(a_src.inode, a_src.h_file);
-+out_si:
-+ si_read_unlock(a_dst.inode->i_sb);
-+ inode_unlock(a_dst.inode);
-+out:
-+ return err;
-+#undef a_src
-+#undef a_dst
++ au_do_vm_file_reset(vma, file);
++ f = vma->vm_region->vm_file;
++ get_file(file);
++ vma->vm_region->vm_file = file;
++ fput(f);
+}
++#endif /* CONFIG_MMU */
+
-+/* ---------------------------------------------------------------------- */
++/* handle vma->vm_prfile */
++static inline void au_vm_prfile_set(struct vm_area_struct *vma,
++ struct file *file)
++{
++ get_file(file);
++ vma->vm_prfile = file;
++#ifndef CONFIG_MMU
++ get_file(file);
++ vma->vm_region->vm_prfile = file;
++#endif
++}
+
++#endif /* __KERNEL__ */
++#endif /* __AUFS_FILE_H__ */
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/finfo.c linux-4.14/fs/aufs/finfo.c
+--- linux-4.14/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/finfo.c 2021-02-24 21:42:43.441114748 +0100
+@@ -0,0 +1,148 @@
+/*
-+ * The locking order around current->mmap_sem.
-+ * - in most and regular cases
-+ * file I/O syscall -- aufs_read() or something
-+ * -- si_rwsem for read -- mmap_sem
-+ * (Note that [fdi]i_rwsem are released before mmap_sem).
-+ * - in mmap case
-+ * mmap(2) -- mmap_sem -- aufs_mmap() -- si_rwsem for read -- [fdi]i_rwsem
-+ * This AB-BA order is definitly bad, but is not a problem since "si_rwsem for
-+ * read" allows muliple processes to acquire it and [fdi]i_rwsem are not held in
-+ * file I/O. Aufs needs to stop lockdep in aufs_mmap() though.
-+ * It means that when aufs acquires si_rwsem for write, the process should never
-+ * acquire mmap_sem.
++ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ *
-+ * Actually aufs_iterate() holds [fdi]i_rwsem before mmap_sem, but this is not a
-+ * problem either since any directory is not able to be mmap-ed.
-+ * The similar scenario is applied to aufs_readlink() too.
++ * This program, aufs 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/>.
+ */
+
-+#if 0 /* stop calling security_file_mmap() */
-+/* cf. linux/include/linux/mman.h: calc_vm_prot_bits() */
-+#define AuConv_VM_PROT(f, b) _calc_vm_trans(f, VM_##b, PROT_##b)
++/*
++ * file private data
++ */
+
-+static unsigned long au_arch_prot_conv(unsigned long flags)
++#include "aufs.h"
++
++void au_hfput(struct au_hfile *hf, int execed)
+{
-+ /* currently ppc64 only */
-+#ifdef CONFIG_PPC64
-+ /* cf. linux/arch/powerpc/include/asm/mman.h */
-+ AuDebugOn(arch_calc_vm_prot_bits(-1) != VM_SAO);
-+ return AuConv_VM_PROT(flags, SAO);
-+#else
-+ AuDebugOn(arch_calc_vm_prot_bits(-1));
-+ return 0;
-+#endif
++ if (execed)
++ allow_write_access(hf->hf_file);
++ fput(hf->hf_file);
++ hf->hf_file = NULL;
++ au_br_put(hf->hf_br);
++ hf->hf_br = NULL;
+}
+
-+static unsigned long au_prot_conv(unsigned long flags)
++void au_set_h_fptr(struct file *file, aufs_bindex_t bindex, struct file *val)
+{
-+ return AuConv_VM_PROT(flags, READ)
-+ | AuConv_VM_PROT(flags, WRITE)
-+ | AuConv_VM_PROT(flags, EXEC)
-+ | au_arch_prot_conv(flags);
-+}
++ struct au_finfo *finfo = au_fi(file);
++ struct au_hfile *hf;
++ struct au_fidir *fidir;
+
-+/* cf. linux/include/linux/mman.h: calc_vm_flag_bits() */
-+#define AuConv_VM_MAP(f, b) _calc_vm_trans(f, VM_##b, MAP_##b)
++ fidir = finfo->fi_hdir;
++ if (!fidir) {
++ AuDebugOn(finfo->fi_btop != bindex);
++ hf = &finfo->fi_htop;
++ } else
++ hf = fidir->fd_hfile + bindex;
+
-+static unsigned long au_flag_conv(unsigned long flags)
-+{
-+ return AuConv_VM_MAP(flags, GROWSDOWN)
-+ | AuConv_VM_MAP(flags, DENYWRITE)
-+ | AuConv_VM_MAP(flags, LOCKED);
++ if (hf && hf->hf_file)
++ au_hfput(hf, vfsub_file_execed(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);
++ }
+}
-+#endif
+
-+static int aufs_mmap(struct file *file, struct vm_area_struct *vma)
++void au_update_figen(struct file *file)
+{
-+ int err;
-+ const unsigned char wlock
-+ = (file->f_mode & FMODE_WRITE) && (vma->vm_flags & VM_SHARED);
-+ struct super_block *sb;
-+ struct file *h_file;
-+ struct inode *inode;
-+
-+ AuDbgVmRegion(file, vma);
++ atomic_set(&au_fi(file)->fi_generation, au_digen(file->f_path.dentry));
++ /* smp_mb(); */ /* atomic_set */
++}
+
-+ inode = file_inode(file);
-+ sb = inode->i_sb;
-+ lockdep_off();
-+ si_read_lock(sb, AuLock_NOPLMW);
++/* ---------------------------------------------------------------------- */
+
-+ h_file = au_write_pre(file, wlock, /*wpre*/NULL);
-+ lockdep_on();
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out;
++struct au_fidir *au_fidir_alloc(struct super_block *sb)
++{
++ struct au_fidir *fidir;
++ int nbr;
+
-+ err = 0;
-+ au_set_mmapped(file);
-+ au_vm_file_reset(vma, h_file);
-+ /*
-+ * we cannot call security_mmap_file() here since it may acquire
-+ * mmap_sem or i_mutex.
-+ *
-+ * err = security_mmap_file(h_file, au_prot_conv(vma->vm_flags),
-+ * au_flag_conv(vma->vm_flags));
-+ */
-+ if (!err)
-+ err = call_mmap(h_file, vma);
-+ if (!err) {
-+ au_vm_prfile_set(vma, file);
-+ fsstack_copy_attr_atime(inode, file_inode(h_file));
-+ goto out_fput; /* success */
++ nbr = au_sbbot(sb) + 1;
++ if (nbr < 2)
++ nbr = 2; /* initial allocate for 2 branches */
++ fidir = kzalloc(au_fidir_sz(nbr), GFP_NOFS);
++ if (fidir) {
++ fidir->fd_bbot = -1;
++ fidir->fd_nent = nbr;
+ }
-+ au_unset_mmapped(file);
-+ au_vm_file_reset(vma, file);
+
-+out_fput:
-+ lockdep_off();
-+ ii_write_unlock(inode);
-+ lockdep_on();
-+ fput(h_file);
-+out:
-+ lockdep_off();
-+ si_read_unlock(sb);
-+ lockdep_on();
-+ AuTraceErr(err);
-+ return err;
++ return fidir;
+}
+
-+/* ---------------------------------------------------------------------- */
-+
-+static int aufs_fsync_nondir(struct file *file, loff_t start, loff_t end,
-+ int datasync)
++int au_fidir_realloc(struct au_finfo *finfo, int nbr, int may_shrink)
+{
+ int err;
-+ struct au_write_pre wpre;
-+ struct inode *inode;
-+ struct file *h_file;
-+
-+ err = 0; /* -EBADF; */ /* posix? */
-+ if (unlikely(!(file->f_mode & FMODE_WRITE)))
-+ goto out;
-+
-+ inode = file_inode(file);
-+ au_mtx_and_read_lock(inode);
++ struct au_fidir *fidir, *p;
+
-+ wpre.lsc = 0;
-+ h_file = au_write_pre(file, /*do_ready*/1, &wpre);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out_unlock;
++ AuRwMustWriteLock(&finfo->fi_rwsem);
++ fidir = finfo->fi_hdir;
++ AuDebugOn(!fidir);
+
-+ err = vfsub_fsync(h_file, &h_file->f_path, datasync);
-+ au_write_post(inode, h_file, &wpre, /*written*/0);
++ err = -ENOMEM;
++ p = au_kzrealloc(fidir, au_fidir_sz(fidir->fd_nent), au_fidir_sz(nbr),
++ GFP_NOFS, may_shrink);
++ if (p) {
++ p->fd_nent = nbr;
++ finfo->fi_hdir = p;
++ err = 0;
++ }
+
-+out_unlock:
-+ si_read_unlock(inode->i_sb);
-+ inode_unlock(inode);
-+out:
+ return err;
+}
+
-+static int aufs_fasync(int fd, struct file *file, int flag)
++/* ---------------------------------------------------------------------- */
++
++void au_finfo_fin(struct file *file)
+{
-+ int err;
-+ struct file *h_file;
-+ struct super_block *sb;
++ struct au_finfo *finfo;
+
-+ sb = file->f_path.dentry->d_sb;
-+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
++ au_nfiles_dec(file->f_path.dentry->d_sb);
+
-+ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out;
++ finfo = au_fi(file);
++ AuDebugOn(finfo->fi_hdir);
++ AuRwDestroy(&finfo->fi_rwsem);
++ au_cache_free_finfo(finfo);
++}
+
-+ if (h_file->f_op->fasync)
-+ err = h_file->f_op->fasync(fd, h_file, flag);
-+ fput(h_file); /* instead of au_read_post() */
++void au_fi_init_once(void *_finfo)
++{
++ struct au_finfo *finfo = _finfo;
+
-+out:
-+ si_read_unlock(sb);
-+ return err;
++ au_rw_init(&finfo->fi_rwsem);
+}
+
-+static int aufs_setfl(struct file *file, unsigned long arg)
++int au_finfo_init(struct file *file, struct au_fidir *fidir)
+{
+ int err;
-+ struct file *h_file;
-+ struct super_block *sb;
-+
-+ sb = file->f_path.dentry->d_sb;
-+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
++ struct au_finfo *finfo;
++ struct dentry *dentry;
+
-+ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
++ err = -ENOMEM;
++ dentry = file->f_path.dentry;
++ finfo = au_cache_alloc_finfo();
++ if (unlikely(!finfo))
+ goto out;
+
-+ /* stop calling h_file->fasync */
-+ arg |= vfsub_file_flags(file) & FASYNC;
-+ err = setfl(/*unused fd*/-1, h_file, arg);
-+ fput(h_file); /* instead of au_read_post() */
++ err = 0;
++ au_nfiles_inc(dentry->d_sb);
++ au_rw_write_lock(&finfo->fi_rwsem);
++ finfo->fi_btop = -1;
++ finfo->fi_hdir = fidir;
++ atomic_set(&finfo->fi_generation, au_digen(dentry));
++ /* smp_mb(); */ /* atomic_set */
++
++ file->private_data = finfo;
+
+out:
-+ si_read_unlock(sb);
+ return err;
+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+/* no one supports this operation, currently */
-+#if 0
-+static ssize_t aufs_sendpage(struct file *file, struct page *page, int offset,
-+ size_t len, loff_t *pos, int more)
-+{
-+}
-+#endif
-+
-+/* ---------------------------------------------------------------------- */
-+
-+const struct file_operations aufs_file_fop = {
-+ .owner = THIS_MODULE,
-+
-+ .llseek = default_llseek,
-+
-+ .read = aufs_read,
-+ .write = aufs_write,
-+ .read_iter = aufs_read_iter,
-+ .write_iter = aufs_write_iter,
-+
-+#ifdef CONFIG_AUFS_POLL
-+ .poll = aufs_poll,
-+#endif
-+ .unlocked_ioctl = aufs_ioctl_nondir,
-+#ifdef CONFIG_COMPAT
-+ .compat_ioctl = aufs_compat_ioctl_nondir,
-+#endif
-+ .mmap = aufs_mmap,
-+ .open = aufs_open_nondir,
-+ .flush = aufs_flush_nondir,
-+ .release = aufs_release_nondir,
-+ .fsync = aufs_fsync_nondir,
-+ .fasync = aufs_fasync,
-+ /* .sendpage = aufs_sendpage, */
-+ .setfl = aufs_setfl,
-+ .splice_write = aufs_splice_write,
-+ .splice_read = aufs_splice_read,
-+#if 0
-+ .aio_splice_write = aufs_aio_splice_write,
-+ .aio_splice_read = aufs_aio_splice_read,
-+#endif
-+ .fallocate = aufs_fallocate,
-+ .copy_file_range = aufs_copy_file_range
-+};
-diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
---- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h 2017-07-29 12:14:25.903042072 +0200
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/fstype.h linux-4.14/fs/aufs/fstype.h
+--- linux-4.14/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/fstype.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,400 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_FSTYPE_H__ */
-diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h
---- /usr/share/empty/fs/aufs/hbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hbl.h 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/hbl.h linux-4.14/fs/aufs/hbl.h
+--- linux-4.14/fs/aufs/hbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/hbl.h 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_HBL_H__ */
-diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
---- /usr/share/empty/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsnotify.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/hfsnotify.c linux-4.14/fs/aufs/hfsnotify.c
+--- linux-4.14/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/hfsnotify.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,289 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ .fin_br = au_hfsn_fin_br,
+ .init_br = au_hfsn_init_br
+};
-diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
---- /usr/share/empty/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsplus.c 2017-07-29 12:14:25.903042072 +0200
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/hfsplus.c linux-4.14/fs/aufs/hfsplus.c
+--- linux-4.14/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/hfsplus.c 2021-02-24 21:42:43.441114748 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010-2017 Junjiro R. Okajima
+ au_sbr_put(dentry->d_sb, bindex);
+ }
+}
-diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
---- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/hnotify.c linux-4.14/fs/aufs/hnotify.c
+--- linux-4.14/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/hnotify.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,719 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ args->h_child_nlen = len;
+ if (len) {
+ p = (void *)args;
-+ p += sizeof(*args);
-+ memcpy(p, h_child_name, len);
-+ p[len] = 0;
-+ }
-+
-+ /* NFS fires the event for silly-renamed one from kworker */
-+ f = 0;
-+ if (!dir->i_nlink
-+ || (au_test_nfs(h_dir->i_sb) && (mask & FS_DELETE)))
-+ f = AuWkq_NEST;
-+ err = au_wkq_nowait(au_hn_bh, args, dir->i_sb, f);
-+ if (unlikely(err)) {
-+ pr_err("wkq %d\n", err);
-+ iput(args->h_child_inode);
-+ iput(args->h_dir);
-+ iput(args->dir);
-+ kfree(args);
-+ }
-+
-+out:
-+ return err;
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm)
-+{
-+ int err;
-+
-+ AuDebugOn(!(udba & AuOptMask_UDBA));
-+
-+ err = 0;
-+ if (au_hnotify_op.reset_br)
-+ err = au_hnotify_op.reset_br(udba, br, perm);
-+
-+ return err;
-+}
-+
-+int au_hnotify_init_br(struct au_branch *br, int perm)
-+{
-+ int err;
-+
-+ err = 0;
-+ if (au_hnotify_op.init_br)
-+ err = au_hnotify_op.init_br(br, perm);
-+
-+ return err;
-+}
-+
-+void au_hnotify_fin_br(struct au_branch *br)
-+{
-+ if (au_hnotify_op.fin_br)
-+ au_hnotify_op.fin_br(br);
-+}
-+
-+static void au_hn_destroy_cache(void)
-+{
-+ kmem_cache_destroy(au_cache[AuCache_HNOTIFY]);
-+ au_cache[AuCache_HNOTIFY] = NULL;
-+}
-+
-+int __init au_hnotify_init(void)
-+{
-+ int err;
-+
-+ err = -ENOMEM;
-+ au_cache[AuCache_HNOTIFY] = AuCache(au_hnotify);
-+ if (au_cache[AuCache_HNOTIFY]) {
-+ err = 0;
-+ if (au_hnotify_op.init)
-+ err = au_hnotify_op.init();
-+ if (unlikely(err))
-+ au_hn_destroy_cache();
-+ }
-+ AuTraceErr(err);
-+ return err;
-+}
-+
-+void au_hnotify_fin(void)
-+{
-+ if (au_hnotify_op.fin)
-+ au_hnotify_op.fin();
-+
-+ /* cf. au_cache_fin() */
-+ if (au_cache[AuCache_HNOTIFY])
-+ au_hn_destroy_cache();
-+}
-diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
---- /usr/share/empty/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/iinfo.c 2017-11-12 22:24:42.270843503 +0100
-@@ -0,0 +1,285 @@
-+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
-+ *
-+ * This program, aufs 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/>.
-+ */
-+
-+/*
-+ * inode private data
-+ */
-+
-+#include "aufs.h"
-+
-+struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex)
-+{
-+ struct inode *h_inode;
-+ struct au_hinode *hinode;
-+
-+ IiMustAnyLock(inode);
-+
-+ hinode = au_hinode(au_ii(inode), bindex);
-+ h_inode = hinode->hi_inode;
-+ AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0);
-+ return h_inode;
-+}
-+
-+/* todo: hard/soft set? */
-+void au_hiput(struct au_hinode *hinode)
-+{
-+ au_hn_free(hinode);
-+ dput(hinode->hi_whdentry);
-+ iput(hinode->hi_inode);
-+}
-+
-+unsigned int au_hi_flags(struct inode *inode, int isdir)
-+{
-+ unsigned int flags;
-+ const unsigned int mnt_flags = au_mntflags(inode->i_sb);
-+
-+ flags = 0;
-+ if (au_opt_test(mnt_flags, XINO))
-+ au_fset_hi(flags, XINO);
-+ if (isdir && au_opt_test(mnt_flags, UDBA_HNOTIFY))
-+ au_fset_hi(flags, HNOTIFY);
-+ return flags;
-+}
-+
-+void au_set_h_iptr(struct inode *inode, aufs_bindex_t bindex,
-+ struct inode *h_inode, unsigned int flags)
-+{
-+ struct au_hinode *hinode;
-+ struct inode *hi;
-+ struct au_iinfo *iinfo = au_ii(inode);
-+
-+ IiMustWriteLock(inode);
-+
-+ hinode = au_hinode(iinfo, bindex);
-+ hi = hinode->hi_inode;
-+ AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0);
-+
-+ if (hi)
-+ au_hiput(hinode);
-+ hinode->hi_inode = h_inode;
-+ if (h_inode) {
-+ int err;
-+ struct super_block *sb = inode->i_sb;
-+ struct au_branch *br;
-+
-+ AuDebugOn(inode->i_mode
-+ && (h_inode->i_mode & S_IFMT)
-+ != (inode->i_mode & S_IFMT));
-+ if (bindex == iinfo->ii_btop)
-+ au_cpup_igen(inode, h_inode);
-+ br = au_sbr(sb, bindex);
-+ hinode->hi_id = br->br_id;
-+ if (au_ftest_hi(flags, XINO)) {
-+ err = au_xino_write(sb, bindex, h_inode->i_ino,
-+ inode->i_ino);
-+ if (unlikely(err))
-+ AuIOErr1("failed au_xino_write() %d\n", err);
-+ }
-+
-+ if (au_ftest_hi(flags, HNOTIFY)
-+ && au_br_hnotifyable(br->br_perm)) {
-+ err = au_hn_alloc(hinode, inode);
-+ if (unlikely(err))
-+ AuIOErr1("au_hn_alloc() %d\n", err);
-+ }
-+ }
-+}
-+
-+void au_set_hi_wh(struct inode *inode, aufs_bindex_t bindex,
-+ struct dentry *h_wh)
-+{
-+ struct au_hinode *hinode;
-+
-+ IiMustWriteLock(inode);
-+
-+ hinode = au_hinode(au_ii(inode), bindex);
-+ AuDebugOn(hinode->hi_whdentry);
-+ hinode->hi_whdentry = h_wh;
-+}
-+
-+void au_update_iigen(struct inode *inode, int half)
-+{
-+ struct au_iinfo *iinfo;
-+ struct au_iigen *iigen;
-+ unsigned int sigen;
-+
-+ sigen = au_sigen(inode->i_sb);
-+ iinfo = au_ii(inode);
-+ iigen = &iinfo->ii_generation;
-+ spin_lock(&iigen->ig_spin);
-+ iigen->ig_generation = sigen;
-+ if (half)
-+ au_ig_fset(iigen->ig_flags, HALF_REFRESHED);
-+ else
-+ au_ig_fclr(iigen->ig_flags, HALF_REFRESHED);
-+ spin_unlock(&iigen->ig_spin);
-+}
-+
-+/* it may be called at remount time, too */
-+void au_update_ibrange(struct inode *inode, int do_put_zero)
-+{
-+ struct au_iinfo *iinfo;
-+ aufs_bindex_t bindex, bbot;
-+
-+ AuDebugOn(au_is_bad_inode(inode));
-+ IiMustWriteLock(inode);
-+
-+ iinfo = au_ii(inode);
-+ if (do_put_zero && iinfo->ii_btop >= 0) {
-+ for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot;
-+ bindex++) {
-+ struct inode *h_i;
-+
-+ h_i = au_hinode(iinfo, bindex)->hi_inode;
-+ if (h_i
-+ && !h_i->i_nlink
-+ && !(h_i->i_state & I_LINKABLE))
-+ au_set_h_iptr(inode, bindex, NULL, 0);
-+ }
-+ }
-+
-+ iinfo->ii_btop = -1;
-+ iinfo->ii_bbot = -1;
-+ bbot = au_sbbot(inode->i_sb);
-+ for (bindex = 0; bindex <= bbot; bindex++)
-+ if (au_hinode(iinfo, bindex)->hi_inode) {
-+ iinfo->ii_btop = bindex;
-+ break;
-+ }
-+ if (iinfo->ii_btop >= 0)
-+ for (bindex = bbot; bindex >= iinfo->ii_btop; bindex--)
-+ if (au_hinode(iinfo, bindex)->hi_inode) {
-+ iinfo->ii_bbot = bindex;
-+ break;
-+ }
-+ AuDebugOn(iinfo->ii_btop > iinfo->ii_bbot);
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+void au_icntnr_init_once(void *_c)
-+{
-+ struct au_icntnr *c = _c;
-+ struct au_iinfo *iinfo = &c->iinfo;
-+
-+ spin_lock_init(&iinfo->ii_generation.ig_spin);
-+ au_rw_init(&iinfo->ii_rwsem);
-+ inode_init_once(&c->vfs_inode);
-+}
-+
-+void au_hinode_init(struct au_hinode *hinode)
-+{
-+ hinode->hi_inode = NULL;
-+ hinode->hi_id = -1;
-+ au_hn_init(hinode);
-+ hinode->hi_whdentry = NULL;
-+}
-+
-+int au_iinfo_init(struct inode *inode)
-+{
-+ struct au_iinfo *iinfo;
-+ struct super_block *sb;
-+ struct au_hinode *hi;
-+ int nbr, i;
-+
-+ sb = inode->i_sb;
-+ iinfo = &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo);
-+ nbr = au_sbbot(sb) + 1;
-+ if (unlikely(nbr <= 0))
-+ nbr = 1;
-+ hi = kmalloc_array(nbr, sizeof(*iinfo->ii_hinode), GFP_NOFS);
-+ if (hi) {
-+ au_ninodes_inc(sb);
-+
-+ iinfo->ii_hinode = hi;
-+ for (i = 0; i < nbr; i++, hi++)
-+ au_hinode_init(hi);
-+
-+ iinfo->ii_generation.ig_generation = au_sigen(sb);
-+ iinfo->ii_btop = -1;
-+ iinfo->ii_bbot = -1;
-+ iinfo->ii_vdir = NULL;
-+ return 0;
-+ }
-+ return -ENOMEM;
-+}
-+
-+int au_hinode_realloc(struct au_iinfo *iinfo, int nbr, int may_shrink)
-+{
-+ int err, i;
-+ struct au_hinode *hip;
-+
-+ AuRwMustWriteLock(&iinfo->ii_rwsem);
-+
-+ err = -ENOMEM;
-+ hip = au_krealloc(iinfo->ii_hinode, sizeof(*hip) * nbr, GFP_NOFS,
-+ may_shrink);
-+ if (hip) {
-+ iinfo->ii_hinode = hip;
-+ i = iinfo->ii_bbot + 1;
-+ hip += i;
-+ for (; i < nbr; i++, hip++)
-+ au_hinode_init(hip);
-+ err = 0;
-+ }
-+
-+ return err;
-+}
-+
-+void au_iinfo_fin(struct inode *inode)
-+{
-+ struct au_iinfo *iinfo;
-+ struct au_hinode *hi;
-+ struct super_block *sb;
-+ aufs_bindex_t bindex, bbot;
-+ const unsigned char unlinked = !inode->i_nlink;
-+
-+ AuDebugOn(au_is_bad_inode(inode));
-+
-+ sb = inode->i_sb;
-+ au_ninodes_dec(sb);
-+ if (si_pid_test(sb))
-+ au_xino_delete_inode(inode, unlinked);
-+ else {
-+ /*
-+ * it is safe to hide the dependency between sbinfo and
-+ * sb->s_umount.
-+ */
-+ lockdep_off();
-+ si_noflush_read_lock(sb);
-+ au_xino_delete_inode(inode, unlinked);
-+ si_read_unlock(sb);
-+ lockdep_on();
-+ }
-+
-+ iinfo = au_ii(inode);
-+ if (iinfo->ii_vdir)
-+ au_vdir_free(iinfo->ii_vdir);
-+
-+ bindex = iinfo->ii_btop;
-+ if (bindex >= 0) {
-+ hi = au_hinode(iinfo, bindex);
-+ bbot = iinfo->ii_bbot;
-+ while (bindex++ <= bbot) {
-+ if (hi->hi_inode)
-+ au_hiput(hi);
-+ hi++;
-+ }
-+ }
-+ kfree(iinfo->ii_hinode);
-+ AuRwDestroy(&iinfo->ii_rwsem);
-+}
-diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
---- /usr/share/empty/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c 2017-11-12 22:24:42.270843503 +0100
-@@ -0,0 +1,527 @@
-+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
-+ *
-+ * This program, aufs 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/>.
-+ */
-+
-+/*
-+ * inode functions
-+ */
-+
-+#include "aufs.h"
-+
-+struct inode *au_igrab(struct inode *inode)
-+{
-+ if (inode) {
-+ AuDebugOn(!atomic_read(&inode->i_count));
-+ ihold(inode);
-+ }
-+ return inode;
-+}
-+
-+static void au_refresh_hinode_attr(struct inode *inode, int do_version)
-+{
-+ au_cpup_attr_all(inode, /*force*/0);
-+ au_update_iigen(inode, /*half*/1);
-+ if (do_version)
-+ inode->i_version++;
-+}
-+
-+static int au_ii_refresh(struct inode *inode, int *update)
-+{
-+ int err, e, nbr;
-+ umode_t type;
-+ aufs_bindex_t bindex, new_bindex;
-+ struct super_block *sb;
-+ struct au_iinfo *iinfo;
-+ struct au_hinode *p, *q, tmp;
-+
-+ AuDebugOn(au_is_bad_inode(inode));
-+ IiMustWriteLock(inode);
-+
-+ *update = 0;
-+ sb = inode->i_sb;
-+ nbr = au_sbbot(sb) + 1;
-+ type = inode->i_mode & S_IFMT;
-+ iinfo = au_ii(inode);
-+ err = au_hinode_realloc(iinfo, nbr, /*may_shrink*/0);
-+ if (unlikely(err))
-+ goto out;
-+
-+ AuDebugOn(iinfo->ii_btop < 0);
-+ p = au_hinode(iinfo, iinfo->ii_btop);
-+ for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot;
-+ bindex++, p++) {
-+ if (!p->hi_inode)
-+ continue;
-+
-+ AuDebugOn(type != (p->hi_inode->i_mode & S_IFMT));
-+ new_bindex = au_br_index(sb, p->hi_id);
-+ if (new_bindex == bindex)
-+ continue;
-+
-+ if (new_bindex < 0) {
-+ *update = 1;
-+ au_hiput(p);
-+ p->hi_inode = NULL;
-+ continue;
-+ }
-+
-+ if (new_bindex < iinfo->ii_btop)
-+ iinfo->ii_btop = new_bindex;
-+ if (iinfo->ii_bbot < new_bindex)
-+ iinfo->ii_bbot = new_bindex;
-+ /* swap two lower inode, and loop again */
-+ q = au_hinode(iinfo, new_bindex);
-+ tmp = *q;
-+ *q = *p;
-+ *p = tmp;
-+ if (tmp.hi_inode) {
-+ bindex--;
-+ p--;
-+ }
++ p += sizeof(*args);
++ memcpy(p, h_child_name, len);
++ p[len] = 0;
++ }
++
++ /* NFS fires the event for silly-renamed one from kworker */
++ f = 0;
++ if (!dir->i_nlink
++ || (au_test_nfs(h_dir->i_sb) && (mask & FS_DELETE)))
++ f = AuWkq_NEST;
++ err = au_wkq_nowait(au_hn_bh, args, dir->i_sb, f);
++ if (unlikely(err)) {
++ pr_err("wkq %d\n", err);
++ iput(args->h_child_inode);
++ iput(args->h_dir);
++ iput(args->dir);
++ kfree(args);
+ }
-+ au_update_ibrange(inode, /*do_put_zero*/0);
-+ au_hinode_realloc(iinfo, nbr, /*may_shrink*/1); /* harmless if err */
-+ e = au_dy_irefresh(inode);
-+ if (unlikely(e && !err))
-+ err = e;
+
+out:
-+ AuTraceErr(err);
+ return err;
+}
+
-+void au_refresh_iop(struct inode *inode, int force_getattr)
++/* ---------------------------------------------------------------------- */
++
++int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm)
+{
-+ int type;
-+ struct au_sbinfo *sbi = au_sbi(inode->i_sb);
-+ const struct inode_operations *iop
-+ = force_getattr ? aufs_iop : sbi->si_iop_array;
++ int err;
+
-+ if (inode->i_op == iop)
-+ return;
++ AuDebugOn(!(udba & AuOptMask_UDBA));
+
-+ switch (inode->i_mode & S_IFMT) {
-+ case S_IFDIR:
-+ type = AuIop_DIR;
-+ break;
-+ case S_IFLNK:
-+ type = AuIop_SYMLINK;
-+ break;
-+ default:
-+ type = AuIop_OTHER;
-+ break;
-+ }
++ err = 0;
++ if (au_hnotify_op.reset_br)
++ err = au_hnotify_op.reset_br(udba, br, perm);
+
-+ inode->i_op = iop + type;
-+ /* unnecessary smp_wmb() */
++ return err;
+}
+
-+int au_refresh_hinode_self(struct inode *inode)
++int au_hnotify_init_br(struct au_branch *br, int perm)
+{
-+ int err, update;
++ int err;
+
-+ err = au_ii_refresh(inode, &update);
-+ if (!err)
-+ au_refresh_hinode_attr(inode, update && S_ISDIR(inode->i_mode));
++ err = 0;
++ if (au_hnotify_op.init_br)
++ err = au_hnotify_op.init_br(br, perm);
+
-+ AuTraceErr(err);
+ return err;
+}
+
-+int au_refresh_hinode(struct inode *inode, struct dentry *dentry)
++void au_hnotify_fin_br(struct au_branch *br)
+{
-+ int err, e, update;
-+ unsigned int flags;
-+ umode_t mode;
-+ aufs_bindex_t bindex, bbot;
-+ unsigned char isdir;
-+ struct au_hinode *p;
-+ struct au_iinfo *iinfo;
-+
-+ err = au_ii_refresh(inode, &update);
-+ if (unlikely(err))
-+ goto out;
-+
-+ update = 0;
-+ iinfo = au_ii(inode);
-+ p = au_hinode(iinfo, iinfo->ii_btop);
-+ mode = (inode->i_mode & S_IFMT);
-+ isdir = S_ISDIR(mode);
-+ flags = au_hi_flags(inode, isdir);
-+ bbot = au_dbbot(dentry);
-+ for (bindex = au_dbtop(dentry); bindex <= bbot; bindex++) {
-+ struct inode *h_i, *h_inode;
-+ struct dentry *h_d;
-+
-+ h_d = au_h_dptr(dentry, bindex);
-+ if (!h_d || d_is_negative(h_d))
-+ continue;
-+
-+ h_inode = d_inode(h_d);
-+ AuDebugOn(mode != (h_inode->i_mode & S_IFMT));
-+ if (iinfo->ii_btop <= bindex && bindex <= iinfo->ii_bbot) {
-+ h_i = au_h_iptr(inode, bindex);
-+ if (h_i) {
-+ if (h_i == h_inode)
-+ continue;
-+ err = -EIO;
-+ break;
-+ }
-+ }
-+ if (bindex < iinfo->ii_btop)
-+ iinfo->ii_btop = bindex;
-+ if (iinfo->ii_bbot < bindex)
-+ iinfo->ii_bbot = bindex;
-+ au_set_h_iptr(inode, bindex, au_igrab(h_inode), flags);
-+ update = 1;
-+ }
-+ au_update_ibrange(inode, /*do_put_zero*/0);
-+ e = au_dy_irefresh(inode);
-+ if (unlikely(e && !err))
-+ err = e;
-+ if (!err)
-+ au_refresh_hinode_attr(inode, update && isdir);
++ if (au_hnotify_op.fin_br)
++ au_hnotify_op.fin_br(br);
++}
+
-+out:
-+ AuTraceErr(err);
-+ return err;
++static void au_hn_destroy_cache(void)
++{
++ kmem_cache_destroy(au_cache[AuCache_HNOTIFY]);
++ au_cache[AuCache_HNOTIFY] = NULL;
+}
+
-+static int set_inode(struct inode *inode, struct dentry *dentry)
++int __init au_hnotify_init(void)
+{
+ int err;
-+ unsigned int flags;
-+ umode_t mode;
-+ aufs_bindex_t bindex, btop, btail;
-+ unsigned char isdir;
-+ struct dentry *h_dentry;
-+ struct inode *h_inode;
-+ struct au_iinfo *iinfo;
-+ struct inode_operations *iop;
+
-+ IiMustWriteLock(inode);
-+
-+ err = 0;
-+ isdir = 0;
-+ iop = au_sbi(inode->i_sb)->si_iop_array;
-+ btop = au_dbtop(dentry);
-+ h_dentry = au_h_dptr(dentry, btop);
-+ h_inode = d_inode(h_dentry);
-+ mode = h_inode->i_mode;
-+ switch (mode & S_IFMT) {
-+ case S_IFREG:
-+ btail = au_dbtail(dentry);
-+ inode->i_op = iop + AuIop_OTHER;
-+ inode->i_fop = &aufs_file_fop;
-+ err = au_dy_iaop(inode, btop, h_inode);
++ err = -ENOMEM;
++ au_cache[AuCache_HNOTIFY] = AuCache(au_hnotify);
++ if (au_cache[AuCache_HNOTIFY]) {
++ err = 0;
++ if (au_hnotify_op.init)
++ err = au_hnotify_op.init();
+ if (unlikely(err))
-+ goto out;
-+ break;
-+ case S_IFDIR:
-+ isdir = 1;
-+ btail = au_dbtaildir(dentry);
-+ inode->i_op = iop + AuIop_DIR;
-+ inode->i_fop = &aufs_dir_fop;
-+ break;
-+ case S_IFLNK:
-+ btail = au_dbtail(dentry);
-+ inode->i_op = iop + AuIop_SYMLINK;
-+ break;
-+ case S_IFBLK:
-+ case S_IFCHR:
-+ case S_IFIFO:
-+ case S_IFSOCK:
-+ btail = au_dbtail(dentry);
-+ inode->i_op = iop + AuIop_OTHER;
-+ init_special_inode(inode, mode, h_inode->i_rdev);
-+ break;
-+ default:
-+ AuIOErr("Unknown file type 0%o\n", mode);
-+ err = -EIO;
-+ goto out;
++ au_hn_destroy_cache();
+ }
++ AuTraceErr(err);
++ return err;
++}
+
-+ /* do not set hnotify for whiteouted dirs (SHWH mode) */
-+ flags = au_hi_flags(inode, isdir);
-+ if (au_opt_test(au_mntflags(dentry->d_sb), SHWH)
-+ && au_ftest_hi(flags, HNOTIFY)
-+ && dentry->d_name.len > AUFS_WH_PFX_LEN
-+ && !memcmp(dentry->d_name.name, AUFS_WH_PFX, AUFS_WH_PFX_LEN))
-+ au_fclr_hi(flags, HNOTIFY);
-+ iinfo = au_ii(inode);
-+ iinfo->ii_btop = btop;
-+ iinfo->ii_bbot = btail;
-+ for (bindex = btop; bindex <= btail; bindex++) {
-+ h_dentry = au_h_dptr(dentry, bindex);
-+ if (h_dentry)
-+ au_set_h_iptr(inode, bindex,
-+ au_igrab(d_inode(h_dentry)), flags);
-+ }
-+ au_cpup_attr_all(inode, /*force*/1);
-+ /*
-+ * to force calling aufs_get_acl() every time,
-+ * do not call cache_no_acl() for aufs inode.
-+ */
++void au_hnotify_fin(void)
++{
++ if (au_hnotify_op.fin)
++ au_hnotify_op.fin();
+
-+out:
-+ return err;
++ /* cf. au_cache_fin() */
++ if (au_cache[AuCache_HNOTIFY])
++ au_hn_destroy_cache();
+}
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/i_op.c linux-4.14/fs/aufs/i_op.c
+--- linux-4.14/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/i_op.c 2021-02-24 21:42:43.444448075 +0100
+@@ -0,0 +1,1459 @@
++/*
++ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ *
++ * This program, aufs 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/>.
++ */
+
+/*
-+ * successful returns with iinfo write_locked
-+ * minus: errno
-+ * zero: success, matched
-+ * plus: no error, but unmatched
++ * inode operations (except add/del/rename)
+ */
-+static int reval_inode(struct inode *inode, struct dentry *dentry)
++
++#include <linux/device_cgroup.h>
++#include <linux/fs_stack.h>
++#include <linux/namei.h>
++#include <linux/security.h>
++#include "aufs.h"
++
++static int h_permission(struct inode *h_inode, int mask,
++ struct path *h_path, int brperm)
+{
+ int err;
-+ unsigned int gen, igflags;
-+ aufs_bindex_t bindex, bbot;
-+ struct inode *h_inode, *h_dinode;
-+ struct dentry *h_dentry;
++ const unsigned char write_mask = !!(mask & (MAY_WRITE | MAY_APPEND));
+
-+ /*
-+ * before this function, if aufs got any iinfo lock, it must be only
-+ * one, the parent dir.
-+ * it can happen by UDBA and the obsoleted inode number.
-+ */
-+ err = -EIO;
-+ if (unlikely(inode->i_ino == parent_ino(dentry)))
++ err = -EPERM;
++ if (write_mask && IS_IMMUTABLE(h_inode))
+ goto out;
+
-+ err = 1;
-+ ii_write_lock_new_child(inode);
-+ h_dentry = au_h_dptr(dentry, au_dbtop(dentry));
-+ h_dinode = d_inode(h_dentry);
-+ bbot = au_ibbot(inode);
-+ for (bindex = au_ibtop(inode); bindex <= bbot; bindex++) {
-+ h_inode = au_h_iptr(inode, bindex);
-+ if (!h_inode || h_inode != h_dinode)
-+ continue;
-+
-+ err = 0;
-+ gen = au_iigen(inode, &igflags);
-+ if (gen == au_digen(dentry)
-+ && !au_ig_ftest(igflags, HALF_REFRESHED))
-+ break;
-+
-+ /* fully refresh inode using dentry */
-+ err = au_refresh_hinode(inode, dentry);
-+ if (!err)
-+ au_update_iigen(inode, /*half*/0);
-+ break;
-+ }
-+
-+ if (unlikely(err))
-+ ii_write_unlock(inode);
-+out:
-+ return err;
-+}
-+
-+int au_ino(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
-+ unsigned int d_type, ino_t *ino)
-+{
-+ int err, idx;
-+ const int isnondir = d_type != DT_DIR;
++ err = -EACCES;
++ if (((mask & MAY_EXEC)
++ && S_ISREG(h_inode->i_mode)
++ && (path_noexec(h_path)
++ || !(h_inode->i_mode & S_IXUGO))))
++ goto out;
+
-+ /* prevent hardlinked inode number from race condition */
-+ if (isnondir) {
-+ err = au_xinondir_enter(sb, bindex, h_ino, &idx);
-+ if (unlikely(err))
-+ goto out;
++ /*
++ * - 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);
++ AuTraceErr(err);
+ }
+
-+ err = au_xino_read(sb, bindex, h_ino, ino);
-+ if (unlikely(err))
-+ goto out_xinondir;
++ if (!err)
++ err = devcgroup_inode_permission(h_inode, mask);
++ if (!err)
++ err = security_inode_permission(h_inode, mask);
+
-+ if (!*ino) {
-+ err = -EIO;
-+ *ino = au_xino_new_ino(sb);
-+ if (unlikely(!*ino))
-+ goto out_xinondir;
-+ err = au_xino_write(sb, bindex, h_ino, *ino);
-+ if (unlikely(err))
-+ goto out_xinondir;
++#if 0
++ if (!err) {
++ /* todo: do we need to call ima_path_check()? */
++ struct path h_path = {
++ .dentry =
++ .mnt = h_mnt
++ };
++ err = ima_path_check(&h_path,
++ mask & (MAY_READ | MAY_WRITE | MAY_EXEC),
++ IMA_COUNT_LEAVE);
+ }
++#endif
+
-+out_xinondir:
-+ if (isnondir && idx >= 0)
-+ au_xinondir_leave(sb, bindex, h_ino, idx);
+out:
+ return err;
+}
+
-+/* successful returns with iinfo write_locked */
-+/* todo: return with unlocked? */
-+struct inode *au_new_inode(struct dentry *dentry, int must_new)
++static int aufs_permission(struct inode *inode, int mask)
+{
-+ struct inode *inode, *h_inode;
-+ struct dentry *h_dentry;
++ int err;
++ aufs_bindex_t bindex, bbot;
++ const unsigned char isdir = !!S_ISDIR(inode->i_mode),
++ write_mask = !!(mask & (MAY_WRITE | MAY_APPEND));
++ struct inode *h_inode;
+ struct super_block *sb;
-+ ino_t h_ino, ino;
-+ int err, idx, hlinked;
-+ aufs_bindex_t btop;
-+
-+ sb = dentry->d_sb;
-+ btop = au_dbtop(dentry);
-+ h_dentry = au_h_dptr(dentry, btop);
-+ h_inode = d_inode(h_dentry);
-+ h_ino = h_inode->i_ino;
-+ hlinked = !d_is_dir(h_dentry) && h_inode->i_nlink > 1;
++ struct au_branch *br;
+
-+new_ino:
-+ /*
-+ * stop 'race'-ing between hardlinks under different
-+ * parents.
-+ */
-+ if (hlinked) {
-+ err = au_xinondir_enter(sb, btop, h_ino, &idx);
-+ inode = ERR_PTR(err);
-+ if (unlikely(err))
-+ goto out;
-+ }
++ /* todo: support rcu-walk? */
++ if (mask & MAY_NOT_BLOCK)
++ return -ECHILD;
+
-+ err = au_xino_read(sb, btop, h_ino, &ino);
-+ inode = ERR_PTR(err);
++ sb = inode->i_sb;
++ si_read_lock(sb, AuLock_FLUSH);
++ ii_read_lock_child(inode);
++#if 0
++ err = au_iigen_test(inode, au_sigen(sb));
+ if (unlikely(err))
-+ goto out_xinondir;
++ goto out;
++#endif
+
-+ if (!ino) {
-+ ino = au_xino_new_ino(sb);
-+ if (unlikely(!ino)) {
-+ inode = ERR_PTR(-EIO);
-+ goto out_xinondir;
++ if (!isdir
++ || write_mask
++ || au_opt_test(au_mntflags(sb), DIRPERM1)) {
++ err = au_busy_or_stale();
++ h_inode = au_h_iptr(inode, au_ibtop(inode));
++ if (unlikely(!h_inode
++ || (h_inode->i_mode & S_IFMT)
++ != (inode->i_mode & S_IFMT)))
++ goto out;
++
++ err = 0;
++ bindex = au_ibtop(inode);
++ br = au_sbr(sb, bindex);
++ err = h_permission(h_inode, mask, &br->br_path, br->br_perm);
++ if (write_mask
++ && !err
++ && !special_file(h_inode->i_mode)) {
++ /* test whether the upper writable branch exists */
++ err = -EROFS;
++ for (; bindex >= 0; bindex--)
++ if (!au_br_rdonly(au_sbr(sb, bindex))) {
++ err = 0;
++ break;
++ }
+ }
++ goto out;
+ }
+
-+ AuDbg("i%lu\n", (unsigned long)ino);
-+ inode = au_iget_locked(sb, ino);
-+ err = PTR_ERR(inode);
-+ if (IS_ERR(inode))
-+ goto out_xinondir;
-+
-+ AuDbg("%lx, new %d\n", inode->i_state, !!(inode->i_state & I_NEW));
-+ if (inode->i_state & I_NEW) {
-+ ii_write_lock_new_child(inode);
-+ err = set_inode(inode, dentry);
-+ if (!err) {
-+ unlock_new_inode(inode);
-+ goto out_xinondir; /* success */
-+ }
++ /* non-write to dir */
++ err = 0;
++ bbot = au_ibbot(inode);
++ for (bindex = au_ibtop(inode); !err && bindex <= bbot; bindex++) {
++ h_inode = au_h_iptr(inode, bindex);
++ if (h_inode) {
++ err = au_busy_or_stale();
++ if (unlikely(!S_ISDIR(h_inode->i_mode)))
++ break;
+
-+ /*
-+ * iget_failed() calls iput(), but we need to call
-+ * ii_write_unlock() after iget_failed(). so dirty hack for
-+ * i_count.
-+ */
-+ atomic_inc(&inode->i_count);
-+ iget_failed(inode);
-+ ii_write_unlock(inode);
-+ au_xino_write(sb, btop, h_ino, /*ino*/0);
-+ /* ignore this error */
-+ goto out_iput;
-+ } else if (!must_new && !IS_DEADDIR(inode) && inode->i_nlink) {
-+ /*
-+ * horrible race condition between lookup, readdir and copyup
-+ * (or something).
-+ */
-+ if (hlinked && idx >= 0)
-+ au_xinondir_leave(sb, btop, h_ino, idx);
-+ err = reval_inode(inode, dentry);
-+ if (unlikely(err < 0)) {
-+ hlinked = 0;
-+ goto out_iput;
-+ }
-+ if (!err)
-+ goto out; /* success */
-+ else if (hlinked && idx >= 0) {
-+ err = au_xinondir_enter(sb, btop, h_ino, &idx);
-+ if (unlikely(err)) {
-+ iput(inode);
-+ inode = ERR_PTR(err);
-+ goto out;
-+ }
++ br = au_sbr(sb, bindex);
++ err = h_permission(h_inode, mask, &br->br_path,
++ br->br_perm);
+ }
+ }
+
-+ if (unlikely(au_test_fs_unique_ino(h_inode)))
-+ AuWarn1("Warning: Un-notified UDBA or repeatedly renamed dir,"
-+ " b%d, %s, %pd, hi%lu, i%lu.\n",
-+ btop, au_sbtype(h_dentry->d_sb), dentry,
-+ (unsigned long)h_ino, (unsigned long)ino);
-+ ino = 0;
-+ err = au_xino_write(sb, btop, h_ino, /*ino*/0);
-+ if (!err) {
-+ iput(inode);
-+ if (hlinked && idx >= 0)
-+ au_xinondir_leave(sb, btop, h_ino, idx);
-+ goto new_ino;
-+ }
-+
-+out_iput:
-+ iput(inode);
-+ inode = ERR_PTR(err);
-+out_xinondir:
-+ if (hlinked && idx >= 0)
-+ au_xinondir_leave(sb, btop, h_ino, idx);
+out:
-+ return inode;
++ ii_read_unlock(inode);
++ si_read_unlock(sb);
++ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
-+int au_test_ro(struct super_block *sb, aufs_bindex_t bindex,
-+ struct inode *inode)
++static struct dentry *aufs_lookup(struct inode *dir, struct dentry *dentry,
++ unsigned int flags)
+{
-+ int err;
-+ struct inode *hi;
++ struct dentry *ret, *parent;
++ struct inode *inode;
++ struct super_block *sb;
++ int err, npositive;
+
-+ err = au_br_rdonly(au_sbr(sb, bindex));
++ IMustLock(dir);
+
-+ /* pseudo-link after flushed may happen out of bounds */
-+ if (!err
-+ && inode
-+ && au_ibtop(inode) <= bindex
-+ && bindex <= au_ibbot(inode)) {
-+ /*
-+ * permission check is unnecessary since vfsub routine
-+ * will be called later
-+ */
-+ hi = au_h_iptr(inode, bindex);
-+ if (hi)
-+ err = IS_IMMUTABLE(hi) ? -EROFS : 0;
++ /* todo: support rcu-walk? */
++ ret = ERR_PTR(-ECHILD);
++ if (flags & LOOKUP_RCU)
++ goto out;
++
++ ret = ERR_PTR(-ENAMETOOLONG);
++ if (unlikely(dentry->d_name.len > AUFS_MAX_NAMELEN))
++ goto out;
++
++ sb = dir->i_sb;
++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
++ ret = ERR_PTR(err);
++ if (unlikely(err))
++ goto out;
++
++ err = au_di_init(dentry);
++ ret = ERR_PTR(err);
++ if (unlikely(err))
++ goto out_si;
++
++ inode = NULL;
++ npositive = 0; /* suppress a warning */
++ parent = dentry->d_parent; /* dir inode is locked */
++ di_read_lock_parent(parent, AuLock_IR);
++ err = au_alive_dir(parent);
++ if (!err)
++ err = au_digen_test(parent, au_sigen(sb));
++ if (!err) {
++ /* regardless LOOKUP_CREATE, always ALLOW_NEG */
++ npositive = au_lkup_dentry(dentry, au_dbtop(parent),
++ AuLkup_ALLOW_NEG);
++ err = npositive;
+ }
++ di_read_unlock(parent, AuLock_IR);
++ ret = ERR_PTR(err);
++ if (unlikely(err < 0))
++ goto out_unlock;
+
-+ return err;
-+}
++ if (npositive) {
++ inode = au_new_inode(dentry, /*must_new*/0);
++ if (IS_ERR(inode)) {
++ ret = (void *)inode;
++ inode = NULL;
++ goto out_unlock;
++ }
++ }
+
-+int au_test_h_perm(struct inode *h_inode, int mask)
-+{
-+ if (uid_eq(current_fsuid(), GLOBAL_ROOT_UID))
-+ return 0;
-+ return inode_permission(h_inode, mask);
-+}
++ if (inode)
++ atomic_inc(&inode->i_count);
++ ret = d_splice_alias(inode, dentry);
++#if 0
++ if (unlikely(d_need_lookup(dentry))) {
++ spin_lock(&dentry->d_lock);
++ dentry->d_flags &= ~DCACHE_NEED_LOOKUP;
++ spin_unlock(&dentry->d_lock);
++ } else
++#endif
++ if (inode) {
++ if (!IS_ERR(ret)) {
++ iput(inode);
++ if (ret && ret != dentry)
++ ii_write_unlock(inode);
++ } else {
++ ii_write_unlock(inode);
++ iput(inode);
++ inode = NULL;
++ }
++ }
+
-+int au_test_h_perm_sio(struct inode *h_inode, int mask)
-+{
-+ if (au_test_nfs(h_inode->i_sb)
-+ && (mask & MAY_WRITE)
-+ && S_ISDIR(h_inode->i_mode))
-+ mask |= MAY_READ; /* force permission check */
-+ return au_test_h_perm(h_inode, mask);
++out_unlock:
++ di_write_unlock(dentry);
++out_si:
++ si_read_unlock(sb);
++out:
++ return ret;
+}
-diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
---- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2017-11-12 22:24:44.707577830 +0100
-@@ -0,0 +1,695 @@
-+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
-+ *
-+ * This program, aufs 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/>.
-+ */
-+
-+/*
-+ * inode operations
-+ */
+
-+#ifndef __AUFS_INODE_H__
-+#define __AUFS_INODE_H__
++/* ---------------------------------------------------------------------- */
+
-+#ifdef __KERNEL__
++struct aopen_node {
++ struct hlist_bl_node hblist;
++ struct file *file, *h_file;
++};
+
-+#include <linux/fsnotify.h>
-+#include "rwsem.h"
++static int au_do_aopen(struct inode *inode, struct file *file)
++{
++ struct hlist_bl_head *aopen;
++ struct hlist_bl_node *pos;
++ struct aopen_node *node;
++ struct au_do_open_args args = {
++ .aopen = 1,
++ .open = au_do_open_nondir
++ };
+
-+struct vfsmount;
++ aopen = &au_sbi(inode->i_sb)->si_aopen;
++ hlist_bl_lock(aopen);
++ hlist_bl_for_each_entry(node, pos, aopen, hblist)
++ if (node->file == file) {
++ args.h_file = node->h_file;
++ break;
++ }
++ hlist_bl_unlock(aopen);
++ /* AuDebugOn(!args.h_file); */
+
-+struct au_hnotify {
-+#ifdef CONFIG_AUFS_HNOTIFY
-+#ifdef CONFIG_AUFS_HFSNOTIFY
-+ /* never use fsnotify_add_vfsmount_mark() */
-+ struct fsnotify_mark hn_mark;
-+#endif
-+ struct inode *hn_aufs_inode; /* no get/put */
-+#endif
-+} ____cacheline_aligned_in_smp;
++ return au_do_open(file, &args);
++}
+
-+struct au_hinode {
-+ struct inode *hi_inode;
-+ aufs_bindex_t hi_id;
-+#ifdef CONFIG_AUFS_HNOTIFY
-+ struct au_hnotify *hi_notify;
-+#endif
++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, unlocked, h_opened = *opened;
++ unsigned int lkup_flags;
++ struct dentry *parent, *d;
++ struct hlist_bl_head *aopen;
++ struct vfsub_aopen_args args = {
++ .open_flag = open_flag,
++ .create_mode = create_mode,
++ .opened = &h_opened
++ };
++ struct aopen_node aopen_node = {
++ .file = file
++ };
+
-+ /* reference to the copied-up whiteout with get/put */
-+ struct dentry *hi_whdentry;
-+};
++ IMustLock(dir);
++ AuDbg("open_flag 0%o\n", open_flag);
++ AuDbgDentry(dentry);
+
-+/* ig_flags */
-+#define AuIG_HALF_REFRESHED 1
-+#define au_ig_ftest(flags, name) ((flags) & AuIG_##name)
-+#define au_ig_fset(flags, name) \
-+ do { (flags) |= AuIG_##name; } while (0)
-+#define au_ig_fclr(flags, name) \
-+ do { (flags) &= ~AuIG_##name; } while (0)
++ err = 0;
++ if (!au_di(dentry)) {
++ lkup_flags = LOOKUP_OPEN;
++ if (open_flag & O_CREAT)
++ lkup_flags |= LOOKUP_CREATE;
++ d = aufs_lookup(dir, dentry, lkup_flags);
++ if (IS_ERR(d)) {
++ err = PTR_ERR(d);
++ AuTraceErr(err);
++ goto out;
++ } else if (d) {
++ /*
++ * obsoleted dentry found.
++ * another error will be returned later.
++ */
++ d_drop(d);
++ AuDbgDentry(d);
++ dput(d);
++ }
++ AuDbgDentry(dentry);
++ }
+
-+struct au_iigen {
-+ spinlock_t ig_spin;
-+ __u32 ig_generation, ig_flags;
-+};
++ if (d_is_positive(dentry)
++ || d_unhashed(dentry)
++ || d_unlinked(dentry)
++ || !(open_flag & O_CREAT))
++ goto out_no_open;
+
-+struct au_vdir;
-+struct au_iinfo {
-+ struct au_iigen ii_generation;
-+ struct super_block *ii_hsb1; /* no get/put */
++ unlocked = 0;
++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_FLUSH | AuLock_GEN);
++ if (unlikely(err))
++ goto out;
+
-+ struct au_rwsem ii_rwsem;
-+ aufs_bindex_t ii_btop, ii_bbot;
-+ __u32 ii_higen;
-+ struct au_hinode *ii_hinode;
-+ struct au_vdir *ii_vdir;
-+};
++ parent = dentry->d_parent; /* dir is locked */
++ di_write_lock_parent(parent);
++ err = au_lkup_dentry(dentry, /*btop*/0, AuLkup_ALLOW_NEG);
++ if (unlikely(err))
++ goto out_unlock;
+
-+struct au_icntnr {
-+ struct au_iinfo iinfo;
-+ struct inode vfs_inode;
-+ struct hlist_bl_node plink;
-+} ____cacheline_aligned_in_smp;
++ AuDbgDentry(dentry);
++ if (d_is_positive(dentry))
++ goto out_unlock;
+
-+/* au_pin flags */
-+#define AuPin_DI_LOCKED 1
-+#define AuPin_MNT_WRITE (1 << 1)
-+#define au_ftest_pin(flags, name) ((flags) & AuPin_##name)
-+#define au_fset_pin(flags, name) \
-+ do { (flags) |= AuPin_##name; } while (0)
-+#define au_fclr_pin(flags, name) \
-+ do { (flags) &= ~AuPin_##name; } while (0)
++ args.file = get_empty_filp();
++ err = PTR_ERR(args.file);
++ if (IS_ERR(args.file))
++ goto out_unlock;
+
-+struct au_pin {
-+ /* input */
-+ struct dentry *dentry;
-+ unsigned int udba;
-+ unsigned char lsc_di, lsc_hi, flags;
-+ aufs_bindex_t bindex;
++ 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;
++ }
++ di_write_unlock(parent);
++ di_write_unlock(dentry);
++ unlocked = 1;
+
-+ /* output */
-+ struct dentry *parent;
-+ struct au_hinode *hdir;
-+ struct vfsmount *h_mnt;
++ /* 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_hbl_add(&aopen_node.hblist, aopen);
++ err = finish_open(file, dentry, au_do_aopen, opened);
++ au_hbl_del(&aopen_node.hblist, aopen);
++ AuTraceErr(err);
++ AuDbgFile(file);
++ if (aopen_node.h_file)
++ fput(aopen_node.h_file);
+
-+ /* temporary unlock/relock for copyup */
-+ struct dentry *h_dentry, *h_parent;
-+ struct au_branch *br;
-+ struct task_struct *task;
-+};
++out_unlock:
++ if (unlocked)
++ si_read_unlock(dentry->d_sb);
++ else {
++ di_write_unlock(parent);
++ aufs_read_unlock(dentry, AuLock_DW);
++ }
++ AuDbgDentry(dentry);
++ if (unlikely(err < 0))
++ goto out;
++out_no_open:
++ if (err >= 0 && !(*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;
++}
+
-+void au_pin_hdir_unlock(struct au_pin *p);
-+int au_pin_hdir_lock(struct au_pin *p);
-+int au_pin_hdir_relock(struct au_pin *p);
-+void au_pin_hdir_acquire_nest(struct au_pin *p);
-+void au_pin_hdir_release(struct au_pin *p);
+
+/* ---------------------------------------------------------------------- */
+
-+static inline struct au_iinfo *au_ii(struct inode *inode)
++static int au_wr_dir_cpup(struct dentry *dentry, struct dentry *parent,
++ const unsigned char add_entry, aufs_bindex_t bcpup,
++ aufs_bindex_t btop)
+{
-+ BUG_ON(is_bad_inode(inode));
-+ return &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo);
-+}
++ int err;
++ struct dentry *h_parent;
++ struct inode *h_dir;
+
-+/* ---------------------------------------------------------------------- */
++ if (add_entry)
++ IMustLock(d_inode(parent));
++ else
++ di_write_lock_parent(parent);
+
-+/* inode.c */
-+struct inode *au_igrab(struct inode *inode);
-+void au_refresh_iop(struct inode *inode, int force_getattr);
-+int au_refresh_hinode_self(struct inode *inode);
-+int au_refresh_hinode(struct inode *inode, struct dentry *dentry);
-+int au_ino(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
-+ unsigned int d_type, ino_t *ino);
-+struct inode *au_new_inode(struct dentry *dentry, int must_new);
-+int au_test_ro(struct super_block *sb, aufs_bindex_t bindex,
-+ struct inode *inode);
-+int au_test_h_perm(struct inode *h_inode, int mask);
-+int au_test_h_perm_sio(struct inode *h_inode, int mask);
++ err = 0;
++ if (!au_h_dptr(parent, bcpup)) {
++ if (btop > bcpup)
++ err = au_cpup_dirs(dentry, bcpup);
++ else if (btop < bcpup)
++ err = au_cpdown_dirs(dentry, bcpup);
++ else
++ BUG();
++ }
++ if (!err && add_entry && !au_ftest_wrdir(add_entry, TMPFILE)) {
++ h_parent = au_h_dptr(parent, bcpup);
++ h_dir = d_inode(h_parent);
++ vfsub_inode_lock_shared_nested(h_dir, AuLsc_I_PARENT);
++ err = au_lkup_neg(dentry, bcpup, /*wh*/0);
++ /* todo: no unlock here */
++ inode_unlock_shared(h_dir);
+
-+static inline int au_wh_ino(struct super_block *sb, aufs_bindex_t bindex,
-+ ino_t h_ino, unsigned int d_type, ino_t *ino)
-+{
-+#ifdef CONFIG_AUFS_SHWH
-+ return au_ino(sb, bindex, h_ino, d_type, ino);
-+#else
-+ return 0;
-+#endif
-+}
++ AuDbg("bcpup %d\n", bcpup);
++ if (!err) {
++ if (d_really_is_negative(dentry))
++ au_set_h_dptr(dentry, btop, NULL);
++ au_update_dbrange(dentry, /*do_put_zero*/0);
++ }
++ }
+
-+/* i_op.c */
-+enum {
-+ AuIop_SYMLINK,
-+ AuIop_DIR,
-+ AuIop_OTHER,
-+ AuIop_Last
-+};
-+extern struct inode_operations aufs_iop[AuIop_Last],
-+ aufs_iop_nogetattr[AuIop_Last];
++ if (!add_entry)
++ di_write_unlock(parent);
++ if (!err)
++ err = bcpup; /* success */
+
-+/* au_wr_dir flags */
-+#define AuWrDir_ADD_ENTRY 1
-+#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)
-+#define au_fclr_wrdir(flags, name) \
-+ do { (flags) &= ~AuWrDir_##name; } while (0)
++ AuTraceErr(err);
++ return err;
++}
+
-+struct au_wr_dir_args {
-+ aufs_bindex_t force_btgt;
-+ unsigned char flags;
-+};
++/*
++ * decide the branch and the parent dir where we will create a new entry.
++ * returns new bindex or an error.
++ * copyup the parent dir if needed.
++ */
+int au_wr_dir(struct dentry *dentry, struct dentry *src_dentry,
-+ struct au_wr_dir_args *args);
-+
-+struct dentry *au_pinned_h_parent(struct au_pin *pin);
-+void au_pin_init(struct au_pin *pin, struct dentry *dentry,
-+ aufs_bindex_t bindex, int lsc_di, int lsc_hi,
-+ unsigned int udba, unsigned char flags);
-+int au_pin(struct au_pin *pin, struct dentry *dentry, aufs_bindex_t bindex,
-+ unsigned int udba, unsigned char flags) __must_check;
-+int au_do_pin(struct au_pin *pin) __must_check;
-+void au_unpin(struct au_pin *pin);
-+int au_reval_for_attr(struct dentry *dentry, unsigned int sigen);
++ struct au_wr_dir_args *args)
++{
++ int err;
++ unsigned int flags;
++ aufs_bindex_t bcpup, btop, src_btop;
++ const unsigned char add_entry
++ = au_ftest_wrdir(args->flags, ADD_ENTRY)
++ | au_ftest_wrdir(args->flags, TMPFILE);
++ struct super_block *sb;
++ struct dentry *parent;
++ struct au_sbinfo *sbinfo;
+
-+#define AuIcpup_DID_CPUP 1
-+#define au_ftest_icpup(flags, name) ((flags) & AuIcpup_##name)
-+#define au_fset_icpup(flags, name) \
-+ do { (flags) |= AuIcpup_##name; } while (0)
-+#define au_fclr_icpup(flags, name) \
-+ do { (flags) &= ~AuIcpup_##name; } while (0)
++ sb = dentry->d_sb;
++ sbinfo = au_sbi(sb);
++ parent = dget_parent(dentry);
++ btop = au_dbtop(dentry);
++ bcpup = btop;
++ if (args->force_btgt < 0) {
++ if (src_dentry) {
++ src_btop = au_dbtop(src_dentry);
++ if (src_btop < btop)
++ bcpup = src_btop;
++ } else if (add_entry) {
++ flags = 0;
++ if (au_ftest_wrdir(args->flags, ISDIR))
++ au_fset_wbr(flags, DIR);
++ err = AuWbrCreate(sbinfo, dentry, flags);
++ bcpup = err;
++ }
+
-+struct au_icpup_args {
-+ unsigned char flags;
-+ unsigned char pin_flags;
-+ aufs_bindex_t btgt;
-+ unsigned int udba;
-+ struct au_pin pin;
-+ struct path h_path;
-+ struct inode *h_inode;
-+};
++ if (bcpup < 0 || au_test_ro(sb, bcpup, d_inode(dentry))) {
++ if (add_entry)
++ err = AuWbrCopyup(sbinfo, dentry);
++ else {
++ if (!IS_ROOT(dentry)) {
++ di_read_lock_parent(parent, !AuLock_IR);
++ err = AuWbrCopyup(sbinfo, dentry);
++ di_read_unlock(parent, !AuLock_IR);
++ } else
++ err = AuWbrCopyup(sbinfo, dentry);
++ }
++ bcpup = err;
++ if (unlikely(err < 0))
++ goto out;
++ }
++ } else {
++ bcpup = args->force_btgt;
++ AuDebugOn(au_test_ro(sb, bcpup, d_inode(dentry)));
++ }
+
-+int au_pin_and_icpup(struct dentry *dentry, struct iattr *ia,
-+ struct au_icpup_args *a);
++ AuDbg("btop %d, bcpup %d\n", btop, bcpup);
++ err = bcpup;
++ if (bcpup == btop)
++ goto out; /* success */
+
-+int au_h_path_getattr(struct dentry *dentry, int force, struct path *h_path,
-+ int locked);
++ /* copyup the new parent into the branch we process */
++ err = au_wr_dir_cpup(dentry, parent, add_entry, bcpup, btop);
++ if (err >= 0) {
++ if (d_really_is_negative(dentry)) {
++ au_set_h_dptr(dentry, btop, NULL);
++ au_set_dbtop(dentry, bcpup);
++ au_set_dbbot(dentry, bcpup);
++ }
++ AuDebugOn(add_entry
++ && !au_ftest_wrdir(args->flags, TMPFILE)
++ && !au_h_dptr(dentry, bcpup));
++ }
+
-+/* i_op_add.c */
-+int au_may_add(struct dentry *dentry, aufs_bindex_t bindex,
-+ struct dentry *h_parent, int isdir);
-+int aufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
-+ dev_t dev);
-+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);
-+int aufs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
++out:
++ dput(parent);
++ return err;
++}
+
-+/* i_op_del.c */
-+int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup);
-+int au_may_del(struct dentry *dentry, aufs_bindex_t bindex,
-+ struct dentry *h_parent, int isdir);
-+int aufs_unlink(struct inode *dir, struct dentry *dentry);
-+int aufs_rmdir(struct inode *dir, struct dentry *dentry);
++/* ---------------------------------------------------------------------- */
+
-+/* i_op_ren.c */
-+int au_wbr(struct dentry *dentry, aufs_bindex_t btgt);
-+int aufs_rename(struct inode *src_dir, struct dentry *src_dentry,
-+ struct inode *dir, struct dentry *dentry,
-+ unsigned int flags);
++void au_pin_hdir_unlock(struct au_pin *p)
++{
++ if (p->hdir)
++ au_hn_inode_unlock(p->hdir);
++}
+
-+/* iinfo.c */
-+struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex);
-+void au_hiput(struct au_hinode *hinode);
-+void au_set_hi_wh(struct inode *inode, aufs_bindex_t bindex,
-+ struct dentry *h_wh);
-+unsigned int au_hi_flags(struct inode *inode, int isdir);
++int au_pin_hdir_lock(struct au_pin *p)
++{
++ int err;
+
-+/* hinode flags */
-+#define AuHi_XINO 1
-+#define AuHi_HNOTIFY (1 << 1)
-+#define au_ftest_hi(flags, name) ((flags) & AuHi_##name)
-+#define au_fset_hi(flags, name) \
-+ do { (flags) |= AuHi_##name; } while (0)
-+#define au_fclr_hi(flags, name) \
-+ do { (flags) &= ~AuHi_##name; } while (0)
++ err = 0;
++ if (!p->hdir)
++ goto out;
+
-+#ifndef CONFIG_AUFS_HNOTIFY
-+#undef AuHi_HNOTIFY
-+#define AuHi_HNOTIFY 0
-+#endif
++ /* even if an error happens later, keep this lock */
++ au_hn_inode_lock_nested(p->hdir, p->lsc_hi);
+
-+void au_set_h_iptr(struct inode *inode, aufs_bindex_t bindex,
-+ struct inode *h_inode, unsigned int flags);
++ err = -EBUSY;
++ if (unlikely(p->hdir->hi_inode != d_inode(p->h_parent)))
++ goto out;
+
-+void au_update_iigen(struct inode *inode, int half);
-+void au_update_ibrange(struct inode *inode, int do_put_zero);
++ err = 0;
++ if (p->h_dentry)
++ err = au_h_verify(p->h_dentry, p->udba, p->hdir->hi_inode,
++ p->h_parent, p->br);
+
-+void au_icntnr_init_once(void *_c);
-+void au_hinode_init(struct au_hinode *hinode);
-+int au_iinfo_init(struct inode *inode);
-+void au_iinfo_fin(struct inode *inode);
-+int au_hinode_realloc(struct au_iinfo *iinfo, int nbr, int may_shrink);
++out:
++ return err;
++}
+
-+#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
-+void au_plink_list(struct super_block *sb);
-+#else
-+AuStubVoid(au_plink_list, struct super_block *sb)
-+#endif
-+int au_plink_test(struct inode *inode);
-+struct dentry *au_plink_lkup(struct inode *inode, aufs_bindex_t bindex);
-+void au_plink_append(struct inode *inode, aufs_bindex_t bindex,
-+ struct dentry *h_dentry);
-+void au_plink_put(struct super_block *sb, int verbose);
-+void au_plink_clean(struct super_block *sb, int verbose);
-+void au_plink_half_refresh(struct super_block *sb, aufs_bindex_t br_id);
-+#else
-+AuStubInt0(au_plink_maint, struct super_block *sb, int flags);
-+AuStubVoid(au_plink_maint_leave, struct au_sbinfo *sbinfo);
-+AuStubInt0(au_plink_maint_enter, struct super_block *sb);
-+AuStubVoid(au_plink_list, struct super_block *sb);
-+AuStubInt0(au_plink_test, struct inode *inode);
-+AuStub(struct dentry *, au_plink_lkup, return NULL,
-+ struct inode *inode, aufs_bindex_t bindex);
-+AuStubVoid(au_plink_append, struct inode *inode, aufs_bindex_t bindex,
-+ struct dentry *h_dentry);
-+AuStubVoid(au_plink_put, struct super_block *sb, int verbose);
-+AuStubVoid(au_plink_clean, struct super_block *sb, int verbose);
-+AuStubVoid(au_plink_half_refresh, struct super_block *sb, aufs_bindex_t br_id);
-+#endif /* CONFIG_PROC_FS */
++int au_pin_hdir_relock(struct au_pin *p)
++{
++ int err, i;
++ struct inode *h_i;
++ struct dentry *h_d[] = {
++ p->h_dentry,
++ p->h_parent
++ };
+
-+#ifdef CONFIG_AUFS_XATTR
-+/* xattr.c */
-+int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags,
-+ unsigned int verbose);
-+ssize_t aufs_listxattr(struct dentry *dentry, char *list, size_t size);
-+void au_xattr_init(struct super_block *sb);
-+#else
-+AuStubInt0(au_cpup_xattr, struct dentry *h_dst, struct dentry *h_src,
-+ int ignore_flags, unsigned int verbose);
-+AuStubVoid(au_xattr_init, struct super_block *sb);
-+#endif
++ err = au_pin_hdir_lock(p);
++ if (unlikely(err))
++ goto out;
+
-+#ifdef CONFIG_FS_POSIX_ACL
-+struct posix_acl *aufs_get_acl(struct inode *inode, int type);
-+int aufs_set_acl(struct inode *inode, struct posix_acl *acl, int type);
-+#endif
++ for (i = 0; !err && i < sizeof(h_d)/sizeof(*h_d); i++) {
++ if (!h_d[i])
++ continue;
++ if (d_is_positive(h_d[i])) {
++ h_i = d_inode(h_d[i]);
++ err = !h_i->i_nlink;
++ }
++ }
+
-+#if IS_ENABLED(CONFIG_AUFS_XATTR) || IS_ENABLED(CONFIG_FS_POSIX_ACL)
-+enum {
-+ AU_XATTR_SET,
-+ AU_ACL_SET
-+};
++out:
++ return err;
++}
+
-+struct au_sxattr {
-+ int type;
-+ union {
-+ struct {
-+ const char *name;
-+ const void *value;
-+ size_t size;
-+ int flags;
-+ } set;
-+ struct {
-+ struct posix_acl *acl;
-+ int type;
-+ } acl_set;
-+ } u;
-+};
-+ssize_t au_sxattr(struct dentry *dentry, struct inode *inode,
-+ struct au_sxattr *arg);
++static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task)
++{
++#if !defined(CONFIG_RWSEM_GENERIC_SPINLOCK) && defined(CONFIG_RWSEM_SPIN_ON_OWNER)
++ p->hdir->hi_inode->i_rwsem.owner = task;
+#endif
++}
+
-+/* ---------------------------------------------------------------------- */
++void au_pin_hdir_acquire_nest(struct au_pin *p)
++{
++ if (p->hdir) {
++ rwsem_acquire_nest(&p->hdir->hi_inode->i_rwsem.dep_map,
++ p->lsc_hi, 0, NULL, _RET_IP_);
++ au_pin_hdir_set_owner(p, current);
++ }
++}
+
-+/* lock subclass for iinfo */
-+enum {
-+ AuLsc_II_CHILD, /* child first */
-+ AuLsc_II_CHILD2, /* rename(2), link(2), and cpup at hnotify */
-+ AuLsc_II_CHILD3, /* copyup dirs */
-+ AuLsc_II_PARENT, /* see AuLsc_I_PARENT in vfsub.h */
-+ AuLsc_II_PARENT2,
-+ AuLsc_II_PARENT3, /* copyup dirs */
-+ AuLsc_II_NEW_CHILD
-+};
++void au_pin_hdir_release(struct au_pin *p)
++{
++ if (p->hdir) {
++ au_pin_hdir_set_owner(p, p->task);
++ rwsem_release(&p->hdir->hi_inode->i_rwsem.dep_map, 1, _RET_IP_);
++ }
++}
+
-+/*
-+ * ii_read_lock_child, ii_write_lock_child,
-+ * ii_read_lock_child2, ii_write_lock_child2,
-+ * ii_read_lock_child3, ii_write_lock_child3,
-+ * ii_read_lock_parent, ii_write_lock_parent,
-+ * ii_read_lock_parent2, ii_write_lock_parent2,
-+ * ii_read_lock_parent3, ii_write_lock_parent3,
-+ * ii_read_lock_new_child, ii_write_lock_new_child,
-+ */
-+#define AuReadLockFunc(name, lsc) \
-+static inline void ii_read_lock_##name(struct inode *i) \
-+{ \
-+ au_rw_read_lock_nested(&au_ii(i)->ii_rwsem, AuLsc_II_##lsc); \
++struct dentry *au_pinned_h_parent(struct au_pin *pin)
++{
++ if (pin && pin->parent)
++ return au_h_dptr(pin->parent, pin->bindex);
++ return NULL;
+}
+
-+#define AuWriteLockFunc(name, lsc) \
-+static inline void ii_write_lock_##name(struct inode *i) \
-+{ \
-+ au_rw_write_lock_nested(&au_ii(i)->ii_rwsem, AuLsc_II_##lsc); \
++void au_unpin(struct au_pin *p)
++{
++ if (p->hdir)
++ au_pin_hdir_unlock(p);
++ if (p->h_mnt && au_ftest_pin(p->flags, MNT_WRITE))
++ vfsub_mnt_drop_write(p->h_mnt);
++ if (!p->hdir)
++ return;
++
++ if (!au_ftest_pin(p->flags, DI_LOCKED))
++ di_read_unlock(p->parent, AuLock_IR);
++ iput(p->hdir->hi_inode);
++ dput(p->parent);
++ p->parent = NULL;
++ p->hdir = NULL;
++ p->h_mnt = NULL;
++ /* do not clear p->task */
+}
+
-+#define AuRWLockFuncs(name, lsc) \
-+ AuReadLockFunc(name, lsc) \
-+ AuWriteLockFunc(name, lsc)
++int au_do_pin(struct au_pin *p)
++{
++ int err;
++ struct super_block *sb;
++ struct inode *h_dir;
+
-+AuRWLockFuncs(child, CHILD);
-+AuRWLockFuncs(child2, CHILD2);
-+AuRWLockFuncs(child3, CHILD3);
-+AuRWLockFuncs(parent, PARENT);
-+AuRWLockFuncs(parent2, PARENT2);
-+AuRWLockFuncs(parent3, PARENT3);
-+AuRWLockFuncs(new_child, NEW_CHILD);
++ err = 0;
++ sb = p->dentry->d_sb;
++ p->br = au_sbr(sb, p->bindex);
++ if (IS_ROOT(p->dentry)) {
++ if (au_ftest_pin(p->flags, MNT_WRITE)) {
++ p->h_mnt = au_br_mnt(p->br);
++ err = vfsub_mnt_want_write(p->h_mnt);
++ if (unlikely(err)) {
++ au_fclr_pin(p->flags, MNT_WRITE);
++ goto out_err;
++ }
++ }
++ goto out;
++ }
+
-+#undef AuReadLockFunc
-+#undef AuWriteLockFunc
-+#undef AuRWLockFuncs
++ p->h_dentry = NULL;
++ if (p->bindex <= au_dbbot(p->dentry))
++ p->h_dentry = au_h_dptr(p->dentry, p->bindex);
+
-+#define ii_read_unlock(i) au_rw_read_unlock(&au_ii(i)->ii_rwsem)
-+#define ii_write_unlock(i) au_rw_write_unlock(&au_ii(i)->ii_rwsem)
-+#define ii_downgrade_lock(i) au_rw_dgrade_lock(&au_ii(i)->ii_rwsem)
++ p->parent = dget_parent(p->dentry);
++ if (!au_ftest_pin(p->flags, DI_LOCKED))
++ di_read_lock(p->parent, AuLock_IR, p->lsc_di);
+
-+#define IiMustNoWaiters(i) AuRwMustNoWaiters(&au_ii(i)->ii_rwsem)
-+#define IiMustAnyLock(i) AuRwMustAnyLock(&au_ii(i)->ii_rwsem)
-+#define IiMustWriteLock(i) AuRwMustWriteLock(&au_ii(i)->ii_rwsem)
++ h_dir = NULL;
++ p->h_parent = au_h_dptr(p->parent, p->bindex);
++ p->hdir = au_hi(d_inode(p->parent), p->bindex);
++ if (p->hdir)
++ h_dir = p->hdir->hi_inode;
+
-+/* ---------------------------------------------------------------------- */
++ /*
++ * udba case, or
++ * if DI_LOCKED is not set, then p->parent may be different
++ * and h_parent can be NULL.
++ */
++ if (unlikely(!p->hdir || !h_dir || !p->h_parent)) {
++ err = -EBUSY;
++ if (!au_ftest_pin(p->flags, DI_LOCKED))
++ di_read_unlock(p->parent, AuLock_IR);
++ dput(p->parent);
++ p->parent = NULL;
++ goto out_err;
++ }
+
-+static inline void au_icntnr_init(struct au_icntnr *c)
-+{
-+#ifdef CONFIG_AUFS_DEBUG
-+ c->vfs_inode.i_mode = 0;
-+#endif
++ if (au_ftest_pin(p->flags, MNT_WRITE)) {
++ p->h_mnt = au_br_mnt(p->br);
++ err = vfsub_mnt_want_write(p->h_mnt);
++ if (unlikely(err)) {
++ au_fclr_pin(p->flags, MNT_WRITE);
++ if (!au_ftest_pin(p->flags, DI_LOCKED))
++ di_read_unlock(p->parent, AuLock_IR);
++ dput(p->parent);
++ p->parent = NULL;
++ goto out_err;
++ }
++ }
++
++ au_igrab(h_dir);
++ err = au_pin_hdir_lock(p);
++ if (!err)
++ goto out; /* success */
++
++ au_unpin(p);
++
++out_err:
++ pr_err("err %d\n", err);
++ err = au_busy_or_stale();
++out:
++ return err;
+}
+
-+static inline unsigned int au_iigen(struct inode *inode, unsigned int *igflags)
++void au_pin_init(struct au_pin *p, struct dentry *dentry,
++ aufs_bindex_t bindex, int lsc_di, int lsc_hi,
++ unsigned int udba, unsigned char flags)
+{
-+ unsigned int gen;
-+ struct au_iinfo *iinfo;
-+ struct au_iigen *iigen;
++ p->dentry = dentry;
++ p->udba = udba;
++ p->lsc_di = lsc_di;
++ p->lsc_hi = lsc_hi;
++ p->flags = flags;
++ p->bindex = bindex;
+
-+ iinfo = au_ii(inode);
-+ iigen = &iinfo->ii_generation;
-+ spin_lock(&iigen->ig_spin);
-+ if (igflags)
-+ *igflags = iigen->ig_flags;
-+ gen = iigen->ig_generation;
-+ spin_unlock(&iigen->ig_spin);
++ p->parent = NULL;
++ p->hdir = NULL;
++ p->h_mnt = NULL;
+
-+ return gen;
++ p->h_dentry = NULL;
++ p->h_parent = NULL;
++ p->br = NULL;
++ p->task = current;
+}
+
-+/* tiny test for inode number */
-+/* tmpfs generation is too rough */
-+static inline int au_test_higen(struct inode *inode, struct inode *h_inode)
++int au_pin(struct au_pin *pin, struct dentry *dentry, aufs_bindex_t bindex,
++ unsigned int udba, unsigned char flags)
+{
-+ struct au_iinfo *iinfo;
++ au_pin_init(pin, dentry, bindex, AuLsc_DI_PARENT, AuLsc_I_PARENT2,
++ udba, flags);
++ return au_do_pin(pin);
++}
+
-+ iinfo = au_ii(inode);
-+ AuRwMustAnyLock(&iinfo->ii_rwsem);
-+ return !(iinfo->ii_hsb1 == h_inode->i_sb
-+ && iinfo->ii_higen == h_inode->i_generation);
++/* ---------------------------------------------------------------------- */
++
++/*
++ * ->setattr() and ->getattr() are called in various cases.
++ * chmod, stat: dentry is revalidated.
++ * fchmod, fstat: file and dentry are not revalidated, additionally they may be
++ * unhashed.
++ * for ->setattr(), ia->ia_file is passed from ftruncate only.
++ */
++/* todo: consolidate with do_refresh() and simple_reval_dpath() */
++int au_reval_for_attr(struct dentry *dentry, unsigned int sigen)
++{
++ int err;
++ struct dentry *parent;
++
++ err = 0;
++ if (au_digen_test(dentry, sigen)) {
++ parent = dget_parent(dentry);
++ di_read_lock_parent(parent, AuLock_IR);
++ err = au_refresh_dentry(dentry, parent);
++ di_read_unlock(parent, AuLock_IR);
++ dput(parent);
++ }
++
++ AuTraceErr(err);
++ return err;
+}
+
-+static inline void au_iigen_dec(struct inode *inode)
++int au_pin_and_icpup(struct dentry *dentry, struct iattr *ia,
++ struct au_icpup_args *a)
+{
-+ struct au_iinfo *iinfo;
-+ struct au_iigen *iigen;
++ int err;
++ loff_t sz;
++ aufs_bindex_t btop, ibtop;
++ struct dentry *hi_wh, *parent;
++ struct inode *inode;
++ struct au_wr_dir_args wr_dir_args = {
++ .force_btgt = -1,
++ .flags = 0
++ };
++
++ if (d_is_dir(dentry))
++ au_fset_wrdir(wr_dir_args.flags, ISDIR);
++ /* plink or hi_wh() case */
++ btop = au_dbtop(dentry);
++ inode = d_inode(dentry);
++ ibtop = au_ibtop(inode);
++ if (btop != ibtop && !au_test_ro(inode->i_sb, ibtop, inode))
++ wr_dir_args.force_btgt = ibtop;
++ err = au_wr_dir(dentry, /*src_dentry*/NULL, &wr_dir_args);
++ if (unlikely(err < 0))
++ goto out;
++ a->btgt = err;
++ if (err != btop)
++ au_fset_icpup(a->flags, DID_CPUP);
++
++ err = 0;
++ a->pin_flags = AuPin_MNT_WRITE;
++ parent = NULL;
++ if (!IS_ROOT(dentry)) {
++ au_fset_pin(a->pin_flags, DI_LOCKED);
++ parent = dget_parent(dentry);
++ di_write_lock_parent(parent);
++ }
++
++ err = au_pin(&a->pin, dentry, a->btgt, a->udba, a->pin_flags);
++ if (unlikely(err))
++ goto out_parent;
++
++ sz = -1;
++ a->h_path.dentry = au_h_dptr(dentry, btop);
++ a->h_inode = d_inode(a->h_path.dentry);
++ if (ia && (ia->ia_valid & ATTR_SIZE)) {
++ vfsub_inode_lock_shared_nested(a->h_inode, AuLsc_I_CHILD);
++ if (ia->ia_size < i_size_read(a->h_inode))
++ sz = ia->ia_size;
++ inode_unlock_shared(a->h_inode);
++ }
++
++ hi_wh = NULL;
++ if (au_ftest_icpup(a->flags, DID_CPUP) && d_unlinked(dentry)) {
++ hi_wh = au_hi_wh(inode, a->btgt);
++ if (!hi_wh) {
++ struct au_cp_generic cpg = {
++ .dentry = dentry,
++ .bdst = a->btgt,
++ .bsrc = -1,
++ .len = sz,
++ .pin = &a->pin
++ };
++ err = au_sio_cpup_wh(&cpg, /*file*/NULL);
++ if (unlikely(err))
++ goto out_unlock;
++ hi_wh = au_hi_wh(inode, a->btgt);
++ /* todo: revalidate hi_wh? */
++ }
++ }
++
++ if (parent) {
++ au_pin_set_parent_lflag(&a->pin, /*lflag*/0);
++ di_downgrade_lock(parent, AuLock_IR);
++ dput(parent);
++ parent = NULL;
++ }
++ if (!au_ftest_icpup(a->flags, DID_CPUP))
++ goto out; /* success */
++
++ if (!d_unhashed(dentry)) {
++ struct au_cp_generic cpg = {
++ .dentry = dentry,
++ .bdst = a->btgt,
++ .bsrc = btop,
++ .len = sz,
++ .pin = &a->pin,
++ .flags = AuCpup_DTIME | AuCpup_HOPEN
++ };
++ err = au_sio_cpup_simple(&cpg);
++ if (!err)
++ a->h_path.dentry = au_h_dptr(dentry, a->btgt);
++ } else if (!hi_wh)
++ a->h_path.dentry = au_h_dptr(dentry, a->btgt);
++ else
++ a->h_path.dentry = hi_wh; /* do not dget here */
+
-+ iinfo = au_ii(inode);
-+ iigen = &iinfo->ii_generation;
-+ spin_lock(&iigen->ig_spin);
-+ iigen->ig_generation--;
-+ spin_unlock(&iigen->ig_spin);
++out_unlock:
++ a->h_inode = d_inode(a->h_path.dentry);
++ if (!err)
++ goto out; /* success */
++ au_unpin(&a->pin);
++out_parent:
++ if (parent) {
++ di_write_unlock(parent);
++ dput(parent);
++ }
++out:
++ if (!err)
++ inode_lock_nested(a->h_inode, AuLsc_I_CHILD);
++ return err;
+}
+
-+static inline int au_iigen_test(struct inode *inode, unsigned int sigen)
++static int aufs_setattr(struct dentry *dentry, struct iattr *ia)
+{
+ int err;
++ struct inode *inode, *delegated;
++ struct super_block *sb;
++ struct file *file;
++ struct au_icpup_args *a;
+
-+ err = 0;
-+ if (unlikely(inode && au_iigen(inode, NULL) != sigen))
-+ err = -EIO;
++ inode = d_inode(dentry);
++ IMustLock(inode);
+
-+ return err;
-+}
++ err = setattr_prepare(dentry, ia);
++ if (unlikely(err))
++ goto out;
+
-+/* ---------------------------------------------------------------------- */
++ err = -ENOMEM;
++ a = kzalloc(sizeof(*a), GFP_NOFS);
++ if (unlikely(!a))
++ goto out;
+
-+static inline struct au_hinode *au_hinode(struct au_iinfo *iinfo,
-+ aufs_bindex_t bindex)
-+{
-+ return iinfo->ii_hinode + bindex;
-+}
++ if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
++ ia->ia_valid &= ~ATTR_MODE;
+
-+static inline int au_is_bad_inode(struct inode *inode)
-+{
-+ return !!(is_bad_inode(inode) || !au_hinode(au_ii(inode), 0));
-+}
++ file = NULL;
++ sb = dentry->d_sb;
++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
++ if (unlikely(err))
++ goto out_kfree;
+
-+static inline aufs_bindex_t au_ii_br_id(struct inode *inode,
-+ aufs_bindex_t bindex)
-+{
-+ IiMustAnyLock(inode);
-+ return au_hinode(au_ii(inode), bindex)->hi_id;
-+}
++ if (ia->ia_valid & ATTR_FILE) {
++ /* currently ftruncate(2) only */
++ AuDebugOn(!d_is_reg(dentry));
++ file = ia->ia_file;
++ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1,
++ /*fi_lsc*/0);
++ if (unlikely(err))
++ goto out_si;
++ ia->ia_file = au_hf_top(file);
++ a->udba = AuOpt_UDBA_NONE;
++ } else {
++ /* fchmod() doesn't pass ia_file */
++ a->udba = au_opt_udba(sb);
++ di_write_lock_child(dentry);
++ /* no d_unlinked(), to set UDBA_NONE for root */
++ if (d_unhashed(dentry))
++ a->udba = AuOpt_UDBA_NONE;
++ if (a->udba != AuOpt_UDBA_NONE) {
++ AuDebugOn(IS_ROOT(dentry));
++ err = au_reval_for_attr(dentry, au_sigen(sb));
++ if (unlikely(err))
++ goto out_dentry;
++ }
++ }
+
-+static inline aufs_bindex_t au_ibtop(struct inode *inode)
-+{
-+ IiMustAnyLock(inode);
-+ return au_ii(inode)->ii_btop;
-+}
++ err = au_pin_and_icpup(dentry, ia, a);
++ if (unlikely(err < 0))
++ goto out_dentry;
++ if (au_ftest_icpup(a->flags, DID_CPUP)) {
++ ia->ia_file = NULL;
++ ia->ia_valid &= ~ATTR_FILE;
++ }
+
-+static inline aufs_bindex_t au_ibbot(struct inode *inode)
-+{
-+ IiMustAnyLock(inode);
-+ return au_ii(inode)->ii_bbot;
-+}
++ a->h_path.mnt = au_sbr_mnt(sb, a->btgt);
++ if ((ia->ia_valid & (ATTR_MODE | ATTR_CTIME))
++ == (ATTR_MODE | ATTR_CTIME)) {
++ err = security_path_chmod(&a->h_path, ia->ia_mode);
++ if (unlikely(err))
++ goto out_unlock;
++ } else if ((ia->ia_valid & (ATTR_UID | ATTR_GID))
++ && (ia->ia_valid & ATTR_CTIME)) {
++ err = security_path_chown(&a->h_path, ia->ia_uid, ia->ia_gid);
++ if (unlikely(err))
++ goto out_unlock;
++ }
+
-+static inline struct au_vdir *au_ivdir(struct inode *inode)
-+{
-+ IiMustAnyLock(inode);
-+ return au_ii(inode)->ii_vdir;
-+}
++ if (ia->ia_valid & ATTR_SIZE) {
++ struct file *f;
+
-+static inline struct dentry *au_hi_wh(struct inode *inode, aufs_bindex_t bindex)
-+{
-+ IiMustAnyLock(inode);
-+ return au_hinode(au_ii(inode), bindex)->hi_whdentry;
-+}
++ if (ia->ia_size < i_size_read(inode))
++ /* unmap only */
++ truncate_setsize(inode, ia->ia_size);
+
-+static inline void au_set_ibtop(struct inode *inode, aufs_bindex_t bindex)
-+{
-+ IiMustWriteLock(inode);
-+ au_ii(inode)->ii_btop = bindex;
-+}
++ f = NULL;
++ if (ia->ia_valid & ATTR_FILE)
++ f = ia->ia_file;
++ inode_unlock(a->h_inode);
++ err = vfsub_trunc(&a->h_path, ia->ia_size, ia->ia_valid, f);
++ inode_lock_nested(a->h_inode, AuLsc_I_CHILD);
++ } else {
++ delegated = NULL;
++ while (1) {
++ err = vfsub_notify_change(&a->h_path, ia, &delegated);
++ if (delegated) {
++ err = break_deleg_wait(&delegated);
++ if (!err)
++ continue;
++ }
++ break;
++ }
++ }
++ /*
++ * regardless aufs 'acl' option setting.
++ * why don't all acl-aware fs call this func from their ->setattr()?
++ */
++ if (!err && (ia->ia_valid & ATTR_MODE))
++ err = vfsub_acl_chmod(a->h_inode, ia->ia_mode);
++ if (!err)
++ au_cpup_attr_changeable(inode);
+
-+static inline void au_set_ibbot(struct inode *inode, aufs_bindex_t bindex)
-+{
-+ IiMustWriteLock(inode);
-+ au_ii(inode)->ii_bbot = bindex;
++out_unlock:
++ inode_unlock(a->h_inode);
++ au_unpin(&a->pin);
++ if (unlikely(err))
++ au_update_dbtop(dentry);
++out_dentry:
++ di_write_unlock(dentry);
++ if (file) {
++ fi_write_unlock(file);
++ ia->ia_file = file;
++ ia->ia_valid |= ATTR_FILE;
++ }
++out_si:
++ si_read_unlock(sb);
++out_kfree:
++ kfree(a);
++out:
++ AuTraceErr(err);
++ return err;
+}
+
-+static inline void au_set_ivdir(struct inode *inode, struct au_vdir *vdir)
++#if IS_ENABLED(CONFIG_AUFS_XATTR) || IS_ENABLED(CONFIG_FS_POSIX_ACL)
++static int au_h_path_to_set_attr(struct dentry *dentry,
++ struct au_icpup_args *a, struct path *h_path)
+{
-+ IiMustWriteLock(inode);
-+ au_ii(inode)->ii_vdir = vdir;
-+}
++ int err;
++ struct super_block *sb;
+
-+static inline struct au_hinode *au_hi(struct inode *inode, aufs_bindex_t bindex)
-+{
-+ IiMustAnyLock(inode);
-+ return au_hinode(au_ii(inode), bindex);
-+}
++ sb = dentry->d_sb;
++ a->udba = au_opt_udba(sb);
++ /* no d_unlinked(), to set UDBA_NONE for root */
++ if (d_unhashed(dentry))
++ a->udba = AuOpt_UDBA_NONE;
++ if (a->udba != AuOpt_UDBA_NONE) {
++ AuDebugOn(IS_ROOT(dentry));
++ err = au_reval_for_attr(dentry, au_sigen(sb));
++ if (unlikely(err))
++ goto out;
++ }
++ err = au_pin_and_icpup(dentry, /*ia*/NULL, a);
++ if (unlikely(err < 0))
++ goto out;
+
-+/* ---------------------------------------------------------------------- */
++ h_path->dentry = a->h_path.dentry;
++ h_path->mnt = au_sbr_mnt(sb, a->btgt);
+
-+static inline struct dentry *au_pinned_parent(struct au_pin *pin)
-+{
-+ if (pin)
-+ return pin->parent;
-+ return NULL;
++out:
++ return err;
+}
+
-+static inline struct inode *au_pinned_h_dir(struct au_pin *pin)
++ssize_t au_sxattr(struct dentry *dentry, struct inode *inode,
++ struct au_sxattr *arg)
+{
-+ if (pin && pin->hdir)
-+ return pin->hdir->hi_inode;
-+ return NULL;
-+}
++ int err;
++ struct path h_path;
++ struct super_block *sb;
++ struct au_icpup_args *a;
++ struct inode *h_inode;
+
-+static inline struct au_hinode *au_pinned_hdir(struct au_pin *pin)
-+{
-+ if (pin)
-+ return pin->hdir;
-+ return NULL;
-+}
++ IMustLock(inode);
+
-+static inline void au_pin_set_dentry(struct au_pin *pin, struct dentry *dentry)
-+{
-+ if (pin)
-+ pin->dentry = dentry;
-+}
++ err = -ENOMEM;
++ a = kzalloc(sizeof(*a), GFP_NOFS);
++ if (unlikely(!a))
++ goto out;
+
-+static inline void au_pin_set_parent_lflag(struct au_pin *pin,
-+ unsigned char lflag)
-+{
-+ if (pin) {
-+ if (lflag)
-+ au_fset_pin(pin->flags, DI_LOCKED);
-+ else
-+ au_fclr_pin(pin->flags, DI_LOCKED);
-+ }
-+}
++ sb = dentry->d_sb;
++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
++ if (unlikely(err))
++ goto out_kfree;
+
-+#if 0 /* reserved */
-+static inline void au_pin_set_parent(struct au_pin *pin, struct dentry *parent)
-+{
-+ if (pin) {
-+ dput(pin->parent);
-+ pin->parent = dget(parent);
++ h_path.dentry = NULL; /* silence gcc */
++ di_write_lock_child(dentry);
++ err = au_h_path_to_set_attr(dentry, a, &h_path);
++ if (unlikely(err))
++ goto out_di;
++
++ inode_unlock(a->h_inode);
++ switch (arg->type) {
++ case AU_XATTR_SET:
++ AuDebugOn(d_is_negative(h_path.dentry));
++ err = vfsub_setxattr(h_path.dentry,
++ arg->u.set.name, arg->u.set.value,
++ arg->u.set.size, arg->u.set.flags);
++ break;
++ case AU_ACL_SET:
++ err = -EOPNOTSUPP;
++ h_inode = d_inode(h_path.dentry);
++ if (h_inode->i_op->set_acl)
++ /* this will call posix_acl_update_mode */
++ err = h_inode->i_op->set_acl(h_inode,
++ arg->u.acl_set.acl,
++ arg->u.acl_set.type);
++ break;
+ }
++ if (!err)
++ au_cpup_attr_timesizes(inode);
++
++ au_unpin(&a->pin);
++ if (unlikely(err))
++ au_update_dbtop(dentry);
++
++out_di:
++ di_write_unlock(dentry);
++ si_read_unlock(sb);
++out_kfree:
++ kfree(a);
++out:
++ AuTraceErr(err);
++ return err;
+}
+#endif
+
-+/* ---------------------------------------------------------------------- */
++static void au_refresh_iattr(struct inode *inode, struct kstat *st,
++ unsigned int nlink)
++{
++ unsigned int n;
+
-+struct au_branch;
-+#ifdef CONFIG_AUFS_HNOTIFY
-+struct au_hnotify_op {
-+ void (*ctl)(struct au_hinode *hinode, int do_set);
-+ int (*alloc)(struct au_hinode *hinode);
++ inode->i_mode = st->mode;
++ /* don't i_[ug]id_write() here */
++ inode->i_uid = st->uid;
++ inode->i_gid = st->gid;
++ inode->i_atime = st->atime;
++ inode->i_mtime = st->mtime;
++ inode->i_ctime = st->ctime;
+
-+ /*
-+ * if it returns true, the the caller should free hinode->hi_notify,
-+ * otherwise ->free() frees it.
-+ */
-+ int (*free)(struct au_hinode *hinode,
-+ struct au_hnotify *hn) __must_check;
++ au_cpup_attr_nlink(inode, /*force*/0);
++ if (S_ISDIR(inode->i_mode)) {
++ n = inode->i_nlink;
++ n -= nlink;
++ n += st->nlink;
++ smp_mb(); /* for i_nlink */
++ /* 0 can happen */
++ set_nlink(inode, n);
++ }
+
-+ void (*fin)(void);
-+ int (*init)(void);
++ spin_lock(&inode->i_lock);
++ inode->i_blocks = st->blocks;
++ i_size_write(inode, st->size);
++ spin_unlock(&inode->i_lock);
++}
+
-+ int (*reset_br)(unsigned int udba, struct au_branch *br, int perm);
-+ void (*fin_br)(struct au_branch *br);
-+ int (*init_br)(struct au_branch *br, int perm);
-+};
++/*
++ * common routine for aufs_getattr() and au_getxattr().
++ * returns zero or negative (an error).
++ * @dentry will be read-locked in success.
++ */
++int au_h_path_getattr(struct dentry *dentry, int force, struct path *h_path,
++ int locked)
++{
++ int err;
++ unsigned int mnt_flags, sigen;
++ unsigned char udba_none;
++ aufs_bindex_t bindex;
++ struct super_block *sb, *h_sb;
++ struct inode *inode;
+
-+/* hnotify.c */
-+int au_hn_alloc(struct au_hinode *hinode, struct inode *inode);
-+void au_hn_free(struct au_hinode *hinode);
-+void au_hn_ctl(struct au_hinode *hinode, int do_set);
-+void au_hn_reset(struct inode *inode, unsigned int flags);
-+int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
-+ struct qstr *h_child_qstr, struct inode *h_child_inode);
-+int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm);
-+int au_hnotify_init_br(struct au_branch *br, int perm);
-+void au_hnotify_fin_br(struct au_branch *br);
-+int __init au_hnotify_init(void);
-+void au_hnotify_fin(void);
++ h_path->mnt = NULL;
++ h_path->dentry = NULL;
+
-+/* hfsnotify.c */
-+extern const struct au_hnotify_op au_hnotify_op;
++ err = 0;
++ sb = dentry->d_sb;
++ mnt_flags = au_mntflags(sb);
++ udba_none = !!au_opt_test(mnt_flags, UDBA_NONE);
+
-+static inline
-+void au_hn_init(struct au_hinode *hinode)
-+{
-+ hinode->hi_notify = NULL;
-+}
++ if (unlikely(locked))
++ goto body; /* skip locking dinfo */
+
-+static inline struct au_hnotify *au_hn(struct au_hinode *hinode)
-+{
-+ return hinode->hi_notify;
-+}
++ /* support fstat(2) */
++ if (!d_unlinked(dentry) && !udba_none) {
++ sigen = au_sigen(sb);
++ err = au_digen_test(dentry, sigen);
++ if (!err) {
++ di_read_lock_child(dentry, AuLock_IR);
++ err = au_dbrange_test(dentry);
++ if (unlikely(err)) {
++ di_read_unlock(dentry, AuLock_IR);
++ goto out;
++ }
++ } else {
++ AuDebugOn(IS_ROOT(dentry));
++ di_write_lock_child(dentry);
++ err = au_dbrange_test(dentry);
++ if (!err)
++ err = au_reval_for_attr(dentry, sigen);
++ if (!err)
++ di_downgrade_lock(dentry, AuLock_IR);
++ else {
++ di_write_unlock(dentry);
++ goto out;
++ }
++ }
++ } else
++ di_read_lock_child(dentry, AuLock_IR);
+
-+#else
-+AuStub(int, au_hn_alloc, return -EOPNOTSUPP,
-+ struct au_hinode *hinode __maybe_unused,
-+ struct inode *inode __maybe_unused)
-+AuStub(struct au_hnotify *, au_hn, return NULL, struct au_hinode *hinode)
-+AuStubVoid(au_hn_free, struct au_hinode *hinode __maybe_unused)
-+AuStubVoid(au_hn_ctl, struct au_hinode *hinode __maybe_unused,
-+ int do_set __maybe_unused)
-+AuStubVoid(au_hn_reset, struct inode *inode __maybe_unused,
-+ unsigned int flags __maybe_unused)
-+AuStubInt0(au_hnotify_reset_br, unsigned int udba __maybe_unused,
-+ struct au_branch *br __maybe_unused,
-+ int perm __maybe_unused)
-+AuStubInt0(au_hnotify_init_br, struct au_branch *br __maybe_unused,
-+ int perm __maybe_unused)
-+AuStubVoid(au_hnotify_fin_br, struct au_branch *br __maybe_unused)
-+AuStubInt0(__init au_hnotify_init, void)
-+AuStubVoid(au_hnotify_fin, void)
-+AuStubVoid(au_hn_init, struct au_hinode *hinode __maybe_unused)
-+#endif /* CONFIG_AUFS_HNOTIFY */
++body:
++ inode = d_inode(dentry);
++ bindex = au_ibtop(inode);
++ h_path->mnt = au_sbr_mnt(sb, bindex);
++ h_sb = h_path->mnt->mnt_sb;
++ if (!force
++ && !au_test_fs_bad_iattr(h_sb)
++ && udba_none)
++ goto out; /* success */
+
-+static inline void au_hn_suspend(struct au_hinode *hdir)
-+{
-+ au_hn_ctl(hdir, /*do_set*/0);
-+}
++ if (au_dbtop(dentry) == bindex)
++ h_path->dentry = au_h_dptr(dentry, bindex);
++ else if (au_opt_test(mnt_flags, PLINK) && au_plink_test(inode)) {
++ h_path->dentry = au_plink_lkup(inode, bindex);
++ if (IS_ERR(h_path->dentry))
++ /* pretending success */
++ h_path->dentry = NULL;
++ else
++ dput(h_path->dentry);
++ }
+
-+static inline void au_hn_resume(struct au_hinode *hdir)
-+{
-+ au_hn_ctl(hdir, /*do_set*/1);
++out:
++ return err;
+}
+
-+static inline void au_hn_inode_lock(struct au_hinode *hdir)
++static int aufs_getattr(const struct path *path, struct kstat *st,
++ u32 request, unsigned int query)
+{
-+ inode_lock(hdir->hi_inode);
-+ au_hn_suspend(hdir);
-+}
++ int err;
++ unsigned char positive;
++ struct path h_path;
++ struct dentry *dentry;
++ struct inode *inode;
++ struct super_block *sb;
+
-+static inline void au_hn_inode_lock_nested(struct au_hinode *hdir,
-+ unsigned int sc __maybe_unused)
-+{
-+ inode_lock_nested(hdir->hi_inode, sc);
-+ au_hn_suspend(hdir);
-+}
++ dentry = path->dentry;
++ inode = d_inode(dentry);
++ sb = dentry->d_sb;
++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
++ if (unlikely(err))
++ goto out;
++ err = au_h_path_getattr(dentry, /*force*/0, &h_path, /*locked*/0);
++ if (unlikely(err))
++ goto out_si;
++ if (unlikely(!h_path.dentry))
++ /* illegally overlapped or something */
++ goto out_fill; /* pretending success */
+
-+#if 0 /* unused */
-+#include "vfsub.h"
-+static inline void au_hn_inode_lock_shared_nested(struct au_hinode *hdir,
-+ unsigned int sc)
-+{
-+ vfsub_inode_lock_shared_nested(hdir->hi_inode, sc);
-+ au_hn_suspend(hdir);
-+}
-+#endif
++ positive = d_is_positive(h_path.dentry);
++ if (positive)
++ /* no vfsub version */
++ err = vfs_getattr(&h_path, st, request, query);
++ if (!err) {
++ if (positive)
++ au_refresh_iattr(inode, st,
++ d_inode(h_path.dentry)->i_nlink);
++ goto out_fill; /* success */
++ }
++ AuTraceErr(err);
++ goto out_di;
+
-+static inline void au_hn_inode_unlock(struct au_hinode *hdir)
-+{
-+ au_hn_resume(hdir);
-+ inode_unlock(hdir->hi_inode);
++out_fill:
++ generic_fillattr(inode, st);
++out_di:
++ di_read_unlock(dentry, AuLock_IR);
++out_si:
++ si_read_unlock(sb);
++out:
++ AuTraceErr(err);
++ return err;
+}
+
-+#endif /* __KERNEL__ */
-+#endif /* __AUFS_INODE_H__ */
-diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
---- /usr/share/empty/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c 2017-07-29 12:14:25.903042072 +0200
-@@ -0,0 +1,219 @@
-+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
-+ *
-+ * This program, aufs 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/>.
-+ */
-+
-+/*
-+ * ioctl
-+ * plink-management and readdir in userspace.
-+ * assist the pathconf(3) wrapper library.
-+ * move-down
-+ * File-based Hierarchical Storage Management.
-+ */
-+
-+#include <linux/compat.h>
-+#include <linux/file.h>
-+#include "aufs.h"
++/* ---------------------------------------------------------------------- */
+
-+static int au_wbr_fd(struct path *path, struct aufs_wbr_fd __user *arg)
++static const char *aufs_get_link(struct dentry *dentry, struct inode *inode,
++ struct delayed_call *done)
+{
-+ int err, fd;
-+ aufs_bindex_t wbi, bindex, bbot;
-+ struct file *h_file;
-+ struct super_block *sb;
-+ struct dentry *root;
-+ struct au_branch *br;
-+ struct aufs_wbr_fd wbrfd = {
-+ .oflags = au_dir_roflags,
-+ .brid = -1
-+ };
-+ const int valid = O_RDONLY | O_NONBLOCK | O_LARGEFILE | O_DIRECTORY
-+ | O_NOATIME | O_CLOEXEC;
++ const char *ret;
++ struct dentry *h_dentry;
++ struct inode *h_inode;
++ int err;
++ aufs_bindex_t bindex;
+
-+ AuDebugOn(wbrfd.oflags & ~valid);
++ ret = NULL; /* suppress a warning */
++ err = -ECHILD;
++ if (!dentry)
++ goto out;
+
-+ if (arg) {
-+ err = copy_from_user(&wbrfd, arg, sizeof(wbrfd));
-+ if (unlikely(err)) {
-+ err = -EFAULT;
-+ goto out;
-+ }
++ err = aufs_read_lock(dentry, AuLock_IR | AuLock_GEN);
++ if (unlikely(err))
++ goto out;
+
-+ err = -EINVAL;
-+ AuDbg("wbrfd{0%o, %d}\n", wbrfd.oflags, wbrfd.brid);
-+ wbrfd.oflags |= au_dir_roflags;
-+ AuDbg("0%o\n", wbrfd.oflags);
-+ if (unlikely(wbrfd.oflags & ~valid))
-+ goto out;
-+ }
++ err = au_d_hashed_positive(dentry);
++ if (unlikely(err))
++ goto out_unlock;
+
-+ fd = get_unused_fd_flags(0);
-+ err = fd;
-+ if (unlikely(fd < 0))
-+ goto out;
++ err = -EINVAL;
++ inode = d_inode(dentry);
++ bindex = au_ibtop(inode);
++ h_inode = au_h_iptr(inode, bindex);
++ if (unlikely(!h_inode->i_op->get_link))
++ goto out_unlock;
+
-+ h_file = ERR_PTR(-EINVAL);
-+ wbi = 0;
-+ br = NULL;
-+ sb = path->dentry->d_sb;
-+ root = sb->s_root;
-+ aufs_read_lock(root, AuLock_IR);
-+ bbot = au_sbbot(sb);
-+ if (wbrfd.brid >= 0) {
-+ wbi = au_br_index(sb, wbrfd.brid);
-+ if (unlikely(wbi < 0 || wbi > bbot))
-+ goto out_unlock;
++ err = -EBUSY;
++ h_dentry = NULL;
++ if (au_dbtop(dentry) <= bindex) {
++ h_dentry = au_h_dptr(dentry, bindex);
++ if (h_dentry)
++ dget(h_dentry);
+ }
-+
-+ h_file = ERR_PTR(-ENOENT);
-+ br = au_sbr(sb, wbi);
-+ if (!au_br_writable(br->br_perm)) {
-+ if (arg)
++ if (!h_dentry) {
++ h_dentry = d_find_any_alias(h_inode);
++ if (IS_ERR(h_dentry)) {
++ err = PTR_ERR(h_dentry);
+ goto out_unlock;
-+
-+ bindex = wbi + 1;
-+ wbi = -1;
-+ for (; bindex <= bbot; bindex++) {
-+ br = au_sbr(sb, bindex);
-+ if (au_br_writable(br->br_perm)) {
-+ wbi = bindex;
-+ br = au_sbr(sb, wbi);
-+ break;
-+ }
+ }
+ }
-+ AuDbg("wbi %d\n", wbi);
-+ if (wbi >= 0)
-+ h_file = au_h_open(root, wbi, wbrfd.oflags, NULL,
-+ /*force_wr*/0);
-+
-+out_unlock:
-+ aufs_read_unlock(root, AuLock_IR);
-+ err = PTR_ERR(h_file);
-+ if (IS_ERR(h_file))
-+ goto out_fd;
++ if (unlikely(!h_dentry))
++ goto out_unlock;
+
-+ au_br_put(br); /* cf. au_h_open() */
-+ fd_install(fd, h_file);
-+ err = fd;
-+ goto out; /* success */
++ err = 0;
++ AuDbg("%pf\n", h_inode->i_op->get_link);
++ AuDbgDentry(h_dentry);
++ ret = vfs_get_link(h_dentry, done);
++ dput(h_dentry);
++ if (IS_ERR(ret))
++ err = PTR_ERR(ret);
+
-+out_fd:
-+ put_unused_fd(fd);
++out_unlock:
++ aufs_read_unlock(dentry, AuLock_IR);
+out:
-+ AuTraceErr(err);
-+ return err;
++ if (unlikely(err))
++ ret = ERR_PTR(err);
++ AuTraceErrPtr(ret);
++ return ret;
+}
+
+/* ---------------------------------------------------------------------- */
+
-+long aufs_ioctl_dir(struct file *file, unsigned int cmd, unsigned long arg)
++static int au_is_special(struct inode *inode)
+{
-+ long err;
-+ struct dentry *dentry;
++ return (inode->i_mode & (S_IFBLK | S_IFCHR | S_IFIFO | S_IFSOCK));
++}
+
-+ switch (cmd) {
-+ case AUFS_CTL_RDU:
-+ case AUFS_CTL_RDU_INO:
-+ err = au_rdu_ioctl(file, cmd, arg);
-+ break;
++static int aufs_update_time(struct inode *inode, struct timespec *ts, int flags)
++{
++ int err;
++ aufs_bindex_t bindex;
++ struct super_block *sb;
++ struct inode *h_inode;
++ struct vfsmount *h_mnt;
+
-+ case AUFS_CTL_WBR_FD:
-+ err = au_wbr_fd(&file->f_path, (void __user *)arg);
-+ break;
++ sb = inode->i_sb;
++ WARN_ONCE((flags & S_ATIME) && !IS_NOATIME(inode),
++ "unexpected s_flags 0x%lx", sb->s_flags);
+
-+ case AUFS_CTL_IBUSY:
-+ err = au_ibusy_ioctl(file, arg);
-+ break;
++ /* mmap_sem might be acquired already, cf. aufs_mmap() */
++ lockdep_off();
++ si_read_lock(sb, AuLock_FLUSH);
++ ii_write_lock_child(inode);
+
-+ case AUFS_CTL_BRINFO:
-+ err = au_brinfo_ioctl(file, arg);
-+ break;
++ err = 0;
++ bindex = au_ibtop(inode);
++ h_inode = au_h_iptr(inode, bindex);
++ if (!au_test_ro(sb, bindex, inode)) {
++ h_mnt = au_sbr_mnt(sb, bindex);
++ err = vfsub_mnt_want_write(h_mnt);
++ if (!err) {
++ err = vfsub_update_time(h_inode, ts, flags);
++ vfsub_mnt_drop_write(h_mnt);
++ }
++ } else if (au_is_special(h_inode)) {
++ /*
++ * Never copy-up here.
++ * These special files may already be opened and used for
++ * communicating. If we copied it up, then the communication
++ * would be corrupted.
++ */
++ AuWarn1("timestamps for i%lu are ignored "
++ "since it is on readonly branch (hi%lu).\n",
++ inode->i_ino, h_inode->i_ino);
++ } else if (flags & ~S_ATIME) {
++ err = -EIO;
++ AuIOErr1("unexpected flags 0x%x\n", flags);
++ AuDebugOn(1);
++ }
+
-+ case AUFS_CTL_FHSM_FD:
-+ dentry = file->f_path.dentry;
-+ if (IS_ROOT(dentry))
-+ err = au_fhsm_fd(dentry->d_sb, arg);
-+ else
-+ err = -ENOTTY;
-+ break;
++ if (!err)
++ au_cpup_attr_timesizes(inode);
++ ii_write_unlock(inode);
++ si_read_unlock(sb);
++ lockdep_on();
+
-+ default:
-+ /* do not call the lower */
-+ AuDbg("0x%x\n", cmd);
-+ err = -ENOTTY;
-+ }
++ if (!err && (flags & S_VERSION))
++ inode_inc_iversion(inode);
+
-+ AuTraceErr(err);
+ return err;
+}
+
-+long aufs_ioctl_nondir(struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+ long err;
++/* ---------------------------------------------------------------------- */
+
-+ switch (cmd) {
-+ case AUFS_CTL_MVDOWN:
-+ err = au_mvdown(file->f_path.dentry, (void __user *)arg);
-+ break;
++/* no getattr version will be set by module.c:aufs_init() */
++struct inode_operations aufs_iop_nogetattr[AuIop_Last],
++ aufs_iop[] = {
++ [AuIop_SYMLINK] = {
++ .permission = aufs_permission,
++#ifdef CONFIG_FS_POSIX_ACL
++ .get_acl = aufs_get_acl,
++ .set_acl = aufs_set_acl, /* unsupport for symlink? */
++#endif
+
-+ case AUFS_CTL_WBR_FD:
-+ err = au_wbr_fd(&file->f_path, (void __user *)arg);
-+ break;
++ .setattr = aufs_setattr,
++ .getattr = aufs_getattr,
+
-+ default:
-+ /* do not call the lower */
-+ AuDbg("0x%x\n", cmd);
-+ err = -ENOTTY;
-+ }
++#ifdef CONFIG_AUFS_XATTR
++ .listxattr = aufs_listxattr,
++#endif
+
-+ AuTraceErr(err);
-+ return err;
-+}
++ .get_link = aufs_get_link,
+
-+#ifdef CONFIG_COMPAT
-+long aufs_compat_ioctl_dir(struct file *file, unsigned int cmd,
-+ unsigned long arg)
-+{
-+ long err;
++ /* .update_time = aufs_update_time */
++ },
++ [AuIop_DIR] = {
++ .create = aufs_create,
++ .lookup = aufs_lookup,
++ .link = aufs_link,
++ .unlink = aufs_unlink,
++ .symlink = aufs_symlink,
++ .mkdir = aufs_mkdir,
++ .rmdir = aufs_rmdir,
++ .mknod = aufs_mknod,
++ .rename = aufs_rename,
+
-+ switch (cmd) {
-+ case AUFS_CTL_RDU:
-+ case AUFS_CTL_RDU_INO:
-+ err = au_rdu_compat_ioctl(file, cmd, arg);
-+ break;
++ .permission = aufs_permission,
++#ifdef CONFIG_FS_POSIX_ACL
++ .get_acl = aufs_get_acl,
++ .set_acl = aufs_set_acl,
++#endif
+
-+ case AUFS_CTL_IBUSY:
-+ err = au_ibusy_compat_ioctl(file, arg);
-+ break;
++ .setattr = aufs_setattr,
++ .getattr = aufs_getattr,
+
-+ case AUFS_CTL_BRINFO:
-+ err = au_brinfo_compat_ioctl(file, arg);
-+ break;
++#ifdef CONFIG_AUFS_XATTR
++ .listxattr = aufs_listxattr,
++#endif
+
-+ default:
-+ err = aufs_ioctl_dir(file, cmd, arg);
-+ }
++ .update_time = aufs_update_time,
++ .atomic_open = aufs_atomic_open,
++ .tmpfile = aufs_tmpfile
++ },
++ [AuIop_OTHER] = {
++ .permission = aufs_permission,
++#ifdef CONFIG_FS_POSIX_ACL
++ .get_acl = aufs_get_acl,
++ .set_acl = aufs_set_acl,
++#endif
+
-+ AuTraceErr(err);
-+ return err;
-+}
++ .setattr = aufs_setattr,
++ .getattr = aufs_getattr,
+
-+long aufs_compat_ioctl_nondir(struct file *file, unsigned int cmd,
-+ unsigned long arg)
-+{
-+ return aufs_ioctl_nondir(file, cmd, (unsigned long)compat_ptr(arg));
-+}
++#ifdef CONFIG_AUFS_XATTR
++ .listxattr = aufs_listxattr,
+#endif
-diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
---- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c 2017-11-12 22:24:42.270843503 +0100
++
++ .update_time = aufs_update_time
++ }
++};
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/i_op_add.c linux-4.14/fs/aufs/i_op_add.c
+--- linux-4.14/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/i_op_add.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,920 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+out:
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
---- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2017-11-12 22:24:44.707577830 +0100
-@@ -0,0 +1,1459 @@
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/i_op_del.c linux-4.14/fs/aufs/i_op_del.c
+--- linux-4.14/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/i_op_del.c 2021-02-24 21:42:43.444448075 +0100
+@@ -0,0 +1,511 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ *
+ */
+
+/*
-+ * inode operations (except add/del/rename)
++ * inode operations (del entry)
+ */
+
-+#include <linux/device_cgroup.h>
-+#include <linux/fs_stack.h>
-+#include <linux/namei.h>
-+#include <linux/security.h>
+#include "aufs.h"
+
-+static int h_permission(struct inode *h_inode, int mask,
-+ struct path *h_path, int brperm)
++/*
++ * decide if a new whiteout for @dentry is necessary or not.
++ * when it is necessary, prepare the parent dir for the upper branch whose
++ * branch index is @bcpup for creation. the actual creation of the whiteout will
++ * be done by caller.
++ * return value:
++ * 0: wh is unnecessary
++ * plus: wh is necessary
++ * minus: error
++ */
++int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup)
+{
-+ int err;
-+ const unsigned char write_mask = !!(mask & (MAY_WRITE | MAY_APPEND));
-+
-+ err = -EPERM;
-+ if (write_mask && IS_IMMUTABLE(h_inode))
-+ goto out;
++ int need_wh, err;
++ aufs_bindex_t btop;
++ struct super_block *sb;
+
-+ err = -EACCES;
-+ if (((mask & MAY_EXEC)
-+ && S_ISREG(h_inode->i_mode)
-+ && (path_noexec(h_path)
-+ || !(h_inode->i_mode & S_IXUGO))))
-+ goto out;
++ sb = dentry->d_sb;
++ btop = au_dbtop(dentry);
++ if (*bcpup < 0) {
++ *bcpup = btop;
++ if (au_test_ro(sb, btop, d_inode(dentry))) {
++ err = AuWbrCopyup(au_sbi(sb), dentry);
++ *bcpup = err;
++ if (unlikely(err < 0))
++ goto out;
++ }
++ } else
++ AuDebugOn(btop < *bcpup
++ || au_test_ro(sb, *bcpup, d_inode(dentry)));
++ AuDbg("bcpup %d, btop %d\n", *bcpup, btop);
+
-+ /*
-+ * - 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);
++ if (*bcpup != btop) {
++ err = au_cpup_dirs(dentry, *bcpup);
++ if (unlikely(err))
++ goto out;
++ need_wh = 1;
+ } else {
-+ /* AuLabel(h_inode->permission); */
-+ err = h_inode->i_op->permission(h_inode, mask);
-+ AuTraceErr(err);
++ struct au_dinfo *dinfo, *tmp;
++
++ need_wh = -ENOMEM;
++ dinfo = au_di(dentry);
++ tmp = au_di_alloc(sb, AuLsc_DI_TMP);
++ if (tmp) {
++ au_di_cp(tmp, dinfo);
++ au_di_swap(tmp, dinfo);
++ /* returns the number of positive dentries */
++ need_wh = au_lkup_dentry(dentry, btop + 1,
++ /* AuLkup_IGNORE_PERM */ 0);
++ au_di_swap(tmp, dinfo);
++ au_rw_write_unlock(&tmp->di_rwsem);
++ au_di_free(tmp);
++ }
+ }
++ AuDbg("need_wh %d\n", need_wh);
++ err = need_wh;
+
-+ if (!err)
-+ err = devcgroup_inode_permission(h_inode, mask);
-+ if (!err)
-+ err = security_inode_permission(h_inode, mask);
++out:
++ return err;
++}
+
-+#if 0
-+ if (!err) {
-+ /* todo: do we need to call ima_path_check()? */
-+ struct path h_path = {
-+ .dentry =
-+ .mnt = h_mnt
-+ };
-+ err = ima_path_check(&h_path,
-+ mask & (MAY_READ | MAY_WRITE | MAY_EXEC),
-+ IMA_COUNT_LEAVE);
++/*
++ * simple tests for the del-entry operations.
++ * following the checks in vfs, plus the parent-child relationship.
++ */
++int au_may_del(struct dentry *dentry, aufs_bindex_t bindex,
++ struct dentry *h_parent, int isdir)
++{
++ int err;
++ umode_t h_mode;
++ struct dentry *h_dentry, *h_latest;
++ struct inode *h_inode;
++
++ h_dentry = au_h_dptr(dentry, bindex);
++ if (d_really_is_positive(dentry)) {
++ err = -ENOENT;
++ if (unlikely(d_is_negative(h_dentry)))
++ goto out;
++ h_inode = d_inode(h_dentry);
++ if (unlikely(!h_inode->i_nlink))
++ goto out;
++
++ h_mode = h_inode->i_mode;
++ if (!isdir) {
++ err = -EISDIR;
++ if (unlikely(S_ISDIR(h_mode)))
++ goto out;
++ } else if (unlikely(!S_ISDIR(h_mode))) {
++ err = -ENOTDIR;
++ goto out;
++ }
++ } else {
++ /* rename(2) case */
++ err = -EIO;
++ if (unlikely(d_is_positive(h_dentry)))
++ goto out;
+ }
-+#endif
++
++ err = -ENOENT;
++ /* expected parent dir is locked */
++ if (unlikely(h_parent != h_dentry->d_parent))
++ goto out;
++ err = 0;
++
++ /*
++ * rmdir a dir may break the consistency on some filesystem.
++ * let's try heavy test.
++ */
++ err = -EACCES;
++ if (unlikely(!au_opt_test(au_mntflags(dentry->d_sb), DIRPERM1)
++ && au_test_h_perm(d_inode(h_parent),
++ MAY_EXEC | MAY_WRITE)))
++ goto out;
++
++ h_latest = au_sio_lkup_one(&dentry->d_name, h_parent);
++ err = -EIO;
++ if (IS_ERR(h_latest))
++ goto out;
++ if (h_latest == h_dentry)
++ err = 0;
++ dput(h_latest);
+
+out:
+ return err;
+}
+
-+static int aufs_permission(struct inode *inode, int mask)
++/*
++ * decide the branch where we operate for @dentry. the branch index will be set
++ * @rbcpup. after diciding it, 'pin' it and store the timestamps of the parent
++ * dir for reverting.
++ * when a new whiteout is necessary, create it.
++ */
++static struct dentry*
++lock_hdir_create_wh(struct dentry *dentry, int isdir, aufs_bindex_t *rbcpup,
++ struct au_dtime *dt, struct au_pin *pin)
+{
-+ int err;
-+ aufs_bindex_t bindex, bbot;
-+ const unsigned char isdir = !!S_ISDIR(inode->i_mode),
-+ write_mask = !!(mask & (MAY_WRITE | MAY_APPEND));
-+ struct inode *h_inode;
++ struct dentry *wh_dentry;
+ struct super_block *sb;
-+ struct au_branch *br;
++ struct path h_path;
++ int err, need_wh;
++ unsigned int udba;
++ aufs_bindex_t bcpup;
+
-+ /* todo: support rcu-walk? */
-+ if (mask & MAY_NOT_BLOCK)
-+ return -ECHILD;
++ need_wh = au_wr_dir_need_wh(dentry, isdir, rbcpup);
++ wh_dentry = ERR_PTR(need_wh);
++ if (unlikely(need_wh < 0))
++ goto out;
+
-+ sb = inode->i_sb;
-+ si_read_lock(sb, AuLock_FLUSH);
-+ ii_read_lock_child(inode);
-+#if 0
-+ err = au_iigen_test(inode, au_sigen(sb));
++ sb = dentry->d_sb;
++ udba = au_opt_udba(sb);
++ bcpup = *rbcpup;
++ err = au_pin(pin, dentry, bcpup, udba,
++ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
++ wh_dentry = ERR_PTR(err);
+ if (unlikely(err))
+ goto out;
-+#endif
-+
-+ if (!isdir
-+ || write_mask
-+ || au_opt_test(au_mntflags(sb), DIRPERM1)) {
-+ err = au_busy_or_stale();
-+ h_inode = au_h_iptr(inode, au_ibtop(inode));
-+ if (unlikely(!h_inode
-+ || (h_inode->i_mode & S_IFMT)
-+ != (inode->i_mode & S_IFMT)))
-+ goto out;
+
-+ err = 0;
-+ bindex = au_ibtop(inode);
-+ br = au_sbr(sb, bindex);
-+ err = h_permission(h_inode, mask, &br->br_path, br->br_perm);
-+ if (write_mask
-+ && !err
-+ && !special_file(h_inode->i_mode)) {
-+ /* test whether the upper writable branch exists */
-+ err = -EROFS;
-+ for (; bindex >= 0; bindex--)
-+ if (!au_br_rdonly(au_sbr(sb, bindex))) {
-+ err = 0;
-+ break;
-+ }
-+ }
-+ goto out;
++ h_path.dentry = au_pinned_h_parent(pin);
++ if (udba != AuOpt_UDBA_NONE
++ && au_dbtop(dentry) == bcpup) {
++ err = au_may_del(dentry, bcpup, h_path.dentry, isdir);
++ wh_dentry = ERR_PTR(err);
++ if (unlikely(err))
++ goto out_unpin;
+ }
+
-+ /* non-write to dir */
-+ err = 0;
-+ bbot = au_ibbot(inode);
-+ for (bindex = au_ibtop(inode); !err && bindex <= bbot; bindex++) {
-+ h_inode = au_h_iptr(inode, bindex);
-+ if (h_inode) {
-+ err = au_busy_or_stale();
-+ if (unlikely(!S_ISDIR(h_inode->i_mode)))
-+ break;
++ h_path.mnt = au_sbr_mnt(sb, bcpup);
++ au_dtime_store(dt, au_pinned_parent(pin), &h_path);
++ wh_dentry = NULL;
++ if (!need_wh)
++ goto out; /* success, no need to create whiteout */
+
-+ br = au_sbr(sb, bindex);
-+ err = h_permission(h_inode, mask, &br->br_path,
-+ br->br_perm);
-+ }
-+ }
++ wh_dentry = au_wh_create(dentry, bcpup, h_path.dentry);
++ if (IS_ERR(wh_dentry))
++ goto out_unpin;
++
++ /* returns with the parent is locked and wh_dentry is dget-ed */
++ goto out; /* success */
+
++out_unpin:
++ au_unpin(pin);
+out:
-+ ii_read_unlock(inode);
-+ si_read_unlock(sb);
-+ return err;
++ return wh_dentry;
+}
+
-+/* ---------------------------------------------------------------------- */
-+
-+static struct dentry *aufs_lookup(struct inode *dir, struct dentry *dentry,
-+ unsigned int flags)
++/*
++ * when removing a dir, rename it to a unique temporary whiteout-ed name first
++ * in order to be revertible and save time for removing many child whiteouts
++ * under the dir.
++ * returns 1 when there are too many child whiteout and caller should remove
++ * them asynchronously. returns 0 when the number of children is enough small to
++ * remove now or the branch fs is a remote fs.
++ * otherwise return an error.
++ */
++static int renwh_and_rmdir(struct dentry *dentry, aufs_bindex_t bindex,
++ struct au_nhash *whlist, struct inode *dir)
+{
-+ struct dentry *ret, *parent;
-+ struct inode *inode;
++ int rmdir_later, err, dirwh;
++ struct dentry *h_dentry;
+ struct super_block *sb;
-+ int err, npositive;
-+
-+ IMustLock(dir);
-+
-+ /* todo: support rcu-walk? */
-+ ret = ERR_PTR(-ECHILD);
-+ if (flags & LOOKUP_RCU)
-+ goto out;
-+
-+ ret = ERR_PTR(-ENAMETOOLONG);
-+ if (unlikely(dentry->d_name.len > AUFS_MAX_NAMELEN))
-+ goto out;
++ struct inode *inode;
+
-+ sb = dir->i_sb;
-+ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
-+ ret = ERR_PTR(err);
++ sb = dentry->d_sb;
++ SiMustAnyLock(sb);
++ h_dentry = au_h_dptr(dentry, bindex);
++ err = au_whtmp_ren(h_dentry, au_sbr(sb, bindex));
+ if (unlikely(err))
+ goto out;
+
-+ err = au_di_init(dentry);
-+ ret = ERR_PTR(err);
-+ if (unlikely(err))
-+ goto out_si;
-+
-+ inode = NULL;
-+ npositive = 0; /* suppress a warning */
-+ parent = dentry->d_parent; /* dir inode is locked */
-+ di_read_lock_parent(parent, AuLock_IR);
-+ err = au_alive_dir(parent);
-+ if (!err)
-+ err = au_digen_test(parent, au_sigen(sb));
-+ if (!err) {
-+ /* regardless LOOKUP_CREATE, always ALLOW_NEG */
-+ npositive = au_lkup_dentry(dentry, au_dbtop(parent),
-+ AuLkup_ALLOW_NEG);
-+ err = npositive;
-+ }
-+ di_read_unlock(parent, AuLock_IR);
-+ ret = ERR_PTR(err);
-+ if (unlikely(err < 0))
-+ goto out_unlock;
++ /* stop monitoring */
++ inode = d_inode(dentry);
++ au_hn_free(au_hi(inode, bindex));
+
-+ if (npositive) {
-+ inode = au_new_inode(dentry, /*must_new*/0);
-+ if (IS_ERR(inode)) {
-+ ret = (void *)inode;
-+ inode = NULL;
-+ goto out_unlock;
-+ }
++ if (!au_test_fs_remote(h_dentry->d_sb)) {
++ dirwh = au_sbi(sb)->si_dirwh;
++ rmdir_later = (dirwh <= 1);
++ if (!rmdir_later)
++ rmdir_later = au_nhash_test_longer_wh(whlist, bindex,
++ dirwh);
++ if (rmdir_later)
++ return rmdir_later;
+ }
+
-+ if (inode)
-+ atomic_inc(&inode->i_count);
-+ ret = d_splice_alias(inode, dentry);
-+#if 0
-+ if (unlikely(d_need_lookup(dentry))) {
-+ spin_lock(&dentry->d_lock);
-+ dentry->d_flags &= ~DCACHE_NEED_LOOKUP;
-+ spin_unlock(&dentry->d_lock);
-+ } else
-+#endif
-+ if (inode) {
-+ if (!IS_ERR(ret)) {
-+ iput(inode);
-+ if (ret && ret != dentry)
-+ ii_write_unlock(inode);
-+ } else {
-+ ii_write_unlock(inode);
-+ iput(inode);
-+ inode = NULL;
-+ }
++ err = au_whtmp_rmdir(dir, bindex, h_dentry, whlist);
++ if (unlikely(err)) {
++ AuIOErr("rmdir %pd, b%d failed, %d. ignored\n",
++ h_dentry, bindex, err);
++ err = 0;
+ }
+
-+out_unlock:
-+ di_write_unlock(dentry);
-+out_si:
-+ si_read_unlock(sb);
+out:
-+ return ret;
++ AuTraceErr(err);
++ return err;
+}
+
-+/* ---------------------------------------------------------------------- */
++/*
++ * final procedure for deleting a entry.
++ * maintain dentry and iattr.
++ */
++static void epilog(struct inode *dir, struct dentry *dentry,
++ aufs_bindex_t bindex)
++{
++ struct inode *inode;
+
-+struct aopen_node {
-+ struct hlist_bl_node hblist;
-+ struct file *file, *h_file;
-+};
++ inode = d_inode(dentry);
++ d_drop(dentry);
++ inode->i_ctime = dir->i_ctime;
+
-+static int au_do_aopen(struct inode *inode, struct file *file)
++ au_dir_ts(dir, bindex);
++ dir->i_version++;
++}
++
++/*
++ * when an error happened, remove the created whiteout and revert everything.
++ */
++static int do_revert(int err, struct inode *dir, aufs_bindex_t bindex,
++ aufs_bindex_t bwh, struct dentry *wh_dentry,
++ struct dentry *dentry, struct au_dtime *dt)
+{
-+ struct hlist_bl_head *aopen;
-+ struct hlist_bl_node *pos;
-+ struct aopen_node *node;
-+ struct au_do_open_args args = {
-+ .aopen = 1,
-+ .open = au_do_open_nondir
++ int rerr;
++ struct path h_path = {
++ .dentry = wh_dentry,
++ .mnt = au_sbr_mnt(dir->i_sb, bindex)
+ };
+
-+ aopen = &au_sbi(inode->i_sb)->si_aopen;
-+ hlist_bl_lock(aopen);
-+ hlist_bl_for_each_entry(node, pos, aopen, hblist)
-+ if (node->file == file) {
-+ args.h_file = node->h_file;
-+ break;
-+ }
-+ hlist_bl_unlock(aopen);
-+ /* AuDebugOn(!args.h_file); */
++ rerr = au_wh_unlink_dentry(au_h_iptr(dir, bindex), &h_path, dentry);
++ if (!rerr) {
++ au_set_dbwh(dentry, bwh);
++ au_dtime_revert(dt);
++ return 0;
++ }
+
-+ return au_do_open(file, &args);
++ AuIOErr("%pd reverting whiteout failed(%d, %d)\n", dentry, err, rerr);
++ return -EIO;
+}
+
-+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 aufs_unlink(struct inode *dir, struct dentry *dentry)
+{
-+ int err, unlocked, h_opened = *opened;
-+ unsigned int lkup_flags;
-+ struct dentry *parent, *d;
-+ struct hlist_bl_head *aopen;
-+ struct vfsub_aopen_args args = {
-+ .open_flag = open_flag,
-+ .create_mode = create_mode,
-+ .opened = &h_opened
-+ };
-+ struct aopen_node aopen_node = {
-+ .file = file
-+ };
++ int err;
++ aufs_bindex_t bwh, bindex, btop;
++ struct inode *inode, *h_dir, *delegated;
++ struct dentry *parent, *wh_dentry;
++ /* to reuduce stack size */
++ struct {
++ struct au_dtime dt;
++ struct au_pin pin;
++ struct path h_path;
++ } *a;
+
+ IMustLock(dir);
-+ AuDbg("open_flag 0%o\n", open_flag);
-+ AuDbgDentry(dentry);
-+
-+ err = 0;
-+ if (!au_di(dentry)) {
-+ lkup_flags = LOOKUP_OPEN;
-+ if (open_flag & O_CREAT)
-+ lkup_flags |= LOOKUP_CREATE;
-+ d = aufs_lookup(dir, dentry, lkup_flags);
-+ if (IS_ERR(d)) {
-+ err = PTR_ERR(d);
-+ AuTraceErr(err);
-+ goto out;
-+ } else if (d) {
-+ /*
-+ * obsoleted dentry found.
-+ * another error will be returned later.
-+ */
-+ d_drop(d);
-+ AuDbgDentry(d);
-+ dput(d);
-+ }
-+ AuDbgDentry(dentry);
-+ }
-+
-+ if (d_is_positive(dentry)
-+ || d_unhashed(dentry)
-+ || d_unlinked(dentry)
-+ || !(open_flag & O_CREAT))
-+ goto out_no_open;
+
-+ unlocked = 0;
-+ err = aufs_read_lock(dentry, AuLock_DW | AuLock_FLUSH | AuLock_GEN);
-+ if (unlikely(err))
++ err = -ENOMEM;
++ a = kmalloc(sizeof(*a), GFP_NOFS);
++ if (unlikely(!a))
+ goto out;
+
-+ parent = dentry->d_parent; /* dir is locked */
-+ di_write_lock_parent(parent);
-+ err = au_lkup_dentry(dentry, /*btop*/0, AuLkup_ALLOW_NEG);
++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN);
++ if (unlikely(err))
++ goto out_free;
++ err = au_d_hashed_positive(dentry);
+ if (unlikely(err))
+ goto out_unlock;
++ inode = d_inode(dentry);
++ IMustLock(inode);
++ err = -EISDIR;
++ if (unlikely(d_is_dir(dentry)))
++ goto out_unlock; /* possible? */
+
-+ 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;
++ btop = au_dbtop(dentry);
++ bwh = au_dbwh(dentry);
++ bindex = -1;
++ parent = dentry->d_parent; /* dir inode is locked */
++ di_write_lock_parent(parent);
++ wh_dentry = lock_hdir_create_wh(dentry, /*isdir*/0, &bindex, &a->dt,
++ &a->pin);
++ err = PTR_ERR(wh_dentry);
++ if (IS_ERR(wh_dentry))
++ goto out_parent;
+
-+ 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;
++ a->h_path.mnt = au_sbr_mnt(dentry->d_sb, btop);
++ a->h_path.dentry = au_h_dptr(dentry, btop);
++ dget(a->h_path.dentry);
++ if (bindex == btop) {
++ h_dir = au_pinned_h_dir(&a->pin);
++ delegated = NULL;
++ err = vfsub_unlink(h_dir, &a->h_path, &delegated, /*force*/0);
++ if (unlikely(err == -EWOULDBLOCK)) {
++ pr_warn("cannot retry for NFSv4 delegation"
++ " for an internal unlink\n");
++ iput(delegated);
++ }
++ } else {
++ /* dir inode is locked */
++ h_dir = d_inode(wh_dentry->d_parent);
++ IMustLock(h_dir);
++ err = 0;
+ }
-+ di_write_unlock(parent);
-+ di_write_unlock(dentry);
-+ unlocked = 1;
+
-+ /* 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_hbl_add(&aopen_node.hblist, aopen);
-+ err = finish_open(file, dentry, au_do_aopen, opened);
-+ au_hbl_del(&aopen_node.hblist, aopen);
-+ AuTraceErr(err);
-+ AuDbgFile(file);
-+ if (aopen_node.h_file)
-+ fput(aopen_node.h_file);
++ if (!err) {
++ vfsub_drop_nlink(inode);
++ epilog(dir, dentry, bindex);
+
-+out_unlock:
-+ if (unlocked)
-+ si_read_unlock(dentry->d_sb);
-+ else {
-+ di_write_unlock(parent);
-+ aufs_read_unlock(dentry, AuLock_DW);
-+ }
-+ AuDbgDentry(dentry);
-+ if (unlikely(err < 0))
-+ goto out;
-+out_no_open:
-+ if (err >= 0 && !(*opened & FILE_CREATED)) {
-+ AuLabel(out_no_open);
-+ dget(dentry);
-+ err = finish_no_open(file, dentry);
++ /* update target timestamps */
++ if (bindex == btop) {
++ vfsub_update_h_iattr(&a->h_path, /*did*/NULL);
++ /*ignore*/
++ inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime;
++ } else
++ /* todo: this timestamp may be reverted later */
++ inode->i_ctime = h_dir->i_ctime;
++ goto out_unpin; /* success */
+ }
-+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 btop)
-+{
-+ int err;
-+ struct dentry *h_parent;
-+ struct inode *h_dir;
-+
-+ if (add_entry)
-+ IMustLock(d_inode(parent));
-+ else
-+ di_write_lock_parent(parent);
+
-+ err = 0;
-+ if (!au_h_dptr(parent, bcpup)) {
-+ if (btop > bcpup)
-+ err = au_cpup_dirs(dentry, bcpup);
-+ else if (btop < bcpup)
-+ err = au_cpdown_dirs(dentry, bcpup);
-+ else
-+ BUG();
-+ }
-+ if (!err && add_entry && !au_ftest_wrdir(add_entry, TMPFILE)) {
-+ h_parent = au_h_dptr(parent, bcpup);
-+ h_dir = d_inode(h_parent);
-+ vfsub_inode_lock_shared_nested(h_dir, AuLsc_I_PARENT);
-+ err = au_lkup_neg(dentry, bcpup, /*wh*/0);
-+ /* todo: no unlock here */
-+ inode_unlock_shared(h_dir);
++ /* revert */
++ if (wh_dentry) {
++ int rerr;
+
-+ AuDbg("bcpup %d\n", bcpup);
-+ if (!err) {
-+ if (d_really_is_negative(dentry))
-+ au_set_h_dptr(dentry, btop, NULL);
-+ au_update_dbrange(dentry, /*do_put_zero*/0);
-+ }
++ rerr = do_revert(err, dir, bindex, bwh, wh_dentry, dentry,
++ &a->dt);
++ if (rerr)
++ err = rerr;
+ }
+
-+ if (!add_entry)
-+ di_write_unlock(parent);
-+ if (!err)
-+ err = bcpup; /* success */
-+
-+ AuTraceErr(err);
++out_unpin:
++ au_unpin(&a->pin);
++ dput(wh_dentry);
++ dput(a->h_path.dentry);
++out_parent:
++ di_write_unlock(parent);
++out_unlock:
++ aufs_read_unlock(dentry, AuLock_DW);
++out_free:
++ kfree(a);
++out:
+ return err;
+}
+
-+/*
-+ * decide the branch and the parent dir where we will create a new entry.
-+ * returns new bindex or an error.
-+ * copyup the parent dir if needed.
-+ */
-+int au_wr_dir(struct dentry *dentry, struct dentry *src_dentry,
-+ struct au_wr_dir_args *args)
++int aufs_rmdir(struct inode *dir, struct dentry *dentry)
+{
-+ int err;
-+ unsigned int flags;
-+ aufs_bindex_t bcpup, btop, src_btop;
-+ const unsigned char add_entry
-+ = au_ftest_wrdir(args->flags, ADD_ENTRY)
-+ | au_ftest_wrdir(args->flags, TMPFILE);
-+ struct super_block *sb;
-+ struct dentry *parent;
-+ struct au_sbinfo *sbinfo;
++ int err, rmdir_later;
++ aufs_bindex_t bwh, bindex, btop;
++ struct inode *inode;
++ struct dentry *parent, *wh_dentry, *h_dentry;
++ struct au_whtmp_rmdir *args;
++ /* to reuduce stack size */
++ struct {
++ struct au_dtime dt;
++ struct au_pin pin;
++ } *a;
++
++ IMustLock(dir);
++
++ err = -ENOMEM;
++ a = kmalloc(sizeof(*a), GFP_NOFS);
++ if (unlikely(!a))
++ goto out;
++
++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_FLUSH | AuLock_GEN);
++ if (unlikely(err))
++ goto out_free;
++ err = au_alive_dir(dentry);
++ if (unlikely(err))
++ goto out_unlock;
++ inode = d_inode(dentry);
++ IMustLock(inode);
++ err = -ENOTDIR;
++ if (unlikely(!d_is_dir(dentry)))
++ goto out_unlock; /* possible? */
++
++ err = -ENOMEM;
++ args = au_whtmp_rmdir_alloc(dir->i_sb, GFP_NOFS);
++ if (unlikely(!args))
++ goto out_unlock;
++
++ parent = dentry->d_parent; /* dir inode is locked */
++ di_write_lock_parent(parent);
++ err = au_test_empty(dentry, &args->whlist);
++ if (unlikely(err))
++ goto out_parent;
+
-+ sb = dentry->d_sb;
-+ sbinfo = au_sbi(sb);
-+ parent = dget_parent(dentry);
+ btop = au_dbtop(dentry);
-+ bcpup = btop;
-+ if (args->force_btgt < 0) {
-+ if (src_dentry) {
-+ src_btop = au_dbtop(src_dentry);
-+ if (src_btop < btop)
-+ bcpup = src_btop;
-+ } else if (add_entry) {
-+ flags = 0;
-+ if (au_ftest_wrdir(args->flags, ISDIR))
-+ au_fset_wbr(flags, DIR);
-+ err = AuWbrCreate(sbinfo, dentry, flags);
-+ bcpup = err;
-+ }
++ bwh = au_dbwh(dentry);
++ bindex = -1;
++ wh_dentry = lock_hdir_create_wh(dentry, /*isdir*/1, &bindex, &a->dt,
++ &a->pin);
++ err = PTR_ERR(wh_dentry);
++ if (IS_ERR(wh_dentry))
++ goto out_parent;
+
-+ if (bcpup < 0 || au_test_ro(sb, bcpup, d_inode(dentry))) {
-+ if (add_entry)
-+ err = AuWbrCopyup(sbinfo, dentry);
-+ else {
-+ if (!IS_ROOT(dentry)) {
-+ di_read_lock_parent(parent, !AuLock_IR);
-+ err = AuWbrCopyup(sbinfo, dentry);
-+ di_read_unlock(parent, !AuLock_IR);
-+ } else
-+ err = AuWbrCopyup(sbinfo, dentry);
-+ }
-+ bcpup = err;
-+ if (unlikely(err < 0))
-+ goto out;
++ h_dentry = au_h_dptr(dentry, btop);
++ dget(h_dentry);
++ rmdir_later = 0;
++ if (bindex == btop) {
++ err = renwh_and_rmdir(dentry, btop, &args->whlist, dir);
++ if (err > 0) {
++ rmdir_later = err;
++ err = 0;
+ }
+ } else {
-+ bcpup = args->force_btgt;
-+ AuDebugOn(au_test_ro(sb, bcpup, d_inode(dentry)));
++ /* stop monitoring */
++ au_hn_free(au_hi(inode, btop));
++
++ /* dir inode is locked */
++ IMustLock(d_inode(wh_dentry->d_parent));
++ err = 0;
+ }
+
-+ AuDbg("btop %d, bcpup %d\n", btop, bcpup);
-+ err = bcpup;
-+ if (bcpup == btop)
-+ goto out; /* success */
++ if (!err) {
++ vfsub_dead_dir(inode);
++ au_set_dbdiropq(dentry, -1);
++ epilog(dir, dentry, bindex);
+
-+ /* copyup the new parent into the branch we process */
-+ err = au_wr_dir_cpup(dentry, parent, add_entry, bcpup, btop);
-+ if (err >= 0) {
-+ if (d_really_is_negative(dentry)) {
-+ au_set_h_dptr(dentry, btop, NULL);
-+ au_set_dbtop(dentry, bcpup);
-+ au_set_dbbot(dentry, bcpup);
++ if (rmdir_later) {
++ au_whtmp_kick_rmdir(dir, btop, h_dentry, args);
++ args = NULL;
+ }
-+ AuDebugOn(add_entry
-+ && !au_ftest_wrdir(args->flags, TMPFILE)
-+ && !au_h_dptr(dentry, bcpup));
++
++ goto out_unpin; /* success */
++ }
++
++ /* revert */
++ AuLabel(revert);
++ if (wh_dentry) {
++ int rerr;
++
++ rerr = do_revert(err, dir, bindex, bwh, wh_dentry, dentry,
++ &a->dt);
++ if (rerr)
++ err = rerr;
+ }
+
++out_unpin:
++ au_unpin(&a->pin);
++ dput(wh_dentry);
++ dput(h_dentry);
++out_parent:
++ di_write_unlock(parent);
++ if (args)
++ au_whtmp_rmdir_free(args);
++out_unlock:
++ aufs_read_unlock(dentry, AuLock_DW);
++out_free:
++ kfree(a);
+out:
-+ dput(parent);
++ AuTraceErr(err);
+ return err;
+}
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/i_op_ren.c linux-4.14/fs/aufs/i_op_ren.c
+--- linux-4.14/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/i_op_ren.c 2021-02-24 21:42:43.444448075 +0100
+@@ -0,0 +1,1246 @@
++/*
++ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ *
++ * This program, aufs 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/>.
++ */
+
-+/* ---------------------------------------------------------------------- */
++/*
++ * inode operation (rename entry)
++ * todo: this is crazy monster
++ */
+
-+void au_pin_hdir_unlock(struct au_pin *p)
-+{
-+ if (p->hdir)
-+ au_hn_inode_unlock(p->hdir);
-+}
++#include "aufs.h"
+
-+int au_pin_hdir_lock(struct au_pin *p)
-+{
-+ int err;
++enum { AuSRC, AuDST, AuSrcDst };
++enum { AuPARENT, AuCHILD, AuParentChild };
+
-+ err = 0;
-+ if (!p->hdir)
-+ goto out;
++#define AuRen_ISDIR_SRC 1
++#define AuRen_ISDIR_DST (1 << 1)
++#define AuRen_ISSAMEDIR (1 << 2)
++#define AuRen_WHSRC (1 << 3)
++#define AuRen_WHDST (1 << 4)
++#define AuRen_MNT_WRITE (1 << 5)
++#define AuRen_DT_DSTDIR (1 << 6)
++#define AuRen_DIROPQ_SRC (1 << 7)
++#define AuRen_DIROPQ_DST (1 << 8)
++#define AuRen_DIRREN (1 << 9)
++#define AuRen_DROPPED_SRC (1 << 10)
++#define AuRen_DROPPED_DST (1 << 11)
++#define au_ftest_ren(flags, name) ((flags) & AuRen_##name)
++#define au_fset_ren(flags, name) \
++ do { (flags) |= AuRen_##name; } while (0)
++#define au_fclr_ren(flags, name) \
++ do { (flags) &= ~AuRen_##name; } while (0)
+
-+ /* even if an error happens later, keep this lock */
-+ au_hn_inode_lock_nested(p->hdir, p->lsc_hi);
++#ifndef CONFIG_AUFS_DIRREN
++#undef AuRen_DIRREN
++#define AuRen_DIRREN 0
++#endif
+
-+ err = -EBUSY;
-+ if (unlikely(p->hdir->hi_inode != d_inode(p->h_parent)))
-+ goto out;
++struct au_ren_args {
++ struct {
++ struct dentry *dentry, *h_dentry, *parent, *h_parent,
++ *wh_dentry;
++ struct inode *dir, *inode;
++ struct au_hinode *hdir, *hinode;
++ struct au_dtime dt[AuParentChild];
++ aufs_bindex_t btop, bdiropq;
++ } sd[AuSrcDst];
+
-+ err = 0;
-+ if (p->h_dentry)
-+ err = au_h_verify(p->h_dentry, p->udba, p->hdir->hi_inode,
-+ p->h_parent, p->br);
++#define src_dentry sd[AuSRC].dentry
++#define src_dir sd[AuSRC].dir
++#define src_inode sd[AuSRC].inode
++#define src_h_dentry sd[AuSRC].h_dentry
++#define src_parent sd[AuSRC].parent
++#define src_h_parent sd[AuSRC].h_parent
++#define src_wh_dentry sd[AuSRC].wh_dentry
++#define src_hdir sd[AuSRC].hdir
++#define src_hinode sd[AuSRC].hinode
++#define src_h_dir sd[AuSRC].hdir->hi_inode
++#define src_dt sd[AuSRC].dt
++#define src_btop sd[AuSRC].btop
++#define src_bdiropq sd[AuSRC].bdiropq
+
-+out:
-+ return err;
-+}
++#define dst_dentry sd[AuDST].dentry
++#define dst_dir sd[AuDST].dir
++#define dst_inode sd[AuDST].inode
++#define dst_h_dentry sd[AuDST].h_dentry
++#define dst_parent sd[AuDST].parent
++#define dst_h_parent sd[AuDST].h_parent
++#define dst_wh_dentry sd[AuDST].wh_dentry
++#define dst_hdir sd[AuDST].hdir
++#define dst_hinode sd[AuDST].hinode
++#define dst_h_dir sd[AuDST].hdir->hi_inode
++#define dst_dt sd[AuDST].dt
++#define dst_btop sd[AuDST].btop
++#define dst_bdiropq sd[AuDST].bdiropq
+
-+int au_pin_hdir_relock(struct au_pin *p)
-+{
-+ int err, i;
-+ struct inode *h_i;
-+ struct dentry *h_d[] = {
-+ p->h_dentry,
-+ p->h_parent
-+ };
++ struct dentry *h_trap;
++ struct au_branch *br;
++ struct path h_path;
++ struct au_nhash whlist;
++ aufs_bindex_t btgt, src_bwh;
+
-+ err = au_pin_hdir_lock(p);
-+ if (unlikely(err))
-+ goto out;
++ struct {
++ unsigned short auren_flags;
++ unsigned char flags; /* syscall parameter */
++ unsigned char exchange;
++ } __packed;
+
-+ for (i = 0; !err && i < sizeof(h_d)/sizeof(*h_d); i++) {
-+ if (!h_d[i])
-+ continue;
-+ if (d_is_positive(h_d[i])) {
-+ h_i = d_inode(h_d[i]);
-+ err = !h_i->i_nlink;
-+ }
-+ }
++ struct au_whtmp_rmdir *thargs;
++ struct dentry *h_dst;
++ struct au_hinode *h_root;
++};
+
-+out:
-+ return err;
-+}
++/* ---------------------------------------------------------------------- */
+
-+static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task)
-+{
-+#if !defined(CONFIG_RWSEM_GENERIC_SPINLOCK) && defined(CONFIG_RWSEM_SPIN_ON_OWNER)
-+ p->hdir->hi_inode->i_rwsem.owner = task;
-+#endif
-+}
++/*
++ * functions for reverting.
++ * when an error happened in a single rename systemcall, we should revert
++ * everything as if nothing happened.
++ * we don't need to revert the copied-up/down the parent dir since they are
++ * harmless.
++ */
+
-+void au_pin_hdir_acquire_nest(struct au_pin *p)
-+{
-+ if (p->hdir) {
-+ rwsem_acquire_nest(&p->hdir->hi_inode->i_rwsem.dep_map,
-+ p->lsc_hi, 0, NULL, _RET_IP_);
-+ au_pin_hdir_set_owner(p, current);
-+ }
-+}
++#define RevertFailure(fmt, ...) do { \
++ AuIOErr("revert failure: " fmt " (%d, %d)\n", \
++ ##__VA_ARGS__, err, rerr); \
++ err = -EIO; \
++} while (0)
+
-+void au_pin_hdir_release(struct au_pin *p)
++static void au_ren_do_rev_diropq(int err, struct au_ren_args *a, int idx)
+{
-+ if (p->hdir) {
-+ au_pin_hdir_set_owner(p, p->task);
-+ rwsem_release(&p->hdir->hi_inode->i_rwsem.dep_map, 1, _RET_IP_);
-+ }
-+}
++ int rerr;
++ struct dentry *d;
++#define src_or_dst(member) a->sd[idx].member
+
-+struct dentry *au_pinned_h_parent(struct au_pin *pin)
-+{
-+ if (pin && pin->parent)
-+ return au_h_dptr(pin->parent, pin->bindex);
-+ return NULL;
++ d = src_or_dst(dentry); /* {src,dst}_dentry */
++ au_hn_inode_lock_nested(src_or_dst(hinode), AuLsc_I_CHILD);
++ rerr = au_diropq_remove(d, a->btgt);
++ au_hn_inode_unlock(src_or_dst(hinode));
++ au_set_dbdiropq(d, src_or_dst(bdiropq));
++ if (rerr)
++ RevertFailure("remove diropq %pd", d);
++
++#undef src_or_dst_
+}
+
-+void au_unpin(struct au_pin *p)
++static void au_ren_rev_diropq(int err, struct au_ren_args *a)
+{
-+ if (p->hdir)
-+ au_pin_hdir_unlock(p);
-+ if (p->h_mnt && au_ftest_pin(p->flags, MNT_WRITE))
-+ vfsub_mnt_drop_write(p->h_mnt);
-+ if (!p->hdir)
-+ return;
-+
-+ if (!au_ftest_pin(p->flags, DI_LOCKED))
-+ di_read_unlock(p->parent, AuLock_IR);
-+ iput(p->hdir->hi_inode);
-+ dput(p->parent);
-+ p->parent = NULL;
-+ p->hdir = NULL;
-+ p->h_mnt = NULL;
-+ /* do not clear p->task */
++ if (au_ftest_ren(a->auren_flags, DIROPQ_SRC))
++ au_ren_do_rev_diropq(err, a, AuSRC);
++ if (au_ftest_ren(a->auren_flags, DIROPQ_DST))
++ au_ren_do_rev_diropq(err, a, AuDST);
+}
+
-+int au_do_pin(struct au_pin *p)
++static void au_ren_rev_rename(int err, struct au_ren_args *a)
+{
-+ int err;
-+ struct super_block *sb;
-+ struct inode *h_dir;
-+
-+ err = 0;
-+ sb = p->dentry->d_sb;
-+ p->br = au_sbr(sb, p->bindex);
-+ if (IS_ROOT(p->dentry)) {
-+ if (au_ftest_pin(p->flags, MNT_WRITE)) {
-+ p->h_mnt = au_br_mnt(p->br);
-+ err = vfsub_mnt_want_write(p->h_mnt);
-+ if (unlikely(err)) {
-+ au_fclr_pin(p->flags, MNT_WRITE);
-+ goto out_err;
-+ }
-+ }
-+ goto out;
-+ }
-+
-+ p->h_dentry = NULL;
-+ if (p->bindex <= au_dbbot(p->dentry))
-+ p->h_dentry = au_h_dptr(p->dentry, p->bindex);
-+
-+ p->parent = dget_parent(p->dentry);
-+ if (!au_ftest_pin(p->flags, DI_LOCKED))
-+ di_read_lock(p->parent, AuLock_IR, p->lsc_di);
-+
-+ h_dir = NULL;
-+ p->h_parent = au_h_dptr(p->parent, p->bindex);
-+ p->hdir = au_hi(d_inode(p->parent), p->bindex);
-+ if (p->hdir)
-+ h_dir = p->hdir->hi_inode;
++ int rerr;
++ struct inode *delegated;
+
-+ /*
-+ * udba case, or
-+ * if DI_LOCKED is not set, then p->parent may be different
-+ * and h_parent can be NULL.
-+ */
-+ if (unlikely(!p->hdir || !h_dir || !p->h_parent)) {
-+ err = -EBUSY;
-+ if (!au_ftest_pin(p->flags, DI_LOCKED))
-+ di_read_unlock(p->parent, AuLock_IR);
-+ dput(p->parent);
-+ p->parent = NULL;
-+ goto out_err;
++ a->h_path.dentry = vfsub_lkup_one(&a->src_dentry->d_name,
++ a->src_h_parent);
++ rerr = PTR_ERR(a->h_path.dentry);
++ if (IS_ERR(a->h_path.dentry)) {
++ RevertFailure("lkup one %pd", a->src_dentry);
++ return;
+ }
+
-+ if (au_ftest_pin(p->flags, MNT_WRITE)) {
-+ p->h_mnt = au_br_mnt(p->br);
-+ err = vfsub_mnt_want_write(p->h_mnt);
-+ if (unlikely(err)) {
-+ au_fclr_pin(p->flags, MNT_WRITE);
-+ if (!au_ftest_pin(p->flags, DI_LOCKED))
-+ di_read_unlock(p->parent, AuLock_IR);
-+ dput(p->parent);
-+ p->parent = NULL;
-+ goto out_err;
-+ }
++ delegated = NULL;
++ rerr = vfsub_rename(a->dst_h_dir,
++ au_h_dptr(a->src_dentry, a->btgt),
++ a->src_h_dir, &a->h_path, &delegated, a->flags);
++ if (unlikely(rerr == -EWOULDBLOCK)) {
++ pr_warn("cannot retry for NFSv4 delegation"
++ " for an internal rename\n");
++ iput(delegated);
+ }
-+
-+ au_igrab(h_dir);
-+ err = au_pin_hdir_lock(p);
-+ if (!err)
-+ goto out; /* success */
-+
-+ au_unpin(p);
-+
-+out_err:
-+ pr_err("err %d\n", err);
-+ err = au_busy_or_stale();
-+out:
-+ return err;
++ d_drop(a->h_path.dentry);
++ dput(a->h_path.dentry);
++ /* au_set_h_dptr(a->src_dentry, a->btgt, NULL); */
++ if (rerr)
++ RevertFailure("rename %pd", a->src_dentry);
+}
+
-+void au_pin_init(struct au_pin *p, struct dentry *dentry,
-+ aufs_bindex_t bindex, int lsc_di, int lsc_hi,
-+ unsigned int udba, unsigned char flags)
++static void au_ren_rev_whtmp(int err, struct au_ren_args *a)
+{
-+ p->dentry = dentry;
-+ p->udba = udba;
-+ p->lsc_di = lsc_di;
-+ p->lsc_hi = lsc_hi;
-+ p->flags = flags;
-+ p->bindex = bindex;
++ int rerr;
++ struct inode *delegated;
+
-+ p->parent = NULL;
-+ p->hdir = NULL;
-+ p->h_mnt = NULL;
++ a->h_path.dentry = vfsub_lkup_one(&a->dst_dentry->d_name,
++ a->dst_h_parent);
++ rerr = PTR_ERR(a->h_path.dentry);
++ if (IS_ERR(a->h_path.dentry)) {
++ RevertFailure("lkup one %pd", a->dst_dentry);
++ return;
++ }
++ if (d_is_positive(a->h_path.dentry)) {
++ d_drop(a->h_path.dentry);
++ dput(a->h_path.dentry);
++ return;
++ }
+
-+ p->h_dentry = NULL;
-+ p->h_parent = NULL;
-+ p->br = NULL;
-+ p->task = current;
++ delegated = NULL;
++ rerr = vfsub_rename(a->dst_h_dir, a->h_dst, a->dst_h_dir, &a->h_path,
++ &delegated, a->flags);
++ if (unlikely(rerr == -EWOULDBLOCK)) {
++ pr_warn("cannot retry for NFSv4 delegation"
++ " for an internal rename\n");
++ iput(delegated);
++ }
++ d_drop(a->h_path.dentry);
++ dput(a->h_path.dentry);
++ if (!rerr)
++ au_set_h_dptr(a->dst_dentry, a->btgt, dget(a->h_dst));
++ else
++ RevertFailure("rename %pd", a->h_dst);
+}
+
-+int au_pin(struct au_pin *pin, struct dentry *dentry, aufs_bindex_t bindex,
-+ unsigned int udba, unsigned char flags)
++static void au_ren_rev_whsrc(int err, struct au_ren_args *a)
+{
-+ au_pin_init(pin, dentry, bindex, AuLsc_DI_PARENT, AuLsc_I_PARENT2,
-+ udba, flags);
-+ return au_do_pin(pin);
++ int rerr;
++
++ a->h_path.dentry = a->src_wh_dentry;
++ rerr = au_wh_unlink_dentry(a->src_h_dir, &a->h_path, a->src_dentry);
++ au_set_dbwh(a->src_dentry, a->src_bwh);
++ if (rerr)
++ RevertFailure("unlink %pd", a->src_wh_dentry);
+}
++#undef RevertFailure
+
+/* ---------------------------------------------------------------------- */
+
+/*
-+ * ->setattr() and ->getattr() are called in various cases.
-+ * chmod, stat: dentry is revalidated.
-+ * fchmod, fstat: file and dentry are not revalidated, additionally they may be
-+ * unhashed.
-+ * for ->setattr(), ia->ia_file is passed from ftruncate only.
++ * when we have to copyup the renaming entry, do it with the rename-target name
++ * in order to minimize the cost (the later actual rename is unnecessary).
++ * otherwise rename it on the target branch.
+ */
-+/* todo: consolidate with do_refresh() and simple_reval_dpath() */
-+int au_reval_for_attr(struct dentry *dentry, unsigned int sigen)
++static int au_ren_or_cpup(struct au_ren_args *a)
+{
+ int err;
-+ struct dentry *parent;
++ struct dentry *d;
++ struct inode *delegated;
+
-+ err = 0;
-+ if (au_digen_test(dentry, sigen)) {
-+ parent = dget_parent(dentry);
-+ di_read_lock_parent(parent, AuLock_IR);
-+ err = au_refresh_dentry(dentry, parent);
-+ di_read_unlock(parent, AuLock_IR);
-+ dput(parent);
-+ }
++ d = a->src_dentry;
++ if (au_dbtop(d) == a->btgt) {
++ a->h_path.dentry = a->dst_h_dentry;
++ AuDebugOn(au_dbtop(d) != a->btgt);
++ delegated = NULL;
++ err = vfsub_rename(a->src_h_dir, au_h_dptr(d, a->btgt),
++ a->dst_h_dir, &a->h_path, &delegated,
++ a->flags);
++ if (unlikely(err == -EWOULDBLOCK)) {
++ pr_warn("cannot retry for NFSv4 delegation"
++ " for an internal rename\n");
++ iput(delegated);
++ }
++ } else
++ BUG();
++
++ if (!err && a->h_dst)
++ /* it will be set to dinfo later */
++ dget(a->h_dst);
+
-+ AuTraceErr(err);
+ return err;
+}
+
-+int au_pin_and_icpup(struct dentry *dentry, struct iattr *ia,
-+ struct au_icpup_args *a)
++/* cf. aufs_rmdir() */
++static int au_ren_del_whtmp(struct au_ren_args *a)
+{
+ int err;
-+ loff_t sz;
-+ aufs_bindex_t btop, ibtop;
-+ struct dentry *hi_wh, *parent;
-+ struct inode *inode;
-+ struct au_wr_dir_args wr_dir_args = {
-+ .force_btgt = -1,
-+ .flags = 0
-+ };
-+
-+ if (d_is_dir(dentry))
-+ au_fset_wrdir(wr_dir_args.flags, ISDIR);
-+ /* plink or hi_wh() case */
-+ btop = au_dbtop(dentry);
-+ inode = d_inode(dentry);
-+ ibtop = au_ibtop(inode);
-+ if (btop != ibtop && !au_test_ro(inode->i_sb, ibtop, inode))
-+ wr_dir_args.force_btgt = ibtop;
-+ err = au_wr_dir(dentry, /*src_dentry*/NULL, &wr_dir_args);
-+ if (unlikely(err < 0))
-+ goto out;
-+ a->btgt = err;
-+ if (err != btop)
-+ au_fset_icpup(a->flags, DID_CPUP);
++ struct inode *dir;
+
-+ err = 0;
-+ a->pin_flags = AuPin_MNT_WRITE;
-+ parent = NULL;
-+ if (!IS_ROOT(dentry)) {
-+ au_fset_pin(a->pin_flags, DI_LOCKED);
-+ parent = dget_parent(dentry);
-+ di_write_lock_parent(parent);
++ dir = a->dst_dir;
++ SiMustAnyLock(dir->i_sb);
++ if (!au_nhash_test_longer_wh(&a->whlist, a->btgt,
++ au_sbi(dir->i_sb)->si_dirwh)
++ || au_test_fs_remote(a->h_dst->d_sb)) {
++ err = au_whtmp_rmdir(dir, a->btgt, a->h_dst, &a->whlist);
++ if (unlikely(err))
++ pr_warn("failed removing whtmp dir %pd (%d), "
++ "ignored.\n", a->h_dst, err);
++ } else {
++ au_nhash_wh_free(&a->thargs->whlist);
++ a->thargs->whlist = a->whlist;
++ a->whlist.nh_num = 0;
++ au_whtmp_kick_rmdir(dir, a->btgt, a->h_dst, a->thargs);
++ dput(a->h_dst);
++ a->thargs = NULL;
+ }
+
-+ err = au_pin(&a->pin, dentry, a->btgt, a->udba, a->pin_flags);
-+ if (unlikely(err))
-+ goto out_parent;
++ return 0;
++}
+
-+ sz = -1;
-+ a->h_path.dentry = au_h_dptr(dentry, btop);
-+ a->h_inode = d_inode(a->h_path.dentry);
-+ if (ia && (ia->ia_valid & ATTR_SIZE)) {
-+ vfsub_inode_lock_shared_nested(a->h_inode, AuLsc_I_CHILD);
-+ if (ia->ia_size < i_size_read(a->h_inode))
-+ sz = ia->ia_size;
-+ inode_unlock_shared(a->h_inode);
-+ }
++/* make it 'opaque' dir. */
++static int au_ren_do_diropq(struct au_ren_args *a, int idx)
++{
++ int err;
++ struct dentry *d, *diropq;
++#define src_or_dst(member) a->sd[idx].member
+
-+ hi_wh = NULL;
-+ if (au_ftest_icpup(a->flags, DID_CPUP) && d_unlinked(dentry)) {
-+ hi_wh = au_hi_wh(inode, a->btgt);
-+ if (!hi_wh) {
-+ struct au_cp_generic cpg = {
-+ .dentry = dentry,
-+ .bdst = a->btgt,
-+ .bsrc = -1,
-+ .len = sz,
-+ .pin = &a->pin
-+ };
-+ err = au_sio_cpup_wh(&cpg, /*file*/NULL);
-+ if (unlikely(err))
-+ goto out_unlock;
-+ hi_wh = au_hi_wh(inode, a->btgt);
-+ /* todo: revalidate hi_wh? */
-+ }
-+ }
++ err = 0;
++ d = src_or_dst(dentry); /* {src,dst}_dentry */
++ src_or_dst(bdiropq) = au_dbdiropq(d);
++ src_or_dst(hinode) = au_hi(src_or_dst(inode), a->btgt);
++ au_hn_inode_lock_nested(src_or_dst(hinode), AuLsc_I_CHILD);
++ diropq = au_diropq_create(d, a->btgt);
++ au_hn_inode_unlock(src_or_dst(hinode));
++ if (IS_ERR(diropq))
++ err = PTR_ERR(diropq);
++ else
++ dput(diropq);
+
-+ if (parent) {
-+ au_pin_set_parent_lflag(&a->pin, /*lflag*/0);
-+ di_downgrade_lock(parent, AuLock_IR);
-+ dput(parent);
-+ parent = NULL;
-+ }
-+ if (!au_ftest_icpup(a->flags, DID_CPUP))
-+ goto out; /* success */
++#undef src_or_dst_
++ return err;
++}
+
-+ if (!d_unhashed(dentry)) {
-+ struct au_cp_generic cpg = {
-+ .dentry = dentry,
-+ .bdst = a->btgt,
-+ .bsrc = btop,
-+ .len = sz,
-+ .pin = &a->pin,
-+ .flags = AuCpup_DTIME | AuCpup_HOPEN
-+ };
-+ err = au_sio_cpup_simple(&cpg);
-+ if (!err)
-+ a->h_path.dentry = au_h_dptr(dentry, a->btgt);
-+ } else if (!hi_wh)
-+ a->h_path.dentry = au_h_dptr(dentry, a->btgt);
-+ else
-+ a->h_path.dentry = hi_wh; /* do not dget here */
++static int au_ren_diropq(struct au_ren_args *a)
++{
++ int err;
++ unsigned char always;
++ struct dentry *d;
+
-+out_unlock:
-+ a->h_inode = d_inode(a->h_path.dentry);
-+ if (!err)
++ err = 0;
++ d = a->dst_dentry; /* already renamed on the branch */
++ always = !!au_opt_test(au_mntflags(d->d_sb), ALWAYS_DIROPQ);
++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)
++ && !au_ftest_ren(a->auren_flags, DIRREN)
++ && a->btgt != au_dbdiropq(a->src_dentry)
++ && (a->dst_wh_dentry
++ || a->btgt <= au_dbdiropq(d)
++ /* hide the lower to keep xino */
++ /* the lowers may not be a dir, but we hide them anyway */
++ || a->btgt < au_dbbot(d)
++ || always)) {
++ AuDbg("here\n");
++ err = au_ren_do_diropq(a, AuSRC);
++ if (unlikely(err))
++ goto out;
++ au_fset_ren(a->auren_flags, DIROPQ_SRC);
++ }
++ if (!a->exchange)
+ goto out; /* success */
-+ au_unpin(&a->pin);
-+out_parent:
-+ if (parent) {
-+ di_write_unlock(parent);
-+ dput(parent);
++
++ d = a->src_dentry; /* already renamed on the branch */
++ if (au_ftest_ren(a->auren_flags, ISDIR_DST)
++ && a->btgt != au_dbdiropq(a->dst_dentry)
++ && (a->btgt < au_dbdiropq(d)
++ || a->btgt < au_dbbot(d)
++ || always)) {
++ AuDbgDentry(a->src_dentry);
++ AuDbgDentry(a->dst_dentry);
++ err = au_ren_do_diropq(a, AuDST);
++ if (unlikely(err))
++ goto out_rev_src;
++ au_fset_ren(a->auren_flags, DIROPQ_DST);
+ }
++ goto out; /* success */
++
++out_rev_src:
++ AuDbg("err %d, reverting src\n", err);
++ au_ren_rev_diropq(err, a);
+out:
-+ if (!err)
-+ inode_lock_nested(a->h_inode, AuLsc_I_CHILD);
+ return err;
+}
+
-+static int aufs_setattr(struct dentry *dentry, struct iattr *ia)
++static int do_rename(struct au_ren_args *a)
+{
+ int err;
-+ struct inode *inode, *delegated;
-+ struct super_block *sb;
-+ struct file *file;
-+ struct au_icpup_args *a;
-+
-+ inode = d_inode(dentry);
-+ IMustLock(inode);
++ struct dentry *d, *h_d;
+
-+ err = setattr_prepare(dentry, ia);
-+ if (unlikely(err))
-+ goto out;
++ if (!a->exchange) {
++ /* prepare workqueue args for asynchronous rmdir */
++ h_d = a->dst_h_dentry;
++ if (au_ftest_ren(a->auren_flags, ISDIR_DST)
++ /* && !au_ftest_ren(a->auren_flags, DIRREN) */
++ && d_is_positive(h_d)) {
++ err = -ENOMEM;
++ a->thargs = au_whtmp_rmdir_alloc(a->src_dentry->d_sb,
++ GFP_NOFS);
++ if (unlikely(!a->thargs))
++ goto out;
++ a->h_dst = dget(h_d);
++ }
+
-+ err = -ENOMEM;
-+ a = kzalloc(sizeof(*a), GFP_NOFS);
-+ if (unlikely(!a))
-+ goto out;
++ /* create whiteout for src_dentry */
++ if (au_ftest_ren(a->auren_flags, WHSRC)) {
++ a->src_bwh = au_dbwh(a->src_dentry);
++ AuDebugOn(a->src_bwh >= 0);
++ a->src_wh_dentry = au_wh_create(a->src_dentry, a->btgt,
++ a->src_h_parent);
++ err = PTR_ERR(a->src_wh_dentry);
++ if (IS_ERR(a->src_wh_dentry))
++ goto out_thargs;
++ }
+
-+ if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
-+ ia->ia_valid &= ~ATTR_MODE;
++ /* lookup whiteout for dentry */
++ if (au_ftest_ren(a->auren_flags, WHDST)) {
++ h_d = au_wh_lkup(a->dst_h_parent,
++ &a->dst_dentry->d_name, a->br);
++ err = PTR_ERR(h_d);
++ if (IS_ERR(h_d))
++ goto out_whsrc;
++ if (d_is_negative(h_d))
++ dput(h_d);
++ else
++ a->dst_wh_dentry = h_d;
++ }
+
-+ file = NULL;
-+ sb = dentry->d_sb;
-+ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
-+ if (unlikely(err))
-+ goto out_kfree;
++ /* rename dentry to tmpwh */
++ if (a->thargs) {
++ err = au_whtmp_ren(a->dst_h_dentry, a->br);
++ if (unlikely(err))
++ goto out_whdst;
+
-+ if (ia->ia_valid & ATTR_FILE) {
-+ /* currently ftruncate(2) only */
-+ AuDebugOn(!d_is_reg(dentry));
-+ file = ia->ia_file;
-+ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1,
-+ /*fi_lsc*/0);
-+ if (unlikely(err))
-+ goto out_si;
-+ ia->ia_file = au_hf_top(file);
-+ a->udba = AuOpt_UDBA_NONE;
-+ } else {
-+ /* fchmod() doesn't pass ia_file */
-+ a->udba = au_opt_udba(sb);
-+ di_write_lock_child(dentry);
-+ /* no d_unlinked(), to set UDBA_NONE for root */
-+ if (d_unhashed(dentry))
-+ a->udba = AuOpt_UDBA_NONE;
-+ if (a->udba != AuOpt_UDBA_NONE) {
-+ AuDebugOn(IS_ROOT(dentry));
-+ err = au_reval_for_attr(dentry, au_sigen(sb));
++ d = a->dst_dentry;
++ au_set_h_dptr(d, a->btgt, NULL);
++ err = au_lkup_neg(d, a->btgt, /*wh*/0);
+ if (unlikely(err))
-+ goto out_dentry;
++ goto out_whtmp;
++ a->dst_h_dentry = au_h_dptr(d, a->btgt);
+ }
+ }
+
-+ err = au_pin_and_icpup(dentry, ia, a);
-+ if (unlikely(err < 0))
-+ goto out_dentry;
-+ if (au_ftest_icpup(a->flags, DID_CPUP)) {
-+ ia->ia_file = NULL;
-+ ia->ia_valid &= ~ATTR_FILE;
-+ }
++ BUG_ON(d_is_positive(a->dst_h_dentry) && a->src_btop != a->btgt);
++#if 0
++ BUG_ON(!au_ftest_ren(a->auren_flags, DIRREN)
++ && d_is_positive(a->dst_h_dentry)
++ && a->src_btop != a->btgt);
++#endif
+
-+ a->h_path.mnt = au_sbr_mnt(sb, a->btgt);
-+ if ((ia->ia_valid & (ATTR_MODE | ATTR_CTIME))
-+ == (ATTR_MODE | ATTR_CTIME)) {
-+ err = security_path_chmod(&a->h_path, ia->ia_mode);
-+ if (unlikely(err))
-+ goto out_unlock;
-+ } else if ((ia->ia_valid & (ATTR_UID | ATTR_GID))
-+ && (ia->ia_valid & ATTR_CTIME)) {
-+ err = security_path_chown(&a->h_path, ia->ia_uid, ia->ia_gid);
-+ if (unlikely(err))
-+ goto out_unlock;
-+ }
++ /* rename by vfs_rename or cpup */
++ err = au_ren_or_cpup(a);
++ if (unlikely(err))
++ /* leave the copied-up one */
++ goto out_whtmp;
+
-+ if (ia->ia_valid & ATTR_SIZE) {
-+ struct file *f;
++ /* make dir opaque */
++ err = au_ren_diropq(a);
++ if (unlikely(err))
++ goto out_rename;
+
-+ if (ia->ia_size < i_size_read(inode))
-+ /* unmap only */
-+ truncate_setsize(inode, ia->ia_size);
++ /* update target timestamps */
++ if (a->exchange) {
++ AuDebugOn(au_dbtop(a->dst_dentry) != a->btgt);
++ a->h_path.dentry = au_h_dptr(a->dst_dentry, a->btgt);
++ vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/
++ a->dst_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime;
++ }
++ AuDebugOn(au_dbtop(a->src_dentry) != a->btgt);
++ a->h_path.dentry = au_h_dptr(a->src_dentry, a->btgt);
++ vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/
++ a->src_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime;
+
-+ f = NULL;
-+ if (ia->ia_valid & ATTR_FILE)
-+ f = ia->ia_file;
-+ inode_unlock(a->h_inode);
-+ err = vfsub_trunc(&a->h_path, ia->ia_size, ia->ia_valid, f);
-+ inode_lock_nested(a->h_inode, AuLsc_I_CHILD);
-+ } else {
-+ delegated = NULL;
-+ while (1) {
-+ err = vfsub_notify_change(&a->h_path, ia, &delegated);
-+ if (delegated) {
-+ err = break_deleg_wait(&delegated);
-+ if (!err)
-+ continue;
-+ }
-+ break;
++ if (!a->exchange) {
++ /* remove whiteout for dentry */
++ if (a->dst_wh_dentry) {
++ a->h_path.dentry = a->dst_wh_dentry;
++ err = au_wh_unlink_dentry(a->dst_h_dir, &a->h_path,
++ a->dst_dentry);
++ if (unlikely(err))
++ goto out_diropq;
+ }
++
++ /* remove whtmp */
++ if (a->thargs)
++ au_ren_del_whtmp(a); /* ignore this error */
++
++ au_fhsm_wrote(a->src_dentry->d_sb, a->btgt, /*force*/0);
+ }
-+ /*
-+ * regardless aufs 'acl' option setting.
-+ * why don't all acl-aware fs call this func from their ->setattr()?
-+ */
-+ if (!err && (ia->ia_valid & ATTR_MODE))
-+ err = vfsub_acl_chmod(a->h_inode, ia->ia_mode);
-+ if (!err)
-+ au_cpup_attr_changeable(inode);
++ err = 0;
++ goto out_success;
+
-+out_unlock:
-+ inode_unlock(a->h_inode);
-+ au_unpin(&a->pin);
-+ if (unlikely(err))
-+ au_update_dbtop(dentry);
-+out_dentry:
-+ di_write_unlock(dentry);
-+ if (file) {
-+ fi_write_unlock(file);
-+ ia->ia_file = file;
-+ ia->ia_valid |= ATTR_FILE;
++out_diropq:
++ au_ren_rev_diropq(err, a);
++out_rename:
++ au_ren_rev_rename(err, a);
++ dput(a->h_dst);
++out_whtmp:
++ if (a->thargs)
++ au_ren_rev_whtmp(err, a);
++out_whdst:
++ dput(a->dst_wh_dentry);
++ a->dst_wh_dentry = NULL;
++out_whsrc:
++ if (a->src_wh_dentry)
++ au_ren_rev_whsrc(err, a);
++out_success:
++ dput(a->src_wh_dentry);
++ dput(a->dst_wh_dentry);
++out_thargs:
++ if (a->thargs) {
++ dput(a->h_dst);
++ au_whtmp_rmdir_free(a->thargs);
++ a->thargs = NULL;
+ }
-+out_si:
-+ si_read_unlock(sb);
-+out_kfree:
-+ kfree(a);
+out:
-+ AuTraceErr(err);
+ return err;
+}
+
-+#if IS_ENABLED(CONFIG_AUFS_XATTR) || IS_ENABLED(CONFIG_FS_POSIX_ACL)
-+static int au_h_path_to_set_attr(struct dentry *dentry,
-+ struct au_icpup_args *a, struct path *h_path)
-+{
-+ int err;
-+ struct super_block *sb;
-+
-+ sb = dentry->d_sb;
-+ a->udba = au_opt_udba(sb);
-+ /* no d_unlinked(), to set UDBA_NONE for root */
-+ if (d_unhashed(dentry))
-+ a->udba = AuOpt_UDBA_NONE;
-+ if (a->udba != AuOpt_UDBA_NONE) {
-+ AuDebugOn(IS_ROOT(dentry));
-+ err = au_reval_for_attr(dentry, au_sigen(sb));
-+ if (unlikely(err))
-+ goto out;
-+ }
-+ err = au_pin_and_icpup(dentry, /*ia*/NULL, a);
-+ if (unlikely(err < 0))
-+ goto out;
-+
-+ h_path->dentry = a->h_path.dentry;
-+ h_path->mnt = au_sbr_mnt(sb, a->btgt);
++/* ---------------------------------------------------------------------- */
+
-+out:
-+ return err;
++/*
++ * test if @dentry dir can be rename destination or not.
++ * success means, it is a logically empty dir.
++ */
++static int may_rename_dstdir(struct dentry *dentry, struct au_nhash *whlist)
++{
++ return au_test_empty(dentry, whlist);
+}
+
-+ssize_t au_sxattr(struct dentry *dentry, struct inode *inode,
-+ struct au_sxattr *arg)
++/*
++ * test if @a->src_dentry dir can be rename source or not.
++ * if it can, return 0.
++ * success means,
++ * - it is a logically empty dir.
++ * - or, it exists on writable branch and has no children including whiteouts
++ * on the lower branch unless DIRREN is on.
++ */
++static int may_rename_srcdir(struct au_ren_args *a)
+{
+ int err;
-+ struct path h_path;
++ unsigned int rdhash;
++ aufs_bindex_t btop, btgt;
++ struct dentry *dentry;
+ struct super_block *sb;
-+ struct au_icpup_args *a;
-+ struct inode *h_inode;
-+
-+ IMustLock(inode);
-+
-+ err = -ENOMEM;
-+ a = kzalloc(sizeof(*a), GFP_NOFS);
-+ if (unlikely(!a))
-+ goto out;
++ struct au_sbinfo *sbinfo;
+
++ dentry = a->src_dentry;
+ sb = dentry->d_sb;
-+ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
-+ if (unlikely(err))
-+ goto out_kfree;
++ sbinfo = au_sbi(sb);
++ if (au_opt_test(sbinfo->si_mntflags, DIRREN))
++ au_fset_ren(a->auren_flags, DIRREN);
+
-+ h_path.dentry = NULL; /* silence gcc */
-+ di_write_lock_child(dentry);
-+ err = au_h_path_to_set_attr(dentry, a, &h_path);
-+ if (unlikely(err))
-+ goto out_di;
++ btgt = a->btgt;
++ btop = au_dbtop(dentry);
++ if (btop != btgt) {
++ struct au_nhash whlist;
+
-+ inode_unlock(a->h_inode);
-+ switch (arg->type) {
-+ case AU_XATTR_SET:
-+ AuDebugOn(d_is_negative(h_path.dentry));
-+ err = vfsub_setxattr(h_path.dentry,
-+ arg->u.set.name, arg->u.set.value,
-+ arg->u.set.size, arg->u.set.flags);
-+ break;
-+ case AU_ACL_SET:
-+ err = -EOPNOTSUPP;
-+ h_inode = d_inode(h_path.dentry);
-+ if (h_inode->i_op->set_acl)
-+ /* this will call posix_acl_update_mode */
-+ err = h_inode->i_op->set_acl(h_inode,
-+ arg->u.acl_set.acl,
-+ arg->u.acl_set.type);
-+ break;
++ SiMustAnyLock(sb);
++ rdhash = sbinfo->si_rdhash;
++ if (!rdhash)
++ rdhash = au_rdhash_est(au_dir_size(/*file*/NULL,
++ dentry));
++ err = au_nhash_alloc(&whlist, rdhash, GFP_NOFS);
++ if (unlikely(err))
++ goto out;
++ err = au_test_empty(dentry, &whlist);
++ au_nhash_wh_free(&whlist);
++ goto out;
+ }
-+ if (!err)
-+ au_cpup_attr_timesizes(inode);
-+
-+ au_unpin(&a->pin);
-+ if (unlikely(err))
-+ au_update_dbtop(dentry);
+
-+out_di:
-+ di_write_unlock(dentry);
-+ si_read_unlock(sb);
-+out_kfree:
-+ kfree(a);
-+out:
-+ AuTraceErr(err);
-+ return err;
-+}
-+#endif
-+
-+static void au_refresh_iattr(struct inode *inode, struct kstat *st,
-+ unsigned int nlink)
-+{
-+ unsigned int n;
++ if (btop == au_dbtaildir(dentry))
++ return 0; /* success */
+
-+ inode->i_mode = st->mode;
-+ /* don't i_[ug]id_write() here */
-+ inode->i_uid = st->uid;
-+ inode->i_gid = st->gid;
-+ inode->i_atime = st->atime;
-+ inode->i_mtime = st->mtime;
-+ inode->i_ctime = st->ctime;
++ err = au_test_empty_lower(dentry);
+
-+ au_cpup_attr_nlink(inode, /*force*/0);
-+ if (S_ISDIR(inode->i_mode)) {
-+ n = inode->i_nlink;
-+ n -= nlink;
-+ n += st->nlink;
-+ smp_mb(); /* for i_nlink */
-+ /* 0 can happen */
-+ set_nlink(inode, n);
++out:
++ if (err == -ENOTEMPTY) {
++ if (au_ftest_ren(a->auren_flags, DIRREN)) {
++ err = 0;
++ } else {
++ AuWarn1("renaming dir who has child(ren) on multiple "
++ "branches, is not supported\n");
++ err = -EXDEV;
++ }
+ }
-+
-+ spin_lock(&inode->i_lock);
-+ inode->i_blocks = st->blocks;
-+ i_size_write(inode, st->size);
-+ spin_unlock(&inode->i_lock);
++ return err;
+}
+
-+/*
-+ * common routine for aufs_getattr() and au_getxattr().
-+ * returns zero or negative (an error).
-+ * @dentry will be read-locked in success.
-+ */
-+int au_h_path_getattr(struct dentry *dentry, int force, struct path *h_path,
-+ int locked)
++/* side effect: sets whlist and h_dentry */
++static int au_ren_may_dir(struct au_ren_args *a)
+{
+ int err;
-+ unsigned int mnt_flags, sigen;
-+ unsigned char udba_none;
-+ aufs_bindex_t bindex;
-+ struct super_block *sb, *h_sb;
-+ struct inode *inode;
++ unsigned int rdhash;
++ struct dentry *d;
+
-+ h_path->mnt = NULL;
-+ h_path->dentry = NULL;
++ d = a->dst_dentry;
++ SiMustAnyLock(d->d_sb);
+
+ err = 0;
-+ sb = dentry->d_sb;
-+ mnt_flags = au_mntflags(sb);
-+ udba_none = !!au_opt_test(mnt_flags, UDBA_NONE);
++ if (au_ftest_ren(a->auren_flags, ISDIR_DST) && a->dst_inode) {
++ rdhash = au_sbi(d->d_sb)->si_rdhash;
++ if (!rdhash)
++ rdhash = au_rdhash_est(au_dir_size(/*file*/NULL, d));
++ err = au_nhash_alloc(&a->whlist, rdhash, GFP_NOFS);
++ if (unlikely(err))
++ goto out;
+
-+ if (unlikely(locked))
-+ goto body; /* skip locking dinfo */
++ if (!a->exchange) {
++ au_set_dbtop(d, a->dst_btop);
++ err = may_rename_dstdir(d, &a->whlist);
++ au_set_dbtop(d, a->btgt);
++ } else
++ err = may_rename_srcdir(a);
++ }
++ a->dst_h_dentry = au_h_dptr(d, au_dbtop(d));
++ if (unlikely(err))
++ goto out;
+
-+ /* support fstat(2) */
-+ if (!d_unlinked(dentry) && !udba_none) {
-+ sigen = au_sigen(sb);
-+ err = au_digen_test(dentry, sigen);
-+ if (!err) {
-+ di_read_lock_child(dentry, AuLock_IR);
-+ err = au_dbrange_test(dentry);
-+ if (unlikely(err)) {
-+ di_read_unlock(dentry, AuLock_IR);
-+ goto out;
-+ }
-+ } else {
-+ AuDebugOn(IS_ROOT(dentry));
-+ di_write_lock_child(dentry);
-+ err = au_dbrange_test(dentry);
-+ if (!err)
-+ err = au_reval_for_attr(dentry, sigen);
-+ if (!err)
-+ di_downgrade_lock(dentry, AuLock_IR);
-+ else {
-+ di_write_unlock(dentry);
-+ goto out;
-+ }
++ d = a->src_dentry;
++ a->src_h_dentry = au_h_dptr(d, au_dbtop(d));
++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)) {
++ err = may_rename_srcdir(a);
++ if (unlikely(err)) {
++ au_nhash_wh_free(&a->whlist);
++ a->whlist.nh_num = 0;
+ }
-+ } else
-+ di_read_lock_child(dentry, AuLock_IR);
-+
-+body:
-+ inode = d_inode(dentry);
-+ bindex = au_ibtop(inode);
-+ h_path->mnt = au_sbr_mnt(sb, bindex);
-+ h_sb = h_path->mnt->mnt_sb;
-+ if (!force
-+ && !au_test_fs_bad_iattr(h_sb)
-+ && udba_none)
-+ goto out; /* success */
-+
-+ if (au_dbtop(dentry) == bindex)
-+ h_path->dentry = au_h_dptr(dentry, bindex);
-+ else if (au_opt_test(mnt_flags, PLINK) && au_plink_test(inode)) {
-+ h_path->dentry = au_plink_lkup(inode, bindex);
-+ if (IS_ERR(h_path->dentry))
-+ /* pretending success */
-+ h_path->dentry = NULL;
-+ else
-+ dput(h_path->dentry);
+ }
-+
+out:
+ return err;
+}
+
-+static int aufs_getattr(const struct path *path, struct kstat *st,
-+ u32 request, unsigned int query)
++/* ---------------------------------------------------------------------- */
++
++/*
++ * simple tests for rename.
++ * following the checks in vfs, plus the parent-child relationship.
++ */
++static int au_may_ren(struct au_ren_args *a)
+{
-+ int err;
-+ unsigned char positive;
-+ struct path h_path;
-+ struct dentry *dentry;
-+ struct inode *inode;
-+ struct super_block *sb;
++ int err, isdir;
++ struct inode *h_inode;
+
-+ dentry = path->dentry;
-+ inode = d_inode(dentry);
-+ sb = dentry->d_sb;
-+ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
-+ if (unlikely(err))
++ if (a->src_btop == a->btgt) {
++ err = au_may_del(a->src_dentry, a->btgt, a->src_h_parent,
++ au_ftest_ren(a->auren_flags, ISDIR_SRC));
++ if (unlikely(err))
++ goto out;
++ err = -EINVAL;
++ if (unlikely(a->src_h_dentry == a->h_trap))
++ goto out;
++ }
++
++ err = 0;
++ if (a->dst_btop != a->btgt)
+ goto out;
-+ err = au_h_path_getattr(dentry, /*force*/0, &h_path, /*locked*/0);
-+ if (unlikely(err))
-+ goto out_si;
-+ if (unlikely(!h_path.dentry))
-+ /* illegally overlapped or something */
-+ goto out_fill; /* pretending success */
+
-+ positive = d_is_positive(h_path.dentry);
-+ if (positive)
-+ /* no vfsub version */
-+ err = vfs_getattr(&h_path, st, request, query);
-+ if (!err) {
-+ if (positive)
-+ au_refresh_iattr(inode, st,
-+ d_inode(h_path.dentry)->i_nlink);
-+ goto out_fill; /* success */
++ err = -ENOTEMPTY;
++ if (unlikely(a->dst_h_dentry == a->h_trap))
++ goto out;
++
++ err = -EIO;
++ isdir = !!au_ftest_ren(a->auren_flags, ISDIR_DST);
++ if (d_really_is_negative(a->dst_dentry)) {
++ if (d_is_negative(a->dst_h_dentry))
++ err = au_may_add(a->dst_dentry, a->btgt,
++ a->dst_h_parent, isdir);
++ } else {
++ if (unlikely(d_is_negative(a->dst_h_dentry)))
++ goto out;
++ h_inode = d_inode(a->dst_h_dentry);
++ if (h_inode->i_nlink)
++ err = au_may_del(a->dst_dentry, a->btgt,
++ a->dst_h_parent, isdir);
+ }
-+ AuTraceErr(err);
-+ goto out_di;
+
-+out_fill:
-+ generic_fillattr(inode, st);
-+out_di:
-+ di_read_unlock(dentry, AuLock_IR);
-+out_si:
-+ si_read_unlock(sb);
+out:
++ if (unlikely(err == -ENOENT || err == -EEXIST))
++ err = -EIO;
+ AuTraceErr(err);
+ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
-+static const char *aufs_get_link(struct dentry *dentry, struct inode *inode,
-+ struct delayed_call *done)
++/*
++ * locking order
++ * (VFS)
++ * - src_dir and dir by lock_rename()
++ * - inode if exitsts
++ * (aufs)
++ * - lock all
++ * + src_dentry and dentry by aufs_read_and_write_lock2() which calls,
++ * + si_read_lock
++ * + di_write_lock2_child()
++ * + di_write_lock_child()
++ * + ii_write_lock_child()
++ * + di_write_lock_child2()
++ * + ii_write_lock_child2()
++ * + src_parent and parent
++ * + di_write_lock_parent()
++ * + ii_write_lock_parent()
++ * + di_write_lock_parent2()
++ * + ii_write_lock_parent2()
++ * + lower src_dir and dir by vfsub_lock_rename()
++ * + verify the every relationships between child and parent. if any
++ * of them failed, unlock all and return -EBUSY.
++ */
++static void au_ren_unlock(struct au_ren_args *a)
++{
++ vfsub_unlock_rename(a->src_h_parent, a->src_hdir,
++ a->dst_h_parent, a->dst_hdir);
++ if (au_ftest_ren(a->auren_flags, DIRREN)
++ && a->h_root)
++ au_hn_inode_unlock(a->h_root);
++ if (au_ftest_ren(a->auren_flags, MNT_WRITE))
++ vfsub_mnt_drop_write(au_br_mnt(a->br));
++}
++
++static int au_ren_lock(struct au_ren_args *a)
+{
-+ const char *ret;
-+ struct dentry *h_dentry;
-+ struct inode *h_inode;
+ int err;
-+ aufs_bindex_t bindex;
++ unsigned int udba;
+
-+ ret = NULL; /* suppress a warning */
-+ err = -ECHILD;
-+ if (!dentry)
-+ goto out;
++ err = 0;
++ a->src_h_parent = au_h_dptr(a->src_parent, a->btgt);
++ a->src_hdir = au_hi(a->src_dir, a->btgt);
++ a->dst_h_parent = au_h_dptr(a->dst_parent, a->btgt);
++ a->dst_hdir = au_hi(a->dst_dir, a->btgt);
+
-+ err = aufs_read_lock(dentry, AuLock_IR | AuLock_GEN);
++ err = vfsub_mnt_want_write(au_br_mnt(a->br));
+ if (unlikely(err))
+ goto out;
++ au_fset_ren(a->auren_flags, MNT_WRITE);
++ if (au_ftest_ren(a->auren_flags, DIRREN)) {
++ struct dentry *root;
++ struct inode *dir;
+
-+ err = au_d_hashed_positive(dentry);
-+ if (unlikely(err))
-+ goto out_unlock;
-+
-+ err = -EINVAL;
-+ inode = d_inode(dentry);
-+ bindex = au_ibtop(inode);
-+ h_inode = au_h_iptr(inode, bindex);
-+ if (unlikely(!h_inode->i_op->get_link))
-+ goto out_unlock;
-+
-+ err = -EBUSY;
-+ h_dentry = NULL;
-+ if (au_dbtop(dentry) <= bindex) {
-+ h_dentry = au_h_dptr(dentry, bindex);
-+ if (h_dentry)
-+ dget(h_dentry);
-+ }
-+ if (!h_dentry) {
-+ h_dentry = d_find_any_alias(h_inode);
-+ if (IS_ERR(h_dentry)) {
-+ err = PTR_ERR(h_dentry);
-+ goto out_unlock;
++ /*
++ * sbinfo is already locked, so this ii_read_lock is
++ * unnecessary. but our debugging feature checks it.
++ */
++ root = a->src_inode->i_sb->s_root;
++ if (root != a->src_parent && root != a->dst_parent) {
++ dir = d_inode(root);
++ ii_read_lock_parent3(dir);
++ a->h_root = au_hi(dir, a->btgt);
++ ii_read_unlock(dir);
++ au_hn_inode_lock_nested(a->h_root, AuLsc_I_PARENT3);
+ }
+ }
-+ if (unlikely(!h_dentry))
-+ goto out_unlock;
++ a->h_trap = vfsub_lock_rename(a->src_h_parent, a->src_hdir,
++ a->dst_h_parent, a->dst_hdir);
++ udba = au_opt_udba(a->src_dentry->d_sb);
++ if (unlikely(a->src_hdir->hi_inode != d_inode(a->src_h_parent)
++ || a->dst_hdir->hi_inode != d_inode(a->dst_h_parent)))
++ err = au_busy_or_stale();
++ if (!err && au_dbtop(a->src_dentry) == a->btgt)
++ err = au_h_verify(a->src_h_dentry, udba,
++ d_inode(a->src_h_parent), a->src_h_parent,
++ a->br);
++ if (!err && au_dbtop(a->dst_dentry) == a->btgt)
++ err = au_h_verify(a->dst_h_dentry, udba,
++ d_inode(a->dst_h_parent), a->dst_h_parent,
++ a->br);
++ if (!err)
++ goto out; /* success */
+
-+ err = 0;
-+ AuDbg("%pf\n", h_inode->i_op->get_link);
-+ AuDbgDentry(h_dentry);
-+ ret = vfs_get_link(h_dentry, done);
-+ dput(h_dentry);
-+ if (IS_ERR(ret))
-+ err = PTR_ERR(ret);
++ err = au_busy_or_stale();
++ au_ren_unlock(a);
+
-+out_unlock:
-+ aufs_read_unlock(dentry, AuLock_IR);
+out:
-+ if (unlikely(err))
-+ ret = ERR_PTR(err);
-+ AuTraceErrPtr(ret);
-+ return ret;
++ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
-+static int au_is_special(struct inode *inode)
++static void au_ren_refresh_dir(struct au_ren_args *a)
+{
-+ return (inode->i_mode & (S_IFBLK | S_IFCHR | S_IFIFO | S_IFSOCK));
++ struct inode *dir;
++
++ dir = a->dst_dir;
++ dir->i_version++;
++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)) {
++ /* is this updating defined in POSIX? */
++ au_cpup_attr_timesizes(a->src_inode);
++ au_cpup_attr_nlink(dir, /*force*/1);
++ }
++ au_dir_ts(dir, a->btgt);
++
++ if (a->exchange) {
++ dir = a->src_dir;
++ dir->i_version++;
++ if (au_ftest_ren(a->auren_flags, ISDIR_DST)) {
++ /* is this updating defined in POSIX? */
++ au_cpup_attr_timesizes(a->dst_inode);
++ au_cpup_attr_nlink(dir, /*force*/1);
++ }
++ au_dir_ts(dir, a->btgt);
++ }
++
++ if (au_ftest_ren(a->auren_flags, ISSAMEDIR))
++ return;
++
++ dir = a->src_dir;
++ dir->i_version++;
++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC))
++ au_cpup_attr_nlink(dir, /*force*/1);
++ au_dir_ts(dir, a->btgt);
+}
+
-+static int aufs_update_time(struct inode *inode, struct timespec *ts, int flags)
++static void au_ren_refresh(struct au_ren_args *a)
+{
-+ int err;
-+ aufs_bindex_t bindex;
++ aufs_bindex_t bbot, bindex;
++ struct dentry *d, *h_d;
++ struct inode *i, *h_i;
+ struct super_block *sb;
-+ struct inode *h_inode;
-+ struct vfsmount *h_mnt;
+
-+ sb = inode->i_sb;
-+ WARN_ONCE((flags & S_ATIME) && !IS_NOATIME(inode),
-+ "unexpected s_flags 0x%lx", sb->s_flags);
++ d = a->dst_dentry;
++ d_drop(d);
++ if (a->h_dst)
++ /* already dget-ed by au_ren_or_cpup() */
++ au_set_h_dptr(d, a->btgt, a->h_dst);
+
-+ /* mmap_sem might be acquired already, cf. aufs_mmap() */
-+ lockdep_off();
-+ si_read_lock(sb, AuLock_FLUSH);
-+ ii_write_lock_child(inode);
++ i = a->dst_inode;
++ if (i) {
++ if (!a->exchange) {
++ if (!au_ftest_ren(a->auren_flags, ISDIR_DST))
++ vfsub_drop_nlink(i);
++ else {
++ vfsub_dead_dir(i);
++ au_cpup_attr_timesizes(i);
++ }
++ au_update_dbrange(d, /*do_put_zero*/1);
++ } else
++ au_cpup_attr_nlink(i, /*force*/1);
++ } else {
++ bbot = a->btgt;
++ for (bindex = au_dbtop(d); bindex < bbot; bindex++)
++ au_set_h_dptr(d, bindex, NULL);
++ bbot = au_dbbot(d);
++ for (bindex = a->btgt + 1; bindex <= bbot; bindex++)
++ au_set_h_dptr(d, bindex, NULL);
++ au_update_dbrange(d, /*do_put_zero*/0);
++ }
+
-+ err = 0;
-+ bindex = au_ibtop(inode);
-+ h_inode = au_h_iptr(inode, bindex);
-+ if (!au_test_ro(sb, bindex, inode)) {
-+ h_mnt = au_sbr_mnt(sb, bindex);
-+ err = vfsub_mnt_want_write(h_mnt);
-+ if (!err) {
-+ err = vfsub_update_time(h_inode, ts, flags);
-+ vfsub_mnt_drop_write(h_mnt);
-+ }
-+ } else if (au_is_special(h_inode)) {
-+ /*
-+ * Never copy-up here.
-+ * These special files may already be opened and used for
-+ * communicating. If we copied it up, then the communication
-+ * would be corrupted.
-+ */
-+ AuWarn1("timestamps for i%lu are ignored "
-+ "since it is on readonly branch (hi%lu).\n",
-+ inode->i_ino, h_inode->i_ino);
-+ } else if (flags & ~S_ATIME) {
-+ err = -EIO;
-+ AuIOErr1("unexpected flags 0x%x\n", flags);
-+ AuDebugOn(1);
++ if (a->exchange
++ || au_ftest_ren(a->auren_flags, DIRREN)) {
++ d_drop(a->src_dentry);
++ if (au_ftest_ren(a->auren_flags, DIRREN))
++ au_set_dbwh(a->src_dentry, -1);
++ return;
+ }
+
-+ if (!err)
-+ au_cpup_attr_timesizes(inode);
-+ ii_write_unlock(inode);
-+ si_read_unlock(sb);
-+ lockdep_on();
++ d = a->src_dentry;
++ au_set_dbwh(d, -1);
++ bbot = au_dbbot(d);
++ for (bindex = a->btgt + 1; bindex <= bbot; bindex++) {
++ h_d = au_h_dptr(d, bindex);
++ if (h_d)
++ au_set_h_dptr(d, bindex, NULL);
++ }
++ au_set_dbbot(d, a->btgt);
+
-+ if (!err && (flags & S_VERSION))
-+ inode_inc_iversion(inode);
++ sb = d->d_sb;
++ i = a->src_inode;
++ if (au_opt_test(au_mntflags(sb), PLINK) && au_plink_test(i))
++ return; /* success */
+
-+ return err;
++ bbot = au_ibbot(i);
++ for (bindex = a->btgt + 1; bindex <= bbot; bindex++) {
++ h_i = au_h_iptr(i, bindex);
++ if (h_i) {
++ au_xino_write(sb, bindex, h_i->i_ino, /*ino*/0);
++ /* ignore this error */
++ au_set_h_iptr(i, bindex, NULL, 0);
++ }
++ }
++ au_set_ibbot(i, a->btgt);
+}
+
+/* ---------------------------------------------------------------------- */
+
-+/* no getattr version will be set by module.c:aufs_init() */
-+struct inode_operations aufs_iop_nogetattr[AuIop_Last],
-+ aufs_iop[] = {
-+ [AuIop_SYMLINK] = {
-+ .permission = aufs_permission,
-+#ifdef CONFIG_FS_POSIX_ACL
-+ .get_acl = aufs_get_acl,
-+ .set_acl = aufs_set_acl, /* unsupport for symlink? */
-+#endif
-+
-+ .setattr = aufs_setattr,
-+ .getattr = aufs_getattr,
-+
-+#ifdef CONFIG_AUFS_XATTR
-+ .listxattr = aufs_listxattr,
-+#endif
-+
-+ .get_link = aufs_get_link,
-+
-+ /* .update_time = aufs_update_time */
-+ },
-+ [AuIop_DIR] = {
-+ .create = aufs_create,
-+ .lookup = aufs_lookup,
-+ .link = aufs_link,
-+ .unlink = aufs_unlink,
-+ .symlink = aufs_symlink,
-+ .mkdir = aufs_mkdir,
-+ .rmdir = aufs_rmdir,
-+ .mknod = aufs_mknod,
-+ .rename = aufs_rename,
++/* mainly for link(2) and rename(2) */
++int au_wbr(struct dentry *dentry, aufs_bindex_t btgt)
++{
++ aufs_bindex_t bdiropq, bwh;
++ struct dentry *parent;
++ struct au_branch *br;
+
-+ .permission = aufs_permission,
-+#ifdef CONFIG_FS_POSIX_ACL
-+ .get_acl = aufs_get_acl,
-+ .set_acl = aufs_set_acl,
-+#endif
++ parent = dentry->d_parent;
++ IMustLock(d_inode(parent)); /* dir is locked */
+
-+ .setattr = aufs_setattr,
-+ .getattr = aufs_getattr,
++ bdiropq = au_dbdiropq(parent);
++ bwh = au_dbwh(dentry);
++ br = au_sbr(dentry->d_sb, btgt);
++ if (au_br_rdonly(br)
++ || (0 <= bdiropq && bdiropq < btgt)
++ || (0 <= bwh && bwh < btgt))
++ btgt = -1;
+
-+#ifdef CONFIG_AUFS_XATTR
-+ .listxattr = aufs_listxattr,
-+#endif
++ AuDbg("btgt %d\n", btgt);
++ return btgt;
++}
+
-+ .update_time = aufs_update_time,
-+ .atomic_open = aufs_atomic_open,
-+ .tmpfile = aufs_tmpfile
-+ },
-+ [AuIop_OTHER] = {
-+ .permission = aufs_permission,
-+#ifdef CONFIG_FS_POSIX_ACL
-+ .get_acl = aufs_get_acl,
-+ .set_acl = aufs_set_acl,
-+#endif
++/* sets src_btop, dst_btop and btgt */
++static int au_ren_wbr(struct au_ren_args *a)
++{
++ int err;
++ struct au_wr_dir_args wr_dir_args = {
++ /* .force_btgt = -1, */
++ .flags = AuWrDir_ADD_ENTRY
++ };
+
-+ .setattr = aufs_setattr,
-+ .getattr = aufs_getattr,
++ a->src_btop = au_dbtop(a->src_dentry);
++ a->dst_btop = au_dbtop(a->dst_dentry);
++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)
++ || au_ftest_ren(a->auren_flags, ISDIR_DST))
++ au_fset_wrdir(wr_dir_args.flags, ISDIR);
++ wr_dir_args.force_btgt = a->src_btop;
++ if (a->dst_inode && a->dst_btop < a->src_btop)
++ wr_dir_args.force_btgt = a->dst_btop;
++ wr_dir_args.force_btgt = au_wbr(a->dst_dentry, wr_dir_args.force_btgt);
++ err = au_wr_dir(a->dst_dentry, a->src_dentry, &wr_dir_args);
++ a->btgt = err;
++ if (a->exchange)
++ au_update_dbtop(a->dst_dentry);
+
-+#ifdef CONFIG_AUFS_XATTR
-+ .listxattr = aufs_listxattr,
-+#endif
++ return err;
++}
+
-+ .update_time = aufs_update_time
++static void au_ren_dt(struct au_ren_args *a)
++{
++ a->h_path.dentry = a->src_h_parent;
++ au_dtime_store(a->src_dt + AuPARENT, a->src_parent, &a->h_path);
++ if (!au_ftest_ren(a->auren_flags, ISSAMEDIR)) {
++ a->h_path.dentry = a->dst_h_parent;
++ au_dtime_store(a->dst_dt + AuPARENT, a->dst_parent, &a->h_path);
+ }
-+};
-diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
---- /usr/share/empty/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_del.c 2017-11-12 22:24:42.270843503 +0100
-@@ -0,0 +1,511 @@
-+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
-+ *
-+ * This program, aufs 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/>.
-+ */
+
-+/*
-+ * inode operations (del entry)
-+ */
++ au_fclr_ren(a->auren_flags, DT_DSTDIR);
++ if (!au_ftest_ren(a->auren_flags, ISDIR_SRC)
++ && !a->exchange)
++ return;
+
-+#include "aufs.h"
++ a->h_path.dentry = a->src_h_dentry;
++ au_dtime_store(a->src_dt + AuCHILD, a->src_dentry, &a->h_path);
++ if (d_is_positive(a->dst_h_dentry)) {
++ au_fset_ren(a->auren_flags, DT_DSTDIR);
++ a->h_path.dentry = a->dst_h_dentry;
++ au_dtime_store(a->dst_dt + AuCHILD, a->dst_dentry, &a->h_path);
++ }
++}
+
-+/*
-+ * decide if a new whiteout for @dentry is necessary or not.
-+ * when it is necessary, prepare the parent dir for the upper branch whose
-+ * branch index is @bcpup for creation. the actual creation of the whiteout will
-+ * be done by caller.
-+ * return value:
-+ * 0: wh is unnecessary
-+ * plus: wh is necessary
-+ * minus: error
-+ */
-+int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup)
++static void au_ren_rev_dt(int err, struct au_ren_args *a)
+{
-+ int need_wh, err;
-+ aufs_bindex_t btop;
-+ struct super_block *sb;
++ struct dentry *h_d;
++ struct inode *h_inode;
+
-+ sb = dentry->d_sb;
-+ btop = au_dbtop(dentry);
-+ if (*bcpup < 0) {
-+ *bcpup = btop;
-+ if (au_test_ro(sb, btop, d_inode(dentry))) {
-+ err = AuWbrCopyup(au_sbi(sb), dentry);
-+ *bcpup = err;
-+ if (unlikely(err < 0))
-+ goto out;
-+ }
-+ } else
-+ AuDebugOn(btop < *bcpup
-+ || au_test_ro(sb, *bcpup, d_inode(dentry)));
-+ AuDbg("bcpup %d, btop %d\n", *bcpup, btop);
++ au_dtime_revert(a->src_dt + AuPARENT);
++ if (!au_ftest_ren(a->auren_flags, ISSAMEDIR))
++ au_dtime_revert(a->dst_dt + AuPARENT);
+
-+ if (*bcpup != btop) {
-+ err = au_cpup_dirs(dentry, *bcpup);
-+ if (unlikely(err))
-+ goto out;
-+ need_wh = 1;
-+ } else {
-+ struct au_dinfo *dinfo, *tmp;
++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC) && err != -EIO) {
++ h_d = a->src_dt[AuCHILD].dt_h_path.dentry;
++ h_inode = d_inode(h_d);
++ inode_lock_nested(h_inode, AuLsc_I_CHILD);
++ au_dtime_revert(a->src_dt + AuCHILD);
++ inode_unlock(h_inode);
+
-+ need_wh = -ENOMEM;
-+ dinfo = au_di(dentry);
-+ tmp = au_di_alloc(sb, AuLsc_DI_TMP);
-+ if (tmp) {
-+ au_di_cp(tmp, dinfo);
-+ au_di_swap(tmp, dinfo);
-+ /* returns the number of positive dentries */
-+ need_wh = au_lkup_dentry(dentry, btop + 1,
-+ /* AuLkup_IGNORE_PERM */ 0);
-+ au_di_swap(tmp, dinfo);
-+ au_rw_write_unlock(&tmp->di_rwsem);
-+ au_di_free(tmp);
++ if (au_ftest_ren(a->auren_flags, DT_DSTDIR)) {
++ h_d = a->dst_dt[AuCHILD].dt_h_path.dentry;
++ h_inode = d_inode(h_d);
++ inode_lock_nested(h_inode, AuLsc_I_CHILD);
++ au_dtime_revert(a->dst_dt + AuCHILD);
++ inode_unlock(h_inode);
+ }
+ }
-+ AuDbg("need_wh %d\n", need_wh);
-+ err = need_wh;
-+
-+out:
-+ return err;
+}
+
-+/*
-+ * simple tests for the del-entry operations.
-+ * following the checks in vfs, plus the parent-child relationship.
-+ */
-+int au_may_del(struct dentry *dentry, aufs_bindex_t bindex,
-+ struct dentry *h_parent, int isdir)
++/* ---------------------------------------------------------------------- */
++
++int aufs_rename(struct inode *_src_dir, struct dentry *_src_dentry,
++ struct inode *_dst_dir, struct dentry *_dst_dentry,
++ unsigned int _flags)
+{
-+ int err;
-+ umode_t h_mode;
-+ struct dentry *h_dentry, *h_latest;
-+ struct inode *h_inode;
++ int err, lock_flags;
++ void *rev;
++ /* reduce stack space */
++ struct au_ren_args *a;
++ struct au_pin pin;
+
-+ h_dentry = au_h_dptr(dentry, bindex);
-+ if (d_really_is_positive(dentry)) {
-+ err = -ENOENT;
-+ if (unlikely(d_is_negative(h_dentry)))
-+ goto out;
-+ h_inode = d_inode(h_dentry);
-+ if (unlikely(!h_inode->i_nlink))
-+ goto out;
++ AuDbg("%pd, %pd, 0x%x\n", _src_dentry, _dst_dentry, _flags);
++ IMustLock(_src_dir);
++ IMustLock(_dst_dir);
+
-+ h_mode = h_inode->i_mode;
-+ if (!isdir) {
-+ err = -EISDIR;
-+ if (unlikely(S_ISDIR(h_mode)))
-+ goto out;
-+ } else if (unlikely(!S_ISDIR(h_mode))) {
-+ err = -ENOTDIR;
-+ goto out;
-+ }
-+ } else {
-+ /* rename(2) case */
-+ err = -EIO;
-+ if (unlikely(d_is_positive(h_dentry)))
-+ goto out;
++ err = -EINVAL;
++ if (unlikely(_flags & RENAME_WHITEOUT))
++ goto out;
++
++ err = -ENOMEM;
++ BUILD_BUG_ON(sizeof(*a) > PAGE_SIZE);
++ a = kzalloc(sizeof(*a), GFP_NOFS);
++ if (unlikely(!a))
++ goto out;
++
++ a->flags = _flags;
++ a->exchange = _flags & RENAME_EXCHANGE;
++ a->src_dir = _src_dir;
++ a->src_dentry = _src_dentry;
++ a->src_inode = NULL;
++ if (d_really_is_positive(a->src_dentry))
++ a->src_inode = d_inode(a->src_dentry);
++ a->src_parent = a->src_dentry->d_parent; /* dir inode is locked */
++ a->dst_dir = _dst_dir;
++ a->dst_dentry = _dst_dentry;
++ a->dst_inode = NULL;
++ if (d_really_is_positive(a->dst_dentry))
++ a->dst_inode = d_inode(a->dst_dentry);
++ a->dst_parent = a->dst_dentry->d_parent; /* dir inode is locked */
++ if (a->dst_inode) {
++ /*
++ * if EXCHANGE && src is non-dir && dst is dir,
++ * dst is not locked.
++ */
++ /* IMustLock(a->dst_inode); */
++ au_igrab(a->dst_inode);
++ }
++
++ err = -ENOTDIR;
++ lock_flags = AuLock_FLUSH | AuLock_NOPLM | AuLock_GEN;
++ if (d_is_dir(a->src_dentry)) {
++ au_fset_ren(a->auren_flags, ISDIR_SRC);
++ if (unlikely(!a->exchange
++ && d_really_is_positive(a->dst_dentry)
++ && !d_is_dir(a->dst_dentry)))
++ goto out_free;
++ lock_flags |= AuLock_DIRS;
++ }
++ if (a->dst_inode && d_is_dir(a->dst_dentry)) {
++ au_fset_ren(a->auren_flags, ISDIR_DST);
++ if (unlikely(!a->exchange
++ && d_really_is_positive(a->src_dentry)
++ && !d_is_dir(a->src_dentry)))
++ goto out_free;
++ lock_flags |= AuLock_DIRS;
+ }
++ err = aufs_read_and_write_lock2(a->dst_dentry, a->src_dentry,
++ lock_flags);
++ if (unlikely(err))
++ goto out_free;
+
++ err = au_d_hashed_positive(a->src_dentry);
++ if (unlikely(err))
++ goto out_unlock;
+ err = -ENOENT;
-+ /* expected parent dir is locked */
-+ if (unlikely(h_parent != h_dentry->d_parent))
-+ goto out;
-+ err = 0;
++ if (a->dst_inode) {
++ /*
++ * If it is a dir, VFS unhash it before this
++ * function. It means we cannot rely upon d_unhashed().
++ */
++ if (unlikely(!a->dst_inode->i_nlink))
++ goto out_unlock;
++ if (!au_ftest_ren(a->auren_flags, ISDIR_DST)) {
++ err = au_d_hashed_positive(a->dst_dentry);
++ if (unlikely(err && !a->exchange))
++ goto out_unlock;
++ } else if (unlikely(IS_DEADDIR(a->dst_inode)))
++ goto out_unlock;
++ } else if (unlikely(d_unhashed(a->dst_dentry)))
++ goto out_unlock;
+
+ /*
-+ * rmdir a dir may break the consistency on some filesystem.
-+ * let's try heavy test.
++ * is it possible?
++ * yes, it happened (in linux-3.3-rcN) but I don't know why.
++ * there may exist a problem somewhere else.
+ */
-+ err = -EACCES;
-+ if (unlikely(!au_opt_test(au_mntflags(dentry->d_sb), DIRPERM1)
-+ && au_test_h_perm(d_inode(h_parent),
-+ MAY_EXEC | MAY_WRITE)))
-+ goto out;
++ err = -EINVAL;
++ if (unlikely(d_inode(a->dst_parent) == d_inode(a->src_dentry)))
++ goto out_unlock;
+
-+ h_latest = au_sio_lkup_one(&dentry->d_name, h_parent);
-+ err = -EIO;
-+ if (IS_ERR(h_latest))
-+ goto out;
-+ if (h_latest == h_dentry)
-+ err = 0;
-+ dput(h_latest);
++ au_fset_ren(a->auren_flags, ISSAMEDIR); /* temporary */
++ di_write_lock_parent(a->dst_parent);
+
-+out:
-+ return err;
-+}
++ /* which branch we process */
++ err = au_ren_wbr(a);
++ if (unlikely(err < 0))
++ goto out_parent;
++ a->br = au_sbr(a->dst_dentry->d_sb, a->btgt);
++ a->h_path.mnt = au_br_mnt(a->br);
+
-+/*
-+ * decide the branch where we operate for @dentry. the branch index will be set
-+ * @rbcpup. after diciding it, 'pin' it and store the timestamps of the parent
-+ * dir for reverting.
-+ * when a new whiteout is necessary, create it.
-+ */
-+static struct dentry*
-+lock_hdir_create_wh(struct dentry *dentry, int isdir, aufs_bindex_t *rbcpup,
-+ struct au_dtime *dt, struct au_pin *pin)
-+{
-+ struct dentry *wh_dentry;
-+ struct super_block *sb;
-+ struct path h_path;
-+ int err, need_wh;
-+ unsigned int udba;
-+ aufs_bindex_t bcpup;
++ /* are they available to be renamed */
++ err = au_ren_may_dir(a);
++ if (unlikely(err))
++ goto out_children;
+
-+ need_wh = au_wr_dir_need_wh(dentry, isdir, rbcpup);
-+ wh_dentry = ERR_PTR(need_wh);
-+ if (unlikely(need_wh < 0))
-+ goto out;
++ /* prepare the writable parent dir on the same branch */
++ if (a->dst_btop == a->btgt) {
++ au_fset_ren(a->auren_flags, WHDST);
++ } else {
++ err = au_cpup_dirs(a->dst_dentry, a->btgt);
++ if (unlikely(err))
++ goto out_children;
++ }
+
-+ sb = dentry->d_sb;
-+ udba = au_opt_udba(sb);
-+ bcpup = *rbcpup;
-+ err = au_pin(pin, dentry, bcpup, udba,
-+ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
-+ wh_dentry = ERR_PTR(err);
++ err = 0;
++ if (!a->exchange) {
++ if (a->src_dir != a->dst_dir) {
++ /*
++ * this temporary unlock is safe,
++ * because both dir->i_mutex are locked.
++ */
++ di_write_unlock(a->dst_parent);
++ di_write_lock_parent(a->src_parent);
++ err = au_wr_dir_need_wh(a->src_dentry,
++ au_ftest_ren(a->auren_flags,
++ ISDIR_SRC),
++ &a->btgt);
++ di_write_unlock(a->src_parent);
++ di_write_lock2_parent(a->src_parent, a->dst_parent,
++ /*isdir*/1);
++ au_fclr_ren(a->auren_flags, ISSAMEDIR);
++ } else
++ err = au_wr_dir_need_wh(a->src_dentry,
++ au_ftest_ren(a->auren_flags,
++ ISDIR_SRC),
++ &a->btgt);
++ }
++ if (unlikely(err < 0))
++ goto out_children;
++ if (err)
++ au_fset_ren(a->auren_flags, WHSRC);
++
++ /* cpup src */
++ if (a->src_btop != a->btgt) {
++ err = au_pin(&pin, a->src_dentry, a->btgt,
++ au_opt_udba(a->src_dentry->d_sb),
++ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
++ if (!err) {
++ struct au_cp_generic cpg = {
++ .dentry = a->src_dentry,
++ .bdst = a->btgt,
++ .bsrc = a->src_btop,
++ .len = -1,
++ .pin = &pin,
++ .flags = AuCpup_DTIME | AuCpup_HOPEN
++ };
++ AuDebugOn(au_dbtop(a->src_dentry) != a->src_btop);
++ err = au_sio_cpup_simple(&cpg);
++ au_unpin(&pin);
++ }
++ if (unlikely(err))
++ goto out_children;
++ a->src_btop = a->btgt;
++ a->src_h_dentry = au_h_dptr(a->src_dentry, a->btgt);
++ if (!a->exchange)
++ au_fset_ren(a->auren_flags, WHSRC);
++ }
++
++ /* cpup dst */
++ if (a->exchange && a->dst_inode
++ && a->dst_btop != a->btgt) {
++ err = au_pin(&pin, a->dst_dentry, a->btgt,
++ au_opt_udba(a->dst_dentry->d_sb),
++ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
++ if (!err) {
++ struct au_cp_generic cpg = {
++ .dentry = a->dst_dentry,
++ .bdst = a->btgt,
++ .bsrc = a->dst_btop,
++ .len = -1,
++ .pin = &pin,
++ .flags = AuCpup_DTIME | AuCpup_HOPEN
++ };
++ err = au_sio_cpup_simple(&cpg);
++ au_unpin(&pin);
++ }
++ if (unlikely(err))
++ goto out_children;
++ a->dst_btop = a->btgt;
++ a->dst_h_dentry = au_h_dptr(a->dst_dentry, a->btgt);
++ }
++
++ /* lock them all */
++ err = au_ren_lock(a);
+ if (unlikely(err))
-+ goto out;
++ /* leave the copied-up one */
++ goto out_children;
+
-+ h_path.dentry = au_pinned_h_parent(pin);
-+ if (udba != AuOpt_UDBA_NONE
-+ && au_dbtop(dentry) == bcpup) {
-+ err = au_may_del(dentry, bcpup, h_path.dentry, isdir);
-+ wh_dentry = ERR_PTR(err);
++ if (!a->exchange) {
++ if (!au_opt_test(au_mntflags(a->dst_dir->i_sb), UDBA_NONE))
++ err = au_may_ren(a);
++ else if (unlikely(a->dst_dentry->d_name.len > AUFS_MAX_NAMELEN))
++ err = -ENAMETOOLONG;
+ if (unlikely(err))
-+ goto out_unpin;
++ goto out_hdir;
+ }
+
-+ h_path.mnt = au_sbr_mnt(sb, bcpup);
-+ au_dtime_store(dt, au_pinned_parent(pin), &h_path);
-+ wh_dentry = NULL;
-+ if (!need_wh)
-+ goto out; /* success, no need to create whiteout */
++ /* store timestamps to be revertible */
++ au_ren_dt(a);
+
-+ wh_dentry = au_wh_create(dentry, bcpup, h_path.dentry);
-+ if (IS_ERR(wh_dentry))
-+ goto out_unpin;
++ /* store dirren info */
++ if (au_ftest_ren(a->auren_flags, DIRREN)) {
++ err = au_dr_rename(a->src_dentry, a->btgt,
++ &a->dst_dentry->d_name, &rev);
++ AuTraceErr(err);
++ if (unlikely(err))
++ goto out_dt;
++ }
+
-+ /* returns with the parent is locked and wh_dentry is dget-ed */
-+ goto out; /* success */
++ /* here we go */
++ err = do_rename(a);
++ if (unlikely(err))
++ goto out_dirren;
+
-+out_unpin:
-+ au_unpin(pin);
-+out:
-+ return wh_dentry;
-+}
++ if (au_ftest_ren(a->auren_flags, DIRREN))
++ au_dr_rename_fin(a->src_dentry, a->btgt, rev);
+
-+/*
-+ * when removing a dir, rename it to a unique temporary whiteout-ed name first
-+ * in order to be revertible and save time for removing many child whiteouts
-+ * under the dir.
-+ * returns 1 when there are too many child whiteout and caller should remove
-+ * them asynchronously. returns 0 when the number of children is enough small to
-+ * remove now or the branch fs is a remote fs.
-+ * otherwise return an error.
-+ */
-+static int renwh_and_rmdir(struct dentry *dentry, aufs_bindex_t bindex,
-+ struct au_nhash *whlist, struct inode *dir)
-+{
-+ int rmdir_later, err, dirwh;
-+ struct dentry *h_dentry;
-+ struct super_block *sb;
-+ struct inode *inode;
++ /* update dir attributes */
++ au_ren_refresh_dir(a);
+
-+ sb = dentry->d_sb;
-+ SiMustAnyLock(sb);
-+ h_dentry = au_h_dptr(dentry, bindex);
-+ err = au_whtmp_ren(h_dentry, au_sbr(sb, bindex));
-+ if (unlikely(err))
-+ goto out;
++ /* dput/iput all lower dentries */
++ au_ren_refresh(a);
+
-+ /* stop monitoring */
-+ inode = d_inode(dentry);
-+ au_hn_free(au_hi(inode, bindex));
++ goto out_hdir; /* success */
+
-+ if (!au_test_fs_remote(h_dentry->d_sb)) {
-+ dirwh = au_sbi(sb)->si_dirwh;
-+ rmdir_later = (dirwh <= 1);
-+ if (!rmdir_later)
-+ rmdir_later = au_nhash_test_longer_wh(whlist, bindex,
-+ dirwh);
-+ if (rmdir_later)
-+ return rmdir_later;
++out_dirren:
++ if (au_ftest_ren(a->auren_flags, DIRREN))
++ au_dr_rename_rev(a->src_dentry, a->btgt, rev);
++out_dt:
++ au_ren_rev_dt(err, a);
++out_hdir:
++ au_ren_unlock(a);
++out_children:
++ au_nhash_wh_free(&a->whlist);
++ if (err && a->dst_inode && a->dst_btop != a->btgt) {
++ AuDbg("btop %d, btgt %d\n", a->dst_btop, a->btgt);
++ au_set_h_dptr(a->dst_dentry, a->btgt, NULL);
++ au_set_dbtop(a->dst_dentry, a->dst_btop);
+ }
-+
-+ err = au_whtmp_rmdir(dir, bindex, h_dentry, whlist);
-+ if (unlikely(err)) {
-+ AuIOErr("rmdir %pd, b%d failed, %d. ignored\n",
-+ h_dentry, bindex, err);
-+ err = 0;
++out_parent:
++ if (!err) {
++ if (d_unhashed(a->src_dentry))
++ au_fset_ren(a->auren_flags, DROPPED_SRC);
++ if (d_unhashed(a->dst_dentry))
++ au_fset_ren(a->auren_flags, DROPPED_DST);
++ if (!a->exchange)
++ d_move(a->src_dentry, a->dst_dentry);
++ else {
++ d_exchange(a->src_dentry, a->dst_dentry);
++ if (au_ftest_ren(a->auren_flags, DROPPED_DST))
++ d_drop(a->dst_dentry);
++ }
++ if (au_ftest_ren(a->auren_flags, DROPPED_SRC))
++ d_drop(a->src_dentry);
++ } else {
++ au_update_dbtop(a->dst_dentry);
++ if (!a->dst_inode)
++ d_drop(a->dst_dentry);
+ }
-+
++ if (au_ftest_ren(a->auren_flags, ISSAMEDIR))
++ di_write_unlock(a->dst_parent);
++ else
++ di_write_unlock2(a->src_parent, a->dst_parent);
++out_unlock:
++ aufs_read_and_write_unlock2(a->dst_dentry, a->src_dentry);
++out_free:
++ iput(a->dst_inode);
++ if (a->thargs)
++ au_whtmp_rmdir_free(a->thargs);
++ kfree(a);
+out:
+ AuTraceErr(err);
+ return err;
+}
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/iinfo.c linux-4.14/fs/aufs/iinfo.c
+--- linux-4.14/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/iinfo.c 2021-02-24 21:42:43.444448075 +0100
+@@ -0,0 +1,285 @@
++/*
++ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ *
++ * This program, aufs 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/>.
++ */
+
+/*
-+ * final procedure for deleting a entry.
-+ * maintain dentry and iattr.
++ * inode private data
+ */
-+static void epilog(struct inode *dir, struct dentry *dentry,
-+ aufs_bindex_t bindex)
++
++#include "aufs.h"
++
++struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex)
+{
-+ struct inode *inode;
++ struct inode *h_inode;
++ struct au_hinode *hinode;
+
-+ inode = d_inode(dentry);
-+ d_drop(dentry);
-+ inode->i_ctime = dir->i_ctime;
++ IiMustAnyLock(inode);
+
-+ au_dir_ts(dir, bindex);
-+ dir->i_version++;
++ hinode = au_hinode(au_ii(inode), bindex);
++ h_inode = hinode->hi_inode;
++ AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0);
++ return h_inode;
+}
+
-+/*
-+ * when an error happened, remove the created whiteout and revert everything.
-+ */
-+static int do_revert(int err, struct inode *dir, aufs_bindex_t bindex,
-+ aufs_bindex_t bwh, struct dentry *wh_dentry,
-+ struct dentry *dentry, struct au_dtime *dt)
++/* todo: hard/soft set? */
++void au_hiput(struct au_hinode *hinode)
+{
-+ int rerr;
-+ struct path h_path = {
-+ .dentry = wh_dentry,
-+ .mnt = au_sbr_mnt(dir->i_sb, bindex)
-+ };
++ au_hn_free(hinode);
++ dput(hinode->hi_whdentry);
++ iput(hinode->hi_inode);
++}
+
-+ rerr = au_wh_unlink_dentry(au_h_iptr(dir, bindex), &h_path, dentry);
-+ if (!rerr) {
-+ au_set_dbwh(dentry, bwh);
-+ au_dtime_revert(dt);
-+ return 0;
-+ }
++unsigned int au_hi_flags(struct inode *inode, int isdir)
++{
++ unsigned int flags;
++ const unsigned int mnt_flags = au_mntflags(inode->i_sb);
+
-+ AuIOErr("%pd reverting whiteout failed(%d, %d)\n", dentry, err, rerr);
-+ return -EIO;
++ flags = 0;
++ if (au_opt_test(mnt_flags, XINO))
++ au_fset_hi(flags, XINO);
++ if (isdir && au_opt_test(mnt_flags, UDBA_HNOTIFY))
++ au_fset_hi(flags, HNOTIFY);
++ return flags;
+}
+
-+/* ---------------------------------------------------------------------- */
-+
-+int aufs_unlink(struct inode *dir, struct dentry *dentry)
++void au_set_h_iptr(struct inode *inode, aufs_bindex_t bindex,
++ struct inode *h_inode, unsigned int flags)
+{
-+ int err;
-+ aufs_bindex_t bwh, bindex, btop;
-+ struct inode *inode, *h_dir, *delegated;
-+ struct dentry *parent, *wh_dentry;
-+ /* to reuduce stack size */
-+ struct {
-+ struct au_dtime dt;
-+ struct au_pin pin;
-+ struct path h_path;
-+ } *a;
++ struct au_hinode *hinode;
++ struct inode *hi;
++ struct au_iinfo *iinfo = au_ii(inode);
+
-+ IMustLock(dir);
++ IiMustWriteLock(inode);
+
-+ err = -ENOMEM;
-+ a = kmalloc(sizeof(*a), GFP_NOFS);
-+ if (unlikely(!a))
-+ goto out;
++ hinode = au_hinode(iinfo, bindex);
++ hi = hinode->hi_inode;
++ AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0);
+
-+ err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN);
-+ if (unlikely(err))
-+ goto out_free;
-+ err = au_d_hashed_positive(dentry);
-+ if (unlikely(err))
-+ goto out_unlock;
-+ inode = d_inode(dentry);
-+ IMustLock(inode);
-+ err = -EISDIR;
-+ if (unlikely(d_is_dir(dentry)))
-+ goto out_unlock; /* possible? */
++ if (hi)
++ au_hiput(hinode);
++ hinode->hi_inode = h_inode;
++ if (h_inode) {
++ int err;
++ struct super_block *sb = inode->i_sb;
++ struct au_branch *br;
+
-+ btop = au_dbtop(dentry);
-+ bwh = au_dbwh(dentry);
-+ bindex = -1;
-+ parent = dentry->d_parent; /* dir inode is locked */
-+ di_write_lock_parent(parent);
-+ wh_dentry = lock_hdir_create_wh(dentry, /*isdir*/0, &bindex, &a->dt,
-+ &a->pin);
-+ err = PTR_ERR(wh_dentry);
-+ if (IS_ERR(wh_dentry))
-+ goto out_parent;
++ AuDebugOn(inode->i_mode
++ && (h_inode->i_mode & S_IFMT)
++ != (inode->i_mode & S_IFMT));
++ if (bindex == iinfo->ii_btop)
++ au_cpup_igen(inode, h_inode);
++ br = au_sbr(sb, bindex);
++ hinode->hi_id = br->br_id;
++ if (au_ftest_hi(flags, XINO)) {
++ err = au_xino_write(sb, bindex, h_inode->i_ino,
++ inode->i_ino);
++ if (unlikely(err))
++ AuIOErr1("failed au_xino_write() %d\n", err);
++ }
+
-+ a->h_path.mnt = au_sbr_mnt(dentry->d_sb, btop);
-+ a->h_path.dentry = au_h_dptr(dentry, btop);
-+ dget(a->h_path.dentry);
-+ if (bindex == btop) {
-+ h_dir = au_pinned_h_dir(&a->pin);
-+ delegated = NULL;
-+ err = vfsub_unlink(h_dir, &a->h_path, &delegated, /*force*/0);
-+ if (unlikely(err == -EWOULDBLOCK)) {
-+ pr_warn("cannot retry for NFSv4 delegation"
-+ " for an internal unlink\n");
-+ iput(delegated);
++ if (au_ftest_hi(flags, HNOTIFY)
++ && au_br_hnotifyable(br->br_perm)) {
++ err = au_hn_alloc(hinode, inode);
++ if (unlikely(err))
++ AuIOErr1("au_hn_alloc() %d\n", err);
+ }
-+ } else {
-+ /* dir inode is locked */
-+ h_dir = d_inode(wh_dentry->d_parent);
-+ IMustLock(h_dir);
-+ err = 0;
+ }
++}
+
-+ if (!err) {
-+ vfsub_drop_nlink(inode);
-+ epilog(dir, dentry, bindex);
++void au_set_hi_wh(struct inode *inode, aufs_bindex_t bindex,
++ struct dentry *h_wh)
++{
++ struct au_hinode *hinode;
+
-+ /* update target timestamps */
-+ if (bindex == btop) {
-+ vfsub_update_h_iattr(&a->h_path, /*did*/NULL);
-+ /*ignore*/
-+ inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime;
-+ } else
-+ /* todo: this timestamp may be reverted later */
-+ inode->i_ctime = h_dir->i_ctime;
-+ goto out_unpin; /* success */
-+ }
++ IiMustWriteLock(inode);
+
-+ /* revert */
-+ if (wh_dentry) {
-+ int rerr;
++ hinode = au_hinode(au_ii(inode), bindex);
++ AuDebugOn(hinode->hi_whdentry);
++ hinode->hi_whdentry = h_wh;
++}
+
-+ rerr = do_revert(err, dir, bindex, bwh, wh_dentry, dentry,
-+ &a->dt);
-+ if (rerr)
-+ err = rerr;
++void au_update_iigen(struct inode *inode, int half)
++{
++ struct au_iinfo *iinfo;
++ struct au_iigen *iigen;
++ unsigned int sigen;
++
++ sigen = au_sigen(inode->i_sb);
++ iinfo = au_ii(inode);
++ iigen = &iinfo->ii_generation;
++ spin_lock(&iigen->ig_spin);
++ iigen->ig_generation = sigen;
++ if (half)
++ au_ig_fset(iigen->ig_flags, HALF_REFRESHED);
++ else
++ au_ig_fclr(iigen->ig_flags, HALF_REFRESHED);
++ spin_unlock(&iigen->ig_spin);
++}
++
++/* it may be called at remount time, too */
++void au_update_ibrange(struct inode *inode, int do_put_zero)
++{
++ struct au_iinfo *iinfo;
++ aufs_bindex_t bindex, bbot;
++
++ AuDebugOn(au_is_bad_inode(inode));
++ IiMustWriteLock(inode);
++
++ iinfo = au_ii(inode);
++ if (do_put_zero && iinfo->ii_btop >= 0) {
++ for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot;
++ bindex++) {
++ struct inode *h_i;
++
++ h_i = au_hinode(iinfo, bindex)->hi_inode;
++ if (h_i
++ && !h_i->i_nlink
++ && !(h_i->i_state & I_LINKABLE))
++ au_set_h_iptr(inode, bindex, NULL, 0);
++ }
+ }
+
-+out_unpin:
-+ au_unpin(&a->pin);
-+ dput(wh_dentry);
-+ dput(a->h_path.dentry);
-+out_parent:
-+ di_write_unlock(parent);
-+out_unlock:
-+ aufs_read_unlock(dentry, AuLock_DW);
-+out_free:
-+ kfree(a);
-+out:
-+ return err;
++ iinfo->ii_btop = -1;
++ iinfo->ii_bbot = -1;
++ bbot = au_sbbot(inode->i_sb);
++ for (bindex = 0; bindex <= bbot; bindex++)
++ if (au_hinode(iinfo, bindex)->hi_inode) {
++ iinfo->ii_btop = bindex;
++ break;
++ }
++ if (iinfo->ii_btop >= 0)
++ for (bindex = bbot; bindex >= iinfo->ii_btop; bindex--)
++ if (au_hinode(iinfo, bindex)->hi_inode) {
++ iinfo->ii_bbot = bindex;
++ break;
++ }
++ AuDebugOn(iinfo->ii_btop > iinfo->ii_bbot);
+}
+
-+int aufs_rmdir(struct inode *dir, struct dentry *dentry)
++/* ---------------------------------------------------------------------- */
++
++void au_icntnr_init_once(void *_c)
+{
-+ int err, rmdir_later;
-+ aufs_bindex_t bwh, bindex, btop;
-+ struct inode *inode;
-+ struct dentry *parent, *wh_dentry, *h_dentry;
-+ struct au_whtmp_rmdir *args;
-+ /* to reuduce stack size */
-+ struct {
-+ struct au_dtime dt;
-+ struct au_pin pin;
-+ } *a;
++ struct au_icntnr *c = _c;
++ struct au_iinfo *iinfo = &c->iinfo;
+
-+ IMustLock(dir);
++ spin_lock_init(&iinfo->ii_generation.ig_spin);
++ au_rw_init(&iinfo->ii_rwsem);
++ inode_init_once(&c->vfs_inode);
++}
+
-+ err = -ENOMEM;
-+ a = kmalloc(sizeof(*a), GFP_NOFS);
-+ if (unlikely(!a))
-+ goto out;
++void au_hinode_init(struct au_hinode *hinode)
++{
++ hinode->hi_inode = NULL;
++ hinode->hi_id = -1;
++ au_hn_init(hinode);
++ hinode->hi_whdentry = NULL;
++}
+
-+ err = aufs_read_lock(dentry, AuLock_DW | AuLock_FLUSH | AuLock_GEN);
-+ if (unlikely(err))
-+ goto out_free;
-+ err = au_alive_dir(dentry);
-+ if (unlikely(err))
-+ goto out_unlock;
-+ inode = d_inode(dentry);
-+ IMustLock(inode);
-+ err = -ENOTDIR;
-+ if (unlikely(!d_is_dir(dentry)))
-+ goto out_unlock; /* possible? */
++int au_iinfo_init(struct inode *inode)
++{
++ struct au_iinfo *iinfo;
++ struct super_block *sb;
++ struct au_hinode *hi;
++ int nbr, i;
+
-+ err = -ENOMEM;
-+ args = au_whtmp_rmdir_alloc(dir->i_sb, GFP_NOFS);
-+ if (unlikely(!args))
-+ goto out_unlock;
++ sb = inode->i_sb;
++ iinfo = &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo);
++ nbr = au_sbbot(sb) + 1;
++ if (unlikely(nbr <= 0))
++ nbr = 1;
++ hi = kmalloc_array(nbr, sizeof(*iinfo->ii_hinode), GFP_NOFS);
++ if (hi) {
++ au_ninodes_inc(sb);
+
-+ parent = dentry->d_parent; /* dir inode is locked */
-+ di_write_lock_parent(parent);
-+ err = au_test_empty(dentry, &args->whlist);
-+ if (unlikely(err))
-+ goto out_parent;
++ iinfo->ii_hinode = hi;
++ for (i = 0; i < nbr; i++, hi++)
++ au_hinode_init(hi);
+
-+ btop = au_dbtop(dentry);
-+ bwh = au_dbwh(dentry);
-+ bindex = -1;
-+ wh_dentry = lock_hdir_create_wh(dentry, /*isdir*/1, &bindex, &a->dt,
-+ &a->pin);
-+ err = PTR_ERR(wh_dentry);
-+ if (IS_ERR(wh_dentry))
-+ goto out_parent;
++ iinfo->ii_generation.ig_generation = au_sigen(sb);
++ iinfo->ii_btop = -1;
++ iinfo->ii_bbot = -1;
++ iinfo->ii_vdir = NULL;
++ return 0;
++ }
++ return -ENOMEM;
++}
+
-+ h_dentry = au_h_dptr(dentry, btop);
-+ dget(h_dentry);
-+ rmdir_later = 0;
-+ if (bindex == btop) {
-+ err = renwh_and_rmdir(dentry, btop, &args->whlist, dir);
-+ if (err > 0) {
-+ rmdir_later = err;
-+ err = 0;
-+ }
-+ } else {
-+ /* stop monitoring */
-+ au_hn_free(au_hi(inode, btop));
++int au_hinode_realloc(struct au_iinfo *iinfo, int nbr, int may_shrink)
++{
++ int err, i;
++ struct au_hinode *hip;
+
-+ /* dir inode is locked */
-+ IMustLock(d_inode(wh_dentry->d_parent));
++ AuRwMustWriteLock(&iinfo->ii_rwsem);
++
++ err = -ENOMEM;
++ hip = au_krealloc(iinfo->ii_hinode, sizeof(*hip) * nbr, GFP_NOFS,
++ may_shrink);
++ if (hip) {
++ iinfo->ii_hinode = hip;
++ i = iinfo->ii_bbot + 1;
++ hip += i;
++ for (; i < nbr; i++, hip++)
++ au_hinode_init(hip);
+ err = 0;
+ }
+
-+ if (!err) {
-+ vfsub_dead_dir(inode);
-+ au_set_dbdiropq(dentry, -1);
-+ epilog(dir, dentry, bindex);
++ return err;
++}
+
-+ if (rmdir_later) {
-+ au_whtmp_kick_rmdir(dir, btop, h_dentry, args);
-+ args = NULL;
-+ }
++void au_iinfo_fin(struct inode *inode)
++{
++ struct au_iinfo *iinfo;
++ struct au_hinode *hi;
++ struct super_block *sb;
++ aufs_bindex_t bindex, bbot;
++ const unsigned char unlinked = !inode->i_nlink;
+
-+ goto out_unpin; /* success */
++ AuDebugOn(au_is_bad_inode(inode));
++
++ sb = inode->i_sb;
++ au_ninodes_dec(sb);
++ if (si_pid_test(sb))
++ au_xino_delete_inode(inode, unlinked);
++ else {
++ /*
++ * it is safe to hide the dependency between sbinfo and
++ * sb->s_umount.
++ */
++ lockdep_off();
++ si_noflush_read_lock(sb);
++ au_xino_delete_inode(inode, unlinked);
++ si_read_unlock(sb);
++ lockdep_on();
+ }
+
-+ /* revert */
-+ AuLabel(revert);
-+ if (wh_dentry) {
-+ int rerr;
++ iinfo = au_ii(inode);
++ if (iinfo->ii_vdir)
++ au_vdir_free(iinfo->ii_vdir);
+
-+ rerr = do_revert(err, dir, bindex, bwh, wh_dentry, dentry,
-+ &a->dt);
-+ if (rerr)
-+ err = rerr;
++ bindex = iinfo->ii_btop;
++ if (bindex >= 0) {
++ hi = au_hinode(iinfo, bindex);
++ bbot = iinfo->ii_bbot;
++ while (bindex++ <= bbot) {
++ if (hi->hi_inode)
++ au_hiput(hi);
++ hi++;
++ }
+ }
-+
-+out_unpin:
-+ au_unpin(&a->pin);
-+ dput(wh_dentry);
-+ dput(h_dentry);
-+out_parent:
-+ di_write_unlock(parent);
-+ if (args)
-+ au_whtmp_rmdir_free(args);
-+out_unlock:
-+ aufs_read_unlock(dentry, AuLock_DW);
-+out_free:
-+ kfree(a);
-+out:
-+ AuTraceErr(err);
-+ return err;
++ kfree(iinfo->ii_hinode);
++ AuRwDestroy(&iinfo->ii_rwsem);
+}
-diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
---- /usr/share/empty/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c 2017-11-12 22:24:44.707577830 +0100
-@@ -0,0 +1,1246 @@
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/inode.c linux-4.14/fs/aufs/inode.c
+--- linux-4.14/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/inode.c 2021-02-24 21:42:43.444448075 +0100
+@@ -0,0 +1,527 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ *
+ */
+
+/*
-+ * inode operation (rename entry)
-+ * todo: this is crazy monster
++ * inode functions
+ */
+
+#include "aufs.h"
+
-+enum { AuSRC, AuDST, AuSrcDst };
-+enum { AuPARENT, AuCHILD, AuParentChild };
-+
-+#define AuRen_ISDIR_SRC 1
-+#define AuRen_ISDIR_DST (1 << 1)
-+#define AuRen_ISSAMEDIR (1 << 2)
-+#define AuRen_WHSRC (1 << 3)
-+#define AuRen_WHDST (1 << 4)
-+#define AuRen_MNT_WRITE (1 << 5)
-+#define AuRen_DT_DSTDIR (1 << 6)
-+#define AuRen_DIROPQ_SRC (1 << 7)
-+#define AuRen_DIROPQ_DST (1 << 8)
-+#define AuRen_DIRREN (1 << 9)
-+#define AuRen_DROPPED_SRC (1 << 10)
-+#define AuRen_DROPPED_DST (1 << 11)
-+#define au_ftest_ren(flags, name) ((flags) & AuRen_##name)
-+#define au_fset_ren(flags, name) \
-+ do { (flags) |= AuRen_##name; } while (0)
-+#define au_fclr_ren(flags, name) \
-+ do { (flags) &= ~AuRen_##name; } while (0)
-+
-+#ifndef CONFIG_AUFS_DIRREN
-+#undef AuRen_DIRREN
-+#define AuRen_DIRREN 0
-+#endif
-+
-+struct au_ren_args {
-+ struct {
-+ struct dentry *dentry, *h_dentry, *parent, *h_parent,
-+ *wh_dentry;
-+ struct inode *dir, *inode;
-+ struct au_hinode *hdir, *hinode;
-+ struct au_dtime dt[AuParentChild];
-+ aufs_bindex_t btop, bdiropq;
-+ } sd[AuSrcDst];
-+
-+#define src_dentry sd[AuSRC].dentry
-+#define src_dir sd[AuSRC].dir
-+#define src_inode sd[AuSRC].inode
-+#define src_h_dentry sd[AuSRC].h_dentry
-+#define src_parent sd[AuSRC].parent
-+#define src_h_parent sd[AuSRC].h_parent
-+#define src_wh_dentry sd[AuSRC].wh_dentry
-+#define src_hdir sd[AuSRC].hdir
-+#define src_hinode sd[AuSRC].hinode
-+#define src_h_dir sd[AuSRC].hdir->hi_inode
-+#define src_dt sd[AuSRC].dt
-+#define src_btop sd[AuSRC].btop
-+#define src_bdiropq sd[AuSRC].bdiropq
-+
-+#define dst_dentry sd[AuDST].dentry
-+#define dst_dir sd[AuDST].dir
-+#define dst_inode sd[AuDST].inode
-+#define dst_h_dentry sd[AuDST].h_dentry
-+#define dst_parent sd[AuDST].parent
-+#define dst_h_parent sd[AuDST].h_parent
-+#define dst_wh_dentry sd[AuDST].wh_dentry
-+#define dst_hdir sd[AuDST].hdir
-+#define dst_hinode sd[AuDST].hinode
-+#define dst_h_dir sd[AuDST].hdir->hi_inode
-+#define dst_dt sd[AuDST].dt
-+#define dst_btop sd[AuDST].btop
-+#define dst_bdiropq sd[AuDST].bdiropq
-+
-+ struct dentry *h_trap;
-+ struct au_branch *br;
-+ struct path h_path;
-+ struct au_nhash whlist;
-+ aufs_bindex_t btgt, src_bwh;
++struct inode *au_igrab(struct inode *inode)
++{
++ if (inode) {
++ AuDebugOn(!atomic_read(&inode->i_count));
++ ihold(inode);
++ }
++ return inode;
++}
+
-+ struct {
-+ unsigned short auren_flags;
-+ unsigned char flags; /* syscall parameter */
-+ unsigned char exchange;
-+ } __packed;
++static void au_refresh_hinode_attr(struct inode *inode, int do_version)
++{
++ au_cpup_attr_all(inode, /*force*/0);
++ au_update_iigen(inode, /*half*/1);
++ if (do_version)
++ inode->i_version++;
++}
+
-+ struct au_whtmp_rmdir *thargs;
-+ struct dentry *h_dst;
-+ struct au_hinode *h_root;
-+};
++static int au_ii_refresh(struct inode *inode, int *update)
++{
++ int err, e, nbr;
++ umode_t type;
++ aufs_bindex_t bindex, new_bindex;
++ struct super_block *sb;
++ struct au_iinfo *iinfo;
++ struct au_hinode *p, *q, tmp;
+
-+/* ---------------------------------------------------------------------- */
++ AuDebugOn(au_is_bad_inode(inode));
++ IiMustWriteLock(inode);
+
-+/*
-+ * functions for reverting.
-+ * when an error happened in a single rename systemcall, we should revert
-+ * everything as if nothing happened.
-+ * we don't need to revert the copied-up/down the parent dir since they are
-+ * harmless.
-+ */
++ *update = 0;
++ sb = inode->i_sb;
++ nbr = au_sbbot(sb) + 1;
++ type = inode->i_mode & S_IFMT;
++ iinfo = au_ii(inode);
++ err = au_hinode_realloc(iinfo, nbr, /*may_shrink*/0);
++ if (unlikely(err))
++ goto out;
+
-+#define RevertFailure(fmt, ...) do { \
-+ AuIOErr("revert failure: " fmt " (%d, %d)\n", \
-+ ##__VA_ARGS__, err, rerr); \
-+ err = -EIO; \
-+} while (0)
++ AuDebugOn(iinfo->ii_btop < 0);
++ p = au_hinode(iinfo, iinfo->ii_btop);
++ for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot;
++ bindex++, p++) {
++ if (!p->hi_inode)
++ continue;
+
-+static void au_ren_do_rev_diropq(int err, struct au_ren_args *a, int idx)
-+{
-+ int rerr;
-+ struct dentry *d;
-+#define src_or_dst(member) a->sd[idx].member
++ AuDebugOn(type != (p->hi_inode->i_mode & S_IFMT));
++ new_bindex = au_br_index(sb, p->hi_id);
++ if (new_bindex == bindex)
++ continue;
+
-+ d = src_or_dst(dentry); /* {src,dst}_dentry */
-+ au_hn_inode_lock_nested(src_or_dst(hinode), AuLsc_I_CHILD);
-+ rerr = au_diropq_remove(d, a->btgt);
-+ au_hn_inode_unlock(src_or_dst(hinode));
-+ au_set_dbdiropq(d, src_or_dst(bdiropq));
-+ if (rerr)
-+ RevertFailure("remove diropq %pd", d);
++ if (new_bindex < 0) {
++ *update = 1;
++ au_hiput(p);
++ p->hi_inode = NULL;
++ continue;
++ }
+
-+#undef src_or_dst_
-+}
++ if (new_bindex < iinfo->ii_btop)
++ iinfo->ii_btop = new_bindex;
++ if (iinfo->ii_bbot < new_bindex)
++ iinfo->ii_bbot = new_bindex;
++ /* swap two lower inode, and loop again */
++ q = au_hinode(iinfo, new_bindex);
++ tmp = *q;
++ *q = *p;
++ *p = tmp;
++ if (tmp.hi_inode) {
++ bindex--;
++ p--;
++ }
++ }
++ au_update_ibrange(inode, /*do_put_zero*/0);
++ au_hinode_realloc(iinfo, nbr, /*may_shrink*/1); /* harmless if err */
++ e = au_dy_irefresh(inode);
++ if (unlikely(e && !err))
++ err = e;
+
-+static void au_ren_rev_diropq(int err, struct au_ren_args *a)
-+{
-+ if (au_ftest_ren(a->auren_flags, DIROPQ_SRC))
-+ au_ren_do_rev_diropq(err, a, AuSRC);
-+ if (au_ftest_ren(a->auren_flags, DIROPQ_DST))
-+ au_ren_do_rev_diropq(err, a, AuDST);
++out:
++ AuTraceErr(err);
++ return err;
+}
+
-+static void au_ren_rev_rename(int err, struct au_ren_args *a)
++void au_refresh_iop(struct inode *inode, int force_getattr)
+{
-+ int rerr;
-+ struct inode *delegated;
++ int type;
++ struct au_sbinfo *sbi = au_sbi(inode->i_sb);
++ const struct inode_operations *iop
++ = force_getattr ? aufs_iop : sbi->si_iop_array;
+
-+ a->h_path.dentry = vfsub_lkup_one(&a->src_dentry->d_name,
-+ a->src_h_parent);
-+ rerr = PTR_ERR(a->h_path.dentry);
-+ if (IS_ERR(a->h_path.dentry)) {
-+ RevertFailure("lkup one %pd", a->src_dentry);
++ if (inode->i_op == iop)
+ return;
-+ }
+
-+ delegated = NULL;
-+ rerr = vfsub_rename(a->dst_h_dir,
-+ au_h_dptr(a->src_dentry, a->btgt),
-+ a->src_h_dir, &a->h_path, &delegated, a->flags);
-+ if (unlikely(rerr == -EWOULDBLOCK)) {
-+ pr_warn("cannot retry for NFSv4 delegation"
-+ " for an internal rename\n");
-+ iput(delegated);
++ switch (inode->i_mode & S_IFMT) {
++ case S_IFDIR:
++ type = AuIop_DIR;
++ break;
++ case S_IFLNK:
++ type = AuIop_SYMLINK;
++ break;
++ default:
++ type = AuIop_OTHER;
++ break;
+ }
-+ d_drop(a->h_path.dentry);
-+ dput(a->h_path.dentry);
-+ /* au_set_h_dptr(a->src_dentry, a->btgt, NULL); */
-+ if (rerr)
-+ RevertFailure("rename %pd", a->src_dentry);
++
++ inode->i_op = iop + type;
++ /* unnecessary smp_wmb() */
+}
+
-+static void au_ren_rev_whtmp(int err, struct au_ren_args *a)
++int au_refresh_hinode_self(struct inode *inode)
+{
-+ int rerr;
-+ struct inode *delegated;
++ int err, update;
+
-+ a->h_path.dentry = vfsub_lkup_one(&a->dst_dentry->d_name,
-+ a->dst_h_parent);
-+ rerr = PTR_ERR(a->h_path.dentry);
-+ if (IS_ERR(a->h_path.dentry)) {
-+ RevertFailure("lkup one %pd", a->dst_dentry);
-+ return;
-+ }
-+ if (d_is_positive(a->h_path.dentry)) {
-+ d_drop(a->h_path.dentry);
-+ dput(a->h_path.dentry);
-+ return;
-+ }
++ err = au_ii_refresh(inode, &update);
++ if (!err)
++ au_refresh_hinode_attr(inode, update && S_ISDIR(inode->i_mode));
+
-+ delegated = NULL;
-+ rerr = vfsub_rename(a->dst_h_dir, a->h_dst, a->dst_h_dir, &a->h_path,
-+ &delegated, a->flags);
-+ if (unlikely(rerr == -EWOULDBLOCK)) {
-+ pr_warn("cannot retry for NFSv4 delegation"
-+ " for an internal rename\n");
-+ iput(delegated);
-+ }
-+ d_drop(a->h_path.dentry);
-+ dput(a->h_path.dentry);
-+ if (!rerr)
-+ au_set_h_dptr(a->dst_dentry, a->btgt, dget(a->h_dst));
-+ else
-+ RevertFailure("rename %pd", a->h_dst);
++ AuTraceErr(err);
++ return err;
+}
+
-+static void au_ren_rev_whsrc(int err, struct au_ren_args *a)
++int au_refresh_hinode(struct inode *inode, struct dentry *dentry)
+{
-+ int rerr;
++ int err, e, update;
++ unsigned int flags;
++ umode_t mode;
++ aufs_bindex_t bindex, bbot;
++ unsigned char isdir;
++ struct au_hinode *p;
++ struct au_iinfo *iinfo;
+
-+ a->h_path.dentry = a->src_wh_dentry;
-+ rerr = au_wh_unlink_dentry(a->src_h_dir, &a->h_path, a->src_dentry);
-+ au_set_dbwh(a->src_dentry, a->src_bwh);
-+ if (rerr)
-+ RevertFailure("unlink %pd", a->src_wh_dentry);
-+}
-+#undef RevertFailure
++ err = au_ii_refresh(inode, &update);
++ if (unlikely(err))
++ goto out;
+
-+/* ---------------------------------------------------------------------- */
++ update = 0;
++ iinfo = au_ii(inode);
++ p = au_hinode(iinfo, iinfo->ii_btop);
++ mode = (inode->i_mode & S_IFMT);
++ isdir = S_ISDIR(mode);
++ flags = au_hi_flags(inode, isdir);
++ bbot = au_dbbot(dentry);
++ for (bindex = au_dbtop(dentry); bindex <= bbot; bindex++) {
++ struct inode *h_i, *h_inode;
++ struct dentry *h_d;
+
-+/*
-+ * when we have to copyup the renaming entry, do it with the rename-target name
-+ * in order to minimize the cost (the later actual rename is unnecessary).
-+ * otherwise rename it on the target branch.
-+ */
-+static int au_ren_or_cpup(struct au_ren_args *a)
-+{
-+ int err;
-+ struct dentry *d;
-+ struct inode *delegated;
++ h_d = au_h_dptr(dentry, bindex);
++ if (!h_d || d_is_negative(h_d))
++ continue;
+
-+ d = a->src_dentry;
-+ if (au_dbtop(d) == a->btgt) {
-+ a->h_path.dentry = a->dst_h_dentry;
-+ AuDebugOn(au_dbtop(d) != a->btgt);
-+ delegated = NULL;
-+ err = vfsub_rename(a->src_h_dir, au_h_dptr(d, a->btgt),
-+ a->dst_h_dir, &a->h_path, &delegated,
-+ a->flags);
-+ if (unlikely(err == -EWOULDBLOCK)) {
-+ pr_warn("cannot retry for NFSv4 delegation"
-+ " for an internal rename\n");
-+ iput(delegated);
++ h_inode = d_inode(h_d);
++ AuDebugOn(mode != (h_inode->i_mode & S_IFMT));
++ if (iinfo->ii_btop <= bindex && bindex <= iinfo->ii_bbot) {
++ h_i = au_h_iptr(inode, bindex);
++ if (h_i) {
++ if (h_i == h_inode)
++ continue;
++ err = -EIO;
++ break;
++ }
+ }
-+ } else
-+ BUG();
-+
-+ if (!err && a->h_dst)
-+ /* it will be set to dinfo later */
-+ dget(a->h_dst);
++ if (bindex < iinfo->ii_btop)
++ iinfo->ii_btop = bindex;
++ if (iinfo->ii_bbot < bindex)
++ iinfo->ii_bbot = bindex;
++ au_set_h_iptr(inode, bindex, au_igrab(h_inode), flags);
++ update = 1;
++ }
++ au_update_ibrange(inode, /*do_put_zero*/0);
++ e = au_dy_irefresh(inode);
++ if (unlikely(e && !err))
++ err = e;
++ if (!err)
++ au_refresh_hinode_attr(inode, update && isdir);
+
++out:
++ AuTraceErr(err);
+ return err;
+}
+
-+/* cf. aufs_rmdir() */
-+static int au_ren_del_whtmp(struct au_ren_args *a)
++static int set_inode(struct inode *inode, struct dentry *dentry)
+{
+ int err;
-+ struct inode *dir;
++ unsigned int flags;
++ umode_t mode;
++ aufs_bindex_t bindex, btop, btail;
++ unsigned char isdir;
++ struct dentry *h_dentry;
++ struct inode *h_inode;
++ struct au_iinfo *iinfo;
++ struct inode_operations *iop;
+
-+ dir = a->dst_dir;
-+ SiMustAnyLock(dir->i_sb);
-+ if (!au_nhash_test_longer_wh(&a->whlist, a->btgt,
-+ au_sbi(dir->i_sb)->si_dirwh)
-+ || au_test_fs_remote(a->h_dst->d_sb)) {
-+ err = au_whtmp_rmdir(dir, a->btgt, a->h_dst, &a->whlist);
++ IiMustWriteLock(inode);
++
++ err = 0;
++ isdir = 0;
++ iop = au_sbi(inode->i_sb)->si_iop_array;
++ btop = au_dbtop(dentry);
++ h_dentry = au_h_dptr(dentry, btop);
++ h_inode = d_inode(h_dentry);
++ mode = h_inode->i_mode;
++ switch (mode & S_IFMT) {
++ case S_IFREG:
++ btail = au_dbtail(dentry);
++ inode->i_op = iop + AuIop_OTHER;
++ inode->i_fop = &aufs_file_fop;
++ err = au_dy_iaop(inode, btop, h_inode);
+ if (unlikely(err))
-+ pr_warn("failed removing whtmp dir %pd (%d), "
-+ "ignored.\n", a->h_dst, err);
-+ } else {
-+ au_nhash_wh_free(&a->thargs->whlist);
-+ a->thargs->whlist = a->whlist;
-+ a->whlist.nh_num = 0;
-+ au_whtmp_kick_rmdir(dir, a->btgt, a->h_dst, a->thargs);
-+ dput(a->h_dst);
-+ a->thargs = NULL;
++ goto out;
++ break;
++ case S_IFDIR:
++ isdir = 1;
++ btail = au_dbtaildir(dentry);
++ inode->i_op = iop + AuIop_DIR;
++ inode->i_fop = &aufs_dir_fop;
++ break;
++ case S_IFLNK:
++ btail = au_dbtail(dentry);
++ inode->i_op = iop + AuIop_SYMLINK;
++ break;
++ case S_IFBLK:
++ case S_IFCHR:
++ case S_IFIFO:
++ case S_IFSOCK:
++ btail = au_dbtail(dentry);
++ inode->i_op = iop + AuIop_OTHER;
++ init_special_inode(inode, mode, h_inode->i_rdev);
++ break;
++ default:
++ AuIOErr("Unknown file type 0%o\n", mode);
++ err = -EIO;
++ goto out;
+ }
+
-+ return 0;
++ /* do not set hnotify for whiteouted dirs (SHWH mode) */
++ flags = au_hi_flags(inode, isdir);
++ if (au_opt_test(au_mntflags(dentry->d_sb), SHWH)
++ && au_ftest_hi(flags, HNOTIFY)
++ && dentry->d_name.len > AUFS_WH_PFX_LEN
++ && !memcmp(dentry->d_name.name, AUFS_WH_PFX, AUFS_WH_PFX_LEN))
++ au_fclr_hi(flags, HNOTIFY);
++ iinfo = au_ii(inode);
++ iinfo->ii_btop = btop;
++ iinfo->ii_bbot = btail;
++ for (bindex = btop; bindex <= btail; bindex++) {
++ h_dentry = au_h_dptr(dentry, bindex);
++ if (h_dentry)
++ au_set_h_iptr(inode, bindex,
++ au_igrab(d_inode(h_dentry)), flags);
++ }
++ au_cpup_attr_all(inode, /*force*/1);
++ /*
++ * to force calling aufs_get_acl() every time,
++ * do not call cache_no_acl() for aufs inode.
++ */
++
++out:
++ return err;
+}
+
-+/* make it 'opaque' dir. */
-+static int au_ren_do_diropq(struct au_ren_args *a, int idx)
++/*
++ * successful returns with iinfo write_locked
++ * minus: errno
++ * zero: success, matched
++ * plus: no error, but unmatched
++ */
++static int reval_inode(struct inode *inode, struct dentry *dentry)
+{
+ int err;
-+ struct dentry *d, *diropq;
-+#define src_or_dst(member) a->sd[idx].member
++ unsigned int gen, igflags;
++ aufs_bindex_t bindex, bbot;
++ struct inode *h_inode, *h_dinode;
++ struct dentry *h_dentry;
+
-+ err = 0;
-+ d = src_or_dst(dentry); /* {src,dst}_dentry */
-+ src_or_dst(bdiropq) = au_dbdiropq(d);
-+ src_or_dst(hinode) = au_hi(src_or_dst(inode), a->btgt);
-+ au_hn_inode_lock_nested(src_or_dst(hinode), AuLsc_I_CHILD);
-+ diropq = au_diropq_create(d, a->btgt);
-+ au_hn_inode_unlock(src_or_dst(hinode));
-+ if (IS_ERR(diropq))
-+ err = PTR_ERR(diropq);
-+ else
-+ dput(diropq);
++ /*
++ * before this function, if aufs got any iinfo lock, it must be only
++ * one, the parent dir.
++ * it can happen by UDBA and the obsoleted inode number.
++ */
++ err = -EIO;
++ if (unlikely(inode->i_ino == parent_ino(dentry)))
++ goto out;
+
-+#undef src_or_dst_
++ err = 1;
++ ii_write_lock_new_child(inode);
++ h_dentry = au_h_dptr(dentry, au_dbtop(dentry));
++ h_dinode = d_inode(h_dentry);
++ bbot = au_ibbot(inode);
++ for (bindex = au_ibtop(inode); bindex <= bbot; bindex++) {
++ h_inode = au_h_iptr(inode, bindex);
++ if (!h_inode || h_inode != h_dinode)
++ continue;
++
++ err = 0;
++ gen = au_iigen(inode, &igflags);
++ if (gen == au_digen(dentry)
++ && !au_ig_ftest(igflags, HALF_REFRESHED))
++ break;
++
++ /* fully refresh inode using dentry */
++ err = au_refresh_hinode(inode, dentry);
++ if (!err)
++ au_update_iigen(inode, /*half*/0);
++ break;
++ }
++
++ if (unlikely(err))
++ ii_write_unlock(inode);
++out:
+ return err;
+}
+
-+static int au_ren_diropq(struct au_ren_args *a)
++int au_ino(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
++ unsigned int d_type, ino_t *ino)
+{
-+ int err;
-+ unsigned char always;
-+ struct dentry *d;
++ int err, idx;
++ const int isnondir = d_type != DT_DIR;
+
-+ err = 0;
-+ d = a->dst_dentry; /* already renamed on the branch */
-+ always = !!au_opt_test(au_mntflags(d->d_sb), ALWAYS_DIROPQ);
-+ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)
-+ && !au_ftest_ren(a->auren_flags, DIRREN)
-+ && a->btgt != au_dbdiropq(a->src_dentry)
-+ && (a->dst_wh_dentry
-+ || a->btgt <= au_dbdiropq(d)
-+ /* hide the lower to keep xino */
-+ /* the lowers may not be a dir, but we hide them anyway */
-+ || a->btgt < au_dbbot(d)
-+ || always)) {
-+ AuDbg("here\n");
-+ err = au_ren_do_diropq(a, AuSRC);
++ /* prevent hardlinked inode number from race condition */
++ if (isnondir) {
++ err = au_xinondir_enter(sb, bindex, h_ino, &idx);
+ if (unlikely(err))
+ goto out;
-+ au_fset_ren(a->auren_flags, DIROPQ_SRC);
+ }
-+ if (!a->exchange)
-+ goto out; /* success */
+
-+ d = a->src_dentry; /* already renamed on the branch */
-+ if (au_ftest_ren(a->auren_flags, ISDIR_DST)
-+ && a->btgt != au_dbdiropq(a->dst_dentry)
-+ && (a->btgt < au_dbdiropq(d)
-+ || a->btgt < au_dbbot(d)
-+ || always)) {
-+ AuDbgDentry(a->src_dentry);
-+ AuDbgDentry(a->dst_dentry);
-+ err = au_ren_do_diropq(a, AuDST);
++ err = au_xino_read(sb, bindex, h_ino, ino);
++ if (unlikely(err))
++ goto out_xinondir;
++
++ if (!*ino) {
++ err = -EIO;
++ *ino = au_xino_new_ino(sb);
++ if (unlikely(!*ino))
++ goto out_xinondir;
++ err = au_xino_write(sb, bindex, h_ino, *ino);
+ if (unlikely(err))
-+ goto out_rev_src;
-+ au_fset_ren(a->auren_flags, DIROPQ_DST);
++ goto out_xinondir;
+ }
-+ goto out; /* success */
+
-+out_rev_src:
-+ AuDbg("err %d, reverting src\n", err);
-+ au_ren_rev_diropq(err, a);
++out_xinondir:
++ if (isnondir && idx >= 0)
++ au_xinondir_leave(sb, bindex, h_ino, idx);
+out:
+ return err;
+}
+
-+static int do_rename(struct au_ren_args *a)
++/* successful returns with iinfo write_locked */
++/* todo: return with unlocked? */
++struct inode *au_new_inode(struct dentry *dentry, int must_new)
+{
-+ int err;
-+ struct dentry *d, *h_d;
-+
-+ if (!a->exchange) {
-+ /* prepare workqueue args for asynchronous rmdir */
-+ h_d = a->dst_h_dentry;
-+ if (au_ftest_ren(a->auren_flags, ISDIR_DST)
-+ /* && !au_ftest_ren(a->auren_flags, DIRREN) */
-+ && d_is_positive(h_d)) {
-+ err = -ENOMEM;
-+ a->thargs = au_whtmp_rmdir_alloc(a->src_dentry->d_sb,
-+ GFP_NOFS);
-+ if (unlikely(!a->thargs))
-+ goto out;
-+ a->h_dst = dget(h_d);
-+ }
++ struct inode *inode, *h_inode;
++ struct dentry *h_dentry;
++ struct super_block *sb;
++ ino_t h_ino, ino;
++ int err, idx, hlinked;
++ aufs_bindex_t btop;
+
-+ /* create whiteout for src_dentry */
-+ if (au_ftest_ren(a->auren_flags, WHSRC)) {
-+ a->src_bwh = au_dbwh(a->src_dentry);
-+ AuDebugOn(a->src_bwh >= 0);
-+ a->src_wh_dentry = au_wh_create(a->src_dentry, a->btgt,
-+ a->src_h_parent);
-+ err = PTR_ERR(a->src_wh_dentry);
-+ if (IS_ERR(a->src_wh_dentry))
-+ goto out_thargs;
-+ }
++ sb = dentry->d_sb;
++ btop = au_dbtop(dentry);
++ h_dentry = au_h_dptr(dentry, btop);
++ h_inode = d_inode(h_dentry);
++ h_ino = h_inode->i_ino;
++ hlinked = !d_is_dir(h_dentry) && h_inode->i_nlink > 1;
+
-+ /* lookup whiteout for dentry */
-+ if (au_ftest_ren(a->auren_flags, WHDST)) {
-+ h_d = au_wh_lkup(a->dst_h_parent,
-+ &a->dst_dentry->d_name, a->br);
-+ err = PTR_ERR(h_d);
-+ if (IS_ERR(h_d))
-+ goto out_whsrc;
-+ if (d_is_negative(h_d))
-+ dput(h_d);
-+ else
-+ a->dst_wh_dentry = h_d;
-+ }
++new_ino:
++ /*
++ * stop 'race'-ing between hardlinks under different
++ * parents.
++ */
++ if (hlinked) {
++ err = au_xinondir_enter(sb, btop, h_ino, &idx);
++ inode = ERR_PTR(err);
++ if (unlikely(err))
++ goto out;
++ }
+
-+ /* rename dentry to tmpwh */
-+ if (a->thargs) {
-+ err = au_whtmp_ren(a->dst_h_dentry, a->br);
-+ if (unlikely(err))
-+ goto out_whdst;
++ err = au_xino_read(sb, btop, h_ino, &ino);
++ inode = ERR_PTR(err);
++ if (unlikely(err))
++ goto out_xinondir;
+
-+ d = a->dst_dentry;
-+ au_set_h_dptr(d, a->btgt, NULL);
-+ err = au_lkup_neg(d, a->btgt, /*wh*/0);
-+ if (unlikely(err))
-+ goto out_whtmp;
-+ a->dst_h_dentry = au_h_dptr(d, a->btgt);
++ if (!ino) {
++ ino = au_xino_new_ino(sb);
++ if (unlikely(!ino)) {
++ inode = ERR_PTR(-EIO);
++ goto out_xinondir;
+ }
+ }
+
-+ BUG_ON(d_is_positive(a->dst_h_dentry) && a->src_btop != a->btgt);
-+#if 0
-+ BUG_ON(!au_ftest_ren(a->auren_flags, DIRREN)
-+ && d_is_positive(a->dst_h_dentry)
-+ && a->src_btop != a->btgt);
-+#endif
++ AuDbg("i%lu\n", (unsigned long)ino);
++ inode = au_iget_locked(sb, ino);
++ err = PTR_ERR(inode);
++ if (IS_ERR(inode))
++ goto out_xinondir;
+
-+ /* rename by vfs_rename or cpup */
-+ err = au_ren_or_cpup(a);
-+ if (unlikely(err))
-+ /* leave the copied-up one */
-+ goto out_whtmp;
++ AuDbg("%lx, new %d\n", inode->i_state, !!(inode->i_state & I_NEW));
++ if (inode->i_state & I_NEW) {
++ ii_write_lock_new_child(inode);
++ err = set_inode(inode, dentry);
++ if (!err) {
++ unlock_new_inode(inode);
++ goto out_xinondir; /* success */
++ }
+
-+ /* make dir opaque */
-+ err = au_ren_diropq(a);
-+ if (unlikely(err))
-+ goto out_rename;
++ /*
++ * iget_failed() calls iput(), but we need to call
++ * ii_write_unlock() after iget_failed(). so dirty hack for
++ * i_count.
++ */
++ atomic_inc(&inode->i_count);
++ iget_failed(inode);
++ ii_write_unlock(inode);
++ au_xino_write(sb, btop, h_ino, /*ino*/0);
++ /* ignore this error */
++ goto out_iput;
++ } else if (!must_new && !IS_DEADDIR(inode) && inode->i_nlink) {
++ /*
++ * horrible race condition between lookup, readdir and copyup
++ * (or something).
++ */
++ if (hlinked && idx >= 0)
++ au_xinondir_leave(sb, btop, h_ino, idx);
++ err = reval_inode(inode, dentry);
++ if (unlikely(err < 0)) {
++ hlinked = 0;
++ goto out_iput;
++ }
++ if (!err)
++ goto out; /* success */
++ else if (hlinked && idx >= 0) {
++ err = au_xinondir_enter(sb, btop, h_ino, &idx);
++ if (unlikely(err)) {
++ iput(inode);
++ inode = ERR_PTR(err);
++ goto out;
++ }
++ }
++ }
+
-+ /* update target timestamps */
-+ if (a->exchange) {
-+ AuDebugOn(au_dbtop(a->dst_dentry) != a->btgt);
-+ a->h_path.dentry = au_h_dptr(a->dst_dentry, a->btgt);
-+ vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/
-+ a->dst_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime;
++ if (unlikely(au_test_fs_unique_ino(h_inode)))
++ AuWarn1("Warning: Un-notified UDBA or repeatedly renamed dir,"
++ " b%d, %s, %pd, hi%lu, i%lu.\n",
++ btop, au_sbtype(h_dentry->d_sb), dentry,
++ (unsigned long)h_ino, (unsigned long)ino);
++ ino = 0;
++ err = au_xino_write(sb, btop, h_ino, /*ino*/0);
++ if (!err) {
++ iput(inode);
++ if (hlinked && idx >= 0)
++ au_xinondir_leave(sb, btop, h_ino, idx);
++ goto new_ino;
+ }
-+ AuDebugOn(au_dbtop(a->src_dentry) != a->btgt);
-+ a->h_path.dentry = au_h_dptr(a->src_dentry, a->btgt);
-+ vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/
-+ a->src_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime;
+
-+ if (!a->exchange) {
-+ /* remove whiteout for dentry */
-+ if (a->dst_wh_dentry) {
-+ a->h_path.dentry = a->dst_wh_dentry;
-+ err = au_wh_unlink_dentry(a->dst_h_dir, &a->h_path,
-+ a->dst_dentry);
-+ if (unlikely(err))
-+ goto out_diropq;
-+ }
++out_iput:
++ iput(inode);
++ inode = ERR_PTR(err);
++out_xinondir:
++ if (hlinked && idx >= 0)
++ au_xinondir_leave(sb, btop, h_ino, idx);
++out:
++ return inode;
++}
+
-+ /* remove whtmp */
-+ if (a->thargs)
-+ au_ren_del_whtmp(a); /* ignore this error */
++/* ---------------------------------------------------------------------- */
+
-+ au_fhsm_wrote(a->src_dentry->d_sb, a->btgt, /*force*/0);
-+ }
-+ err = 0;
-+ goto out_success;
++int au_test_ro(struct super_block *sb, aufs_bindex_t bindex,
++ struct inode *inode)
++{
++ int err;
++ struct inode *hi;
+
-+out_diropq:
-+ au_ren_rev_diropq(err, a);
-+out_rename:
-+ au_ren_rev_rename(err, a);
-+ dput(a->h_dst);
-+out_whtmp:
-+ if (a->thargs)
-+ au_ren_rev_whtmp(err, a);
-+out_whdst:
-+ dput(a->dst_wh_dentry);
-+ a->dst_wh_dentry = NULL;
-+out_whsrc:
-+ if (a->src_wh_dentry)
-+ au_ren_rev_whsrc(err, a);
-+out_success:
-+ dput(a->src_wh_dentry);
-+ dput(a->dst_wh_dentry);
-+out_thargs:
-+ if (a->thargs) {
-+ dput(a->h_dst);
-+ au_whtmp_rmdir_free(a->thargs);
-+ a->thargs = NULL;
++ err = au_br_rdonly(au_sbr(sb, bindex));
++
++ /* pseudo-link after flushed may happen out of bounds */
++ if (!err
++ && inode
++ && au_ibtop(inode) <= bindex
++ && bindex <= au_ibbot(inode)) {
++ /*
++ * permission check is unnecessary since vfsub routine
++ * will be called later
++ */
++ hi = au_h_iptr(inode, bindex);
++ if (hi)
++ err = IS_IMMUTABLE(hi) ? -EROFS : 0;
+ }
-+out:
++
+ return err;
+}
+
-+/* ---------------------------------------------------------------------- */
++int au_test_h_perm(struct inode *h_inode, int mask)
++{
++ if (uid_eq(current_fsuid(), GLOBAL_ROOT_UID))
++ return 0;
++ return inode_permission(h_inode, mask);
++}
+
-+/*
-+ * test if @dentry dir can be rename destination or not.
-+ * success means, it is a logically empty dir.
-+ */
-+static int may_rename_dstdir(struct dentry *dentry, struct au_nhash *whlist)
++int au_test_h_perm_sio(struct inode *h_inode, int mask)
+{
-+ return au_test_empty(dentry, whlist);
++ if (au_test_nfs(h_inode->i_sb)
++ && (mask & MAY_WRITE)
++ && S_ISDIR(h_inode->i_mode))
++ mask |= MAY_READ; /* force permission check */
++ return au_test_h_perm(h_inode, mask);
+}
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/inode.h linux-4.14/fs/aufs/inode.h
+--- linux-4.14/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/inode.h 2021-02-24 21:42:43.444448075 +0100
+@@ -0,0 +1,695 @@
++/*
++ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ *
++ * This program, aufs 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/>.
++ */
+
+/*
-+ * test if @a->src_dentry dir can be rename source or not.
-+ * if it can, return 0.
-+ * success means,
-+ * - it is a logically empty dir.
-+ * - or, it exists on writable branch and has no children including whiteouts
-+ * on the lower branch unless DIRREN is on.
++ * inode operations
+ */
-+static int may_rename_srcdir(struct au_ren_args *a)
-+{
-+ int err;
-+ unsigned int rdhash;
-+ aufs_bindex_t btop, btgt;
-+ struct dentry *dentry;
-+ struct super_block *sb;
-+ struct au_sbinfo *sbinfo;
+
-+ dentry = a->src_dentry;
-+ sb = dentry->d_sb;
-+ sbinfo = au_sbi(sb);
-+ if (au_opt_test(sbinfo->si_mntflags, DIRREN))
-+ au_fset_ren(a->auren_flags, DIRREN);
++#ifndef __AUFS_INODE_H__
++#define __AUFS_INODE_H__
+
-+ btgt = a->btgt;
-+ btop = au_dbtop(dentry);
-+ if (btop != btgt) {
-+ struct au_nhash whlist;
++#ifdef __KERNEL__
+
-+ SiMustAnyLock(sb);
-+ rdhash = sbinfo->si_rdhash;
-+ if (!rdhash)
-+ rdhash = au_rdhash_est(au_dir_size(/*file*/NULL,
-+ dentry));
-+ err = au_nhash_alloc(&whlist, rdhash, GFP_NOFS);
-+ if (unlikely(err))
-+ goto out;
-+ err = au_test_empty(dentry, &whlist);
-+ au_nhash_wh_free(&whlist);
-+ goto out;
-+ }
++#include <linux/fsnotify.h>
++#include "rwsem.h"
+
-+ if (btop == au_dbtaildir(dentry))
-+ return 0; /* success */
++struct vfsmount;
++
++struct au_hnotify {
++#ifdef CONFIG_AUFS_HNOTIFY
++#ifdef CONFIG_AUFS_HFSNOTIFY
++ /* never use fsnotify_add_vfsmount_mark() */
++ struct fsnotify_mark hn_mark;
++#endif
++ struct inode *hn_aufs_inode; /* no get/put */
++#endif
++} ____cacheline_aligned_in_smp;
++
++struct au_hinode {
++ struct inode *hi_inode;
++ aufs_bindex_t hi_id;
++#ifdef CONFIG_AUFS_HNOTIFY
++ struct au_hnotify *hi_notify;
++#endif
++
++ /* reference to the copied-up whiteout with get/put */
++ struct dentry *hi_whdentry;
++};
++
++/* ig_flags */
++#define AuIG_HALF_REFRESHED 1
++#define au_ig_ftest(flags, name) ((flags) & AuIG_##name)
++#define au_ig_fset(flags, name) \
++ do { (flags) |= AuIG_##name; } while (0)
++#define au_ig_fclr(flags, name) \
++ do { (flags) &= ~AuIG_##name; } while (0)
++
++struct au_iigen {
++ spinlock_t ig_spin;
++ __u32 ig_generation, ig_flags;
++};
++
++struct au_vdir;
++struct au_iinfo {
++ struct au_iigen ii_generation;
++ struct super_block *ii_hsb1; /* no get/put */
++
++ struct au_rwsem ii_rwsem;
++ aufs_bindex_t ii_btop, ii_bbot;
++ __u32 ii_higen;
++ struct au_hinode *ii_hinode;
++ struct au_vdir *ii_vdir;
++};
++
++struct au_icntnr {
++ struct au_iinfo iinfo;
++ struct inode vfs_inode;
++ struct hlist_bl_node plink;
++} ____cacheline_aligned_in_smp;
++
++/* au_pin flags */
++#define AuPin_DI_LOCKED 1
++#define AuPin_MNT_WRITE (1 << 1)
++#define au_ftest_pin(flags, name) ((flags) & AuPin_##name)
++#define au_fset_pin(flags, name) \
++ do { (flags) |= AuPin_##name; } while (0)
++#define au_fclr_pin(flags, name) \
++ do { (flags) &= ~AuPin_##name; } while (0)
++
++struct au_pin {
++ /* input */
++ struct dentry *dentry;
++ unsigned int udba;
++ unsigned char lsc_di, lsc_hi, flags;
++ aufs_bindex_t bindex;
++
++ /* output */
++ struct dentry *parent;
++ struct au_hinode *hdir;
++ struct vfsmount *h_mnt;
++
++ /* temporary unlock/relock for copyup */
++ struct dentry *h_dentry, *h_parent;
++ struct au_branch *br;
++ struct task_struct *task;
++};
++
++void au_pin_hdir_unlock(struct au_pin *p);
++int au_pin_hdir_lock(struct au_pin *p);
++int au_pin_hdir_relock(struct au_pin *p);
++void au_pin_hdir_acquire_nest(struct au_pin *p);
++void au_pin_hdir_release(struct au_pin *p);
+
-+ err = au_test_empty_lower(dentry);
++/* ---------------------------------------------------------------------- */
+
-+out:
-+ if (err == -ENOTEMPTY) {
-+ if (au_ftest_ren(a->auren_flags, DIRREN)) {
-+ err = 0;
-+ } else {
-+ AuWarn1("renaming dir who has child(ren) on multiple "
-+ "branches, is not supported\n");
-+ err = -EXDEV;
-+ }
-+ }
-+ return err;
++static inline struct au_iinfo *au_ii(struct inode *inode)
++{
++ BUG_ON(is_bad_inode(inode));
++ return &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo);
+}
+
-+/* side effect: sets whlist and h_dentry */
-+static int au_ren_may_dir(struct au_ren_args *a)
++/* ---------------------------------------------------------------------- */
++
++/* inode.c */
++struct inode *au_igrab(struct inode *inode);
++void au_refresh_iop(struct inode *inode, int force_getattr);
++int au_refresh_hinode_self(struct inode *inode);
++int au_refresh_hinode(struct inode *inode, struct dentry *dentry);
++int au_ino(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
++ unsigned int d_type, ino_t *ino);
++struct inode *au_new_inode(struct dentry *dentry, int must_new);
++int au_test_ro(struct super_block *sb, aufs_bindex_t bindex,
++ struct inode *inode);
++int au_test_h_perm(struct inode *h_inode, int mask);
++int au_test_h_perm_sio(struct inode *h_inode, int mask);
++
++static inline int au_wh_ino(struct super_block *sb, aufs_bindex_t bindex,
++ ino_t h_ino, unsigned int d_type, ino_t *ino)
+{
-+ int err;
-+ unsigned int rdhash;
-+ struct dentry *d;
++#ifdef CONFIG_AUFS_SHWH
++ return au_ino(sb, bindex, h_ino, d_type, ino);
++#else
++ return 0;
++#endif
++}
+
-+ d = a->dst_dentry;
-+ SiMustAnyLock(d->d_sb);
++/* i_op.c */
++enum {
++ AuIop_SYMLINK,
++ AuIop_DIR,
++ AuIop_OTHER,
++ AuIop_Last
++};
++extern struct inode_operations aufs_iop[AuIop_Last],
++ aufs_iop_nogetattr[AuIop_Last];
+
-+ err = 0;
-+ if (au_ftest_ren(a->auren_flags, ISDIR_DST) && a->dst_inode) {
-+ rdhash = au_sbi(d->d_sb)->si_rdhash;
-+ if (!rdhash)
-+ rdhash = au_rdhash_est(au_dir_size(/*file*/NULL, d));
-+ err = au_nhash_alloc(&a->whlist, rdhash, GFP_NOFS);
-+ if (unlikely(err))
-+ goto out;
++/* au_wr_dir flags */
++#define AuWrDir_ADD_ENTRY 1
++#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)
++#define au_fclr_wrdir(flags, name) \
++ do { (flags) &= ~AuWrDir_##name; } while (0)
+
-+ if (!a->exchange) {
-+ au_set_dbtop(d, a->dst_btop);
-+ err = may_rename_dstdir(d, &a->whlist);
-+ au_set_dbtop(d, a->btgt);
-+ } else
-+ err = may_rename_srcdir(a);
-+ }
-+ a->dst_h_dentry = au_h_dptr(d, au_dbtop(d));
-+ if (unlikely(err))
-+ goto out;
++struct au_wr_dir_args {
++ aufs_bindex_t force_btgt;
++ unsigned char flags;
++};
++int au_wr_dir(struct dentry *dentry, struct dentry *src_dentry,
++ struct au_wr_dir_args *args);
+
-+ d = a->src_dentry;
-+ a->src_h_dentry = au_h_dptr(d, au_dbtop(d));
-+ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)) {
-+ err = may_rename_srcdir(a);
-+ if (unlikely(err)) {
-+ au_nhash_wh_free(&a->whlist);
-+ a->whlist.nh_num = 0;
-+ }
-+ }
-+out:
-+ return err;
-+}
++struct dentry *au_pinned_h_parent(struct au_pin *pin);
++void au_pin_init(struct au_pin *pin, struct dentry *dentry,
++ aufs_bindex_t bindex, int lsc_di, int lsc_hi,
++ unsigned int udba, unsigned char flags);
++int au_pin(struct au_pin *pin, struct dentry *dentry, aufs_bindex_t bindex,
++ unsigned int udba, unsigned char flags) __must_check;
++int au_do_pin(struct au_pin *pin) __must_check;
++void au_unpin(struct au_pin *pin);
++int au_reval_for_attr(struct dentry *dentry, unsigned int sigen);
+
-+/* ---------------------------------------------------------------------- */
++#define AuIcpup_DID_CPUP 1
++#define au_ftest_icpup(flags, name) ((flags) & AuIcpup_##name)
++#define au_fset_icpup(flags, name) \
++ do { (flags) |= AuIcpup_##name; } while (0)
++#define au_fclr_icpup(flags, name) \
++ do { (flags) &= ~AuIcpup_##name; } while (0)
+
-+/*
-+ * simple tests for rename.
-+ * following the checks in vfs, plus the parent-child relationship.
-+ */
-+static int au_may_ren(struct au_ren_args *a)
-+{
-+ int err, isdir;
++struct au_icpup_args {
++ unsigned char flags;
++ unsigned char pin_flags;
++ aufs_bindex_t btgt;
++ unsigned int udba;
++ struct au_pin pin;
++ struct path h_path;
+ struct inode *h_inode;
++};
+
-+ if (a->src_btop == a->btgt) {
-+ err = au_may_del(a->src_dentry, a->btgt, a->src_h_parent,
-+ au_ftest_ren(a->auren_flags, ISDIR_SRC));
-+ if (unlikely(err))
-+ goto out;
-+ err = -EINVAL;
-+ if (unlikely(a->src_h_dentry == a->h_trap))
-+ goto out;
-+ }
++int au_pin_and_icpup(struct dentry *dentry, struct iattr *ia,
++ struct au_icpup_args *a);
+
-+ err = 0;
-+ if (a->dst_btop != a->btgt)
-+ goto out;
++int au_h_path_getattr(struct dentry *dentry, int force, struct path *h_path,
++ int locked);
+
-+ err = -ENOTEMPTY;
-+ if (unlikely(a->dst_h_dentry == a->h_trap))
-+ goto out;
++/* i_op_add.c */
++int au_may_add(struct dentry *dentry, aufs_bindex_t bindex,
++ struct dentry *h_parent, int isdir);
++int aufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
++ dev_t dev);
++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);
++int aufs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
+
-+ err = -EIO;
-+ isdir = !!au_ftest_ren(a->auren_flags, ISDIR_DST);
-+ if (d_really_is_negative(a->dst_dentry)) {
-+ if (d_is_negative(a->dst_h_dentry))
-+ err = au_may_add(a->dst_dentry, a->btgt,
-+ a->dst_h_parent, isdir);
-+ } else {
-+ if (unlikely(d_is_negative(a->dst_h_dentry)))
-+ goto out;
-+ h_inode = d_inode(a->dst_h_dentry);
-+ if (h_inode->i_nlink)
-+ err = au_may_del(a->dst_dentry, a->btgt,
-+ a->dst_h_parent, isdir);
-+ }
++/* i_op_del.c */
++int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup);
++int au_may_del(struct dentry *dentry, aufs_bindex_t bindex,
++ struct dentry *h_parent, int isdir);
++int aufs_unlink(struct inode *dir, struct dentry *dentry);
++int aufs_rmdir(struct inode *dir, struct dentry *dentry);
+
-+out:
-+ if (unlikely(err == -ENOENT || err == -EEXIST))
-+ err = -EIO;
-+ AuTraceErr(err);
-+ return err;
-+}
++/* i_op_ren.c */
++int au_wbr(struct dentry *dentry, aufs_bindex_t btgt);
++int aufs_rename(struct inode *src_dir, struct dentry *src_dentry,
++ struct inode *dir, struct dentry *dentry,
++ unsigned int flags);
+
-+/* ---------------------------------------------------------------------- */
++/* iinfo.c */
++struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex);
++void au_hiput(struct au_hinode *hinode);
++void au_set_hi_wh(struct inode *inode, aufs_bindex_t bindex,
++ struct dentry *h_wh);
++unsigned int au_hi_flags(struct inode *inode, int isdir);
+
-+/*
-+ * locking order
-+ * (VFS)
-+ * - src_dir and dir by lock_rename()
-+ * - inode if exitsts
-+ * (aufs)
-+ * - lock all
-+ * + src_dentry and dentry by aufs_read_and_write_lock2() which calls,
-+ * + si_read_lock
-+ * + di_write_lock2_child()
-+ * + di_write_lock_child()
-+ * + ii_write_lock_child()
-+ * + di_write_lock_child2()
-+ * + ii_write_lock_child2()
-+ * + src_parent and parent
-+ * + di_write_lock_parent()
-+ * + ii_write_lock_parent()
-+ * + di_write_lock_parent2()
-+ * + ii_write_lock_parent2()
-+ * + lower src_dir and dir by vfsub_lock_rename()
-+ * + verify the every relationships between child and parent. if any
-+ * of them failed, unlock all and return -EBUSY.
-+ */
-+static void au_ren_unlock(struct au_ren_args *a)
-+{
-+ vfsub_unlock_rename(a->src_h_parent, a->src_hdir,
-+ a->dst_h_parent, a->dst_hdir);
-+ if (au_ftest_ren(a->auren_flags, DIRREN)
-+ && a->h_root)
-+ au_hn_inode_unlock(a->h_root);
-+ if (au_ftest_ren(a->auren_flags, MNT_WRITE))
-+ vfsub_mnt_drop_write(au_br_mnt(a->br));
-+}
++/* hinode flags */
++#define AuHi_XINO 1
++#define AuHi_HNOTIFY (1 << 1)
++#define au_ftest_hi(flags, name) ((flags) & AuHi_##name)
++#define au_fset_hi(flags, name) \
++ do { (flags) |= AuHi_##name; } while (0)
++#define au_fclr_hi(flags, name) \
++ do { (flags) &= ~AuHi_##name; } while (0)
+
-+static int au_ren_lock(struct au_ren_args *a)
-+{
-+ int err;
-+ unsigned int udba;
++#ifndef CONFIG_AUFS_HNOTIFY
++#undef AuHi_HNOTIFY
++#define AuHi_HNOTIFY 0
++#endif
+
-+ err = 0;
-+ a->src_h_parent = au_h_dptr(a->src_parent, a->btgt);
-+ a->src_hdir = au_hi(a->src_dir, a->btgt);
-+ a->dst_h_parent = au_h_dptr(a->dst_parent, a->btgt);
-+ a->dst_hdir = au_hi(a->dst_dir, a->btgt);
++void au_set_h_iptr(struct inode *inode, aufs_bindex_t bindex,
++ struct inode *h_inode, unsigned int flags);
+
-+ err = vfsub_mnt_want_write(au_br_mnt(a->br));
-+ if (unlikely(err))
-+ goto out;
-+ au_fset_ren(a->auren_flags, MNT_WRITE);
-+ if (au_ftest_ren(a->auren_flags, DIRREN)) {
-+ struct dentry *root;
-+ struct inode *dir;
++void au_update_iigen(struct inode *inode, int half);
++void au_update_ibrange(struct inode *inode, int do_put_zero);
+
-+ /*
-+ * sbinfo is already locked, so this ii_read_lock is
-+ * unnecessary. but our debugging feature checks it.
-+ */
-+ root = a->src_inode->i_sb->s_root;
-+ if (root != a->src_parent && root != a->dst_parent) {
-+ dir = d_inode(root);
-+ ii_read_lock_parent3(dir);
-+ a->h_root = au_hi(dir, a->btgt);
-+ ii_read_unlock(dir);
-+ au_hn_inode_lock_nested(a->h_root, AuLsc_I_PARENT3);
-+ }
-+ }
-+ a->h_trap = vfsub_lock_rename(a->src_h_parent, a->src_hdir,
-+ a->dst_h_parent, a->dst_hdir);
-+ udba = au_opt_udba(a->src_dentry->d_sb);
-+ if (unlikely(a->src_hdir->hi_inode != d_inode(a->src_h_parent)
-+ || a->dst_hdir->hi_inode != d_inode(a->dst_h_parent)))
-+ err = au_busy_or_stale();
-+ if (!err && au_dbtop(a->src_dentry) == a->btgt)
-+ err = au_h_verify(a->src_h_dentry, udba,
-+ d_inode(a->src_h_parent), a->src_h_parent,
-+ a->br);
-+ if (!err && au_dbtop(a->dst_dentry) == a->btgt)
-+ err = au_h_verify(a->dst_h_dentry, udba,
-+ d_inode(a->dst_h_parent), a->dst_h_parent,
-+ a->br);
-+ if (!err)
-+ goto out; /* success */
++void au_icntnr_init_once(void *_c);
++void au_hinode_init(struct au_hinode *hinode);
++int au_iinfo_init(struct inode *inode);
++void au_iinfo_fin(struct inode *inode);
++int au_hinode_realloc(struct au_iinfo *iinfo, int nbr, int may_shrink);
+
-+ err = au_busy_or_stale();
-+ au_ren_unlock(a);
++#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
++void au_plink_list(struct super_block *sb);
++#else
++AuStubVoid(au_plink_list, struct super_block *sb)
++#endif
++int au_plink_test(struct inode *inode);
++struct dentry *au_plink_lkup(struct inode *inode, aufs_bindex_t bindex);
++void au_plink_append(struct inode *inode, aufs_bindex_t bindex,
++ struct dentry *h_dentry);
++void au_plink_put(struct super_block *sb, int verbose);
++void au_plink_clean(struct super_block *sb, int verbose);
++void au_plink_half_refresh(struct super_block *sb, aufs_bindex_t br_id);
++#else
++AuStubInt0(au_plink_maint, struct super_block *sb, int flags);
++AuStubVoid(au_plink_maint_leave, struct au_sbinfo *sbinfo);
++AuStubInt0(au_plink_maint_enter, struct super_block *sb);
++AuStubVoid(au_plink_list, struct super_block *sb);
++AuStubInt0(au_plink_test, struct inode *inode);
++AuStub(struct dentry *, au_plink_lkup, return NULL,
++ struct inode *inode, aufs_bindex_t bindex);
++AuStubVoid(au_plink_append, struct inode *inode, aufs_bindex_t bindex,
++ struct dentry *h_dentry);
++AuStubVoid(au_plink_put, struct super_block *sb, int verbose);
++AuStubVoid(au_plink_clean, struct super_block *sb, int verbose);
++AuStubVoid(au_plink_half_refresh, struct super_block *sb, aufs_bindex_t br_id);
++#endif /* CONFIG_PROC_FS */
+
-+out:
-+ return err;
-+}
++#ifdef CONFIG_AUFS_XATTR
++/* xattr.c */
++int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags,
++ unsigned int verbose);
++ssize_t aufs_listxattr(struct dentry *dentry, char *list, size_t size);
++void au_xattr_init(struct super_block *sb);
++#else
++AuStubInt0(au_cpup_xattr, struct dentry *h_dst, struct dentry *h_src,
++ int ignore_flags, unsigned int verbose);
++AuStubVoid(au_xattr_init, struct super_block *sb);
++#endif
+
-+/* ---------------------------------------------------------------------- */
++#ifdef CONFIG_FS_POSIX_ACL
++struct posix_acl *aufs_get_acl(struct inode *inode, int type);
++int aufs_set_acl(struct inode *inode, struct posix_acl *acl, int type);
++#endif
+
-+static void au_ren_refresh_dir(struct au_ren_args *a)
-+{
-+ struct inode *dir;
++#if IS_ENABLED(CONFIG_AUFS_XATTR) || IS_ENABLED(CONFIG_FS_POSIX_ACL)
++enum {
++ AU_XATTR_SET,
++ AU_ACL_SET
++};
+
-+ dir = a->dst_dir;
-+ dir->i_version++;
-+ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)) {
-+ /* is this updating defined in POSIX? */
-+ au_cpup_attr_timesizes(a->src_inode);
-+ au_cpup_attr_nlink(dir, /*force*/1);
-+ }
-+ au_dir_ts(dir, a->btgt);
++struct au_sxattr {
++ int type;
++ union {
++ struct {
++ const char *name;
++ const void *value;
++ size_t size;
++ int flags;
++ } set;
++ struct {
++ struct posix_acl *acl;
++ int type;
++ } acl_set;
++ } u;
++};
++ssize_t au_sxattr(struct dentry *dentry, struct inode *inode,
++ struct au_sxattr *arg);
++#endif
+
-+ if (a->exchange) {
-+ dir = a->src_dir;
-+ dir->i_version++;
-+ if (au_ftest_ren(a->auren_flags, ISDIR_DST)) {
-+ /* is this updating defined in POSIX? */
-+ au_cpup_attr_timesizes(a->dst_inode);
-+ au_cpup_attr_nlink(dir, /*force*/1);
-+ }
-+ au_dir_ts(dir, a->btgt);
-+ }
++/* ---------------------------------------------------------------------- */
+
-+ if (au_ftest_ren(a->auren_flags, ISSAMEDIR))
-+ return;
++/* lock subclass for iinfo */
++enum {
++ AuLsc_II_CHILD, /* child first */
++ AuLsc_II_CHILD2, /* rename(2), link(2), and cpup at hnotify */
++ AuLsc_II_CHILD3, /* copyup dirs */
++ AuLsc_II_PARENT, /* see AuLsc_I_PARENT in vfsub.h */
++ AuLsc_II_PARENT2,
++ AuLsc_II_PARENT3, /* copyup dirs */
++ AuLsc_II_NEW_CHILD
++};
+
-+ dir = a->src_dir;
-+ dir->i_version++;
-+ if (au_ftest_ren(a->auren_flags, ISDIR_SRC))
-+ au_cpup_attr_nlink(dir, /*force*/1);
-+ au_dir_ts(dir, a->btgt);
++/*
++ * ii_read_lock_child, ii_write_lock_child,
++ * ii_read_lock_child2, ii_write_lock_child2,
++ * ii_read_lock_child3, ii_write_lock_child3,
++ * ii_read_lock_parent, ii_write_lock_parent,
++ * ii_read_lock_parent2, ii_write_lock_parent2,
++ * ii_read_lock_parent3, ii_write_lock_parent3,
++ * ii_read_lock_new_child, ii_write_lock_new_child,
++ */
++#define AuReadLockFunc(name, lsc) \
++static inline void ii_read_lock_##name(struct inode *i) \
++{ \
++ au_rw_read_lock_nested(&au_ii(i)->ii_rwsem, AuLsc_II_##lsc); \
+}
+
-+static void au_ren_refresh(struct au_ren_args *a)
-+{
-+ aufs_bindex_t bbot, bindex;
-+ struct dentry *d, *h_d;
-+ struct inode *i, *h_i;
-+ struct super_block *sb;
++#define AuWriteLockFunc(name, lsc) \
++static inline void ii_write_lock_##name(struct inode *i) \
++{ \
++ au_rw_write_lock_nested(&au_ii(i)->ii_rwsem, AuLsc_II_##lsc); \
++}
+
-+ d = a->dst_dentry;
-+ d_drop(d);
-+ if (a->h_dst)
-+ /* already dget-ed by au_ren_or_cpup() */
-+ au_set_h_dptr(d, a->btgt, a->h_dst);
++#define AuRWLockFuncs(name, lsc) \
++ AuReadLockFunc(name, lsc) \
++ AuWriteLockFunc(name, lsc)
+
-+ i = a->dst_inode;
-+ if (i) {
-+ if (!a->exchange) {
-+ if (!au_ftest_ren(a->auren_flags, ISDIR_DST))
-+ vfsub_drop_nlink(i);
-+ else {
-+ vfsub_dead_dir(i);
-+ au_cpup_attr_timesizes(i);
-+ }
-+ au_update_dbrange(d, /*do_put_zero*/1);
-+ } else
-+ au_cpup_attr_nlink(i, /*force*/1);
-+ } else {
-+ bbot = a->btgt;
-+ for (bindex = au_dbtop(d); bindex < bbot; bindex++)
-+ au_set_h_dptr(d, bindex, NULL);
-+ bbot = au_dbbot(d);
-+ for (bindex = a->btgt + 1; bindex <= bbot; bindex++)
-+ au_set_h_dptr(d, bindex, NULL);
-+ au_update_dbrange(d, /*do_put_zero*/0);
-+ }
++AuRWLockFuncs(child, CHILD);
++AuRWLockFuncs(child2, CHILD2);
++AuRWLockFuncs(child3, CHILD3);
++AuRWLockFuncs(parent, PARENT);
++AuRWLockFuncs(parent2, PARENT2);
++AuRWLockFuncs(parent3, PARENT3);
++AuRWLockFuncs(new_child, NEW_CHILD);
+
-+ if (a->exchange
-+ || au_ftest_ren(a->auren_flags, DIRREN)) {
-+ d_drop(a->src_dentry);
-+ if (au_ftest_ren(a->auren_flags, DIRREN))
-+ au_set_dbwh(a->src_dentry, -1);
-+ return;
-+ }
++#undef AuReadLockFunc
++#undef AuWriteLockFunc
++#undef AuRWLockFuncs
+
-+ d = a->src_dentry;
-+ au_set_dbwh(d, -1);
-+ bbot = au_dbbot(d);
-+ for (bindex = a->btgt + 1; bindex <= bbot; bindex++) {
-+ h_d = au_h_dptr(d, bindex);
-+ if (h_d)
-+ au_set_h_dptr(d, bindex, NULL);
-+ }
-+ au_set_dbbot(d, a->btgt);
++#define ii_read_unlock(i) au_rw_read_unlock(&au_ii(i)->ii_rwsem)
++#define ii_write_unlock(i) au_rw_write_unlock(&au_ii(i)->ii_rwsem)
++#define ii_downgrade_lock(i) au_rw_dgrade_lock(&au_ii(i)->ii_rwsem)
+
-+ sb = d->d_sb;
-+ i = a->src_inode;
-+ if (au_opt_test(au_mntflags(sb), PLINK) && au_plink_test(i))
-+ return; /* success */
++#define IiMustNoWaiters(i) AuRwMustNoWaiters(&au_ii(i)->ii_rwsem)
++#define IiMustAnyLock(i) AuRwMustAnyLock(&au_ii(i)->ii_rwsem)
++#define IiMustWriteLock(i) AuRwMustWriteLock(&au_ii(i)->ii_rwsem)
+
-+ bbot = au_ibbot(i);
-+ for (bindex = a->btgt + 1; bindex <= bbot; bindex++) {
-+ h_i = au_h_iptr(i, bindex);
-+ if (h_i) {
-+ au_xino_write(sb, bindex, h_i->i_ino, /*ino*/0);
-+ /* ignore this error */
-+ au_set_h_iptr(i, bindex, NULL, 0);
-+ }
-+ }
-+ au_set_ibbot(i, a->btgt);
++/* ---------------------------------------------------------------------- */
++
++static inline void au_icntnr_init(struct au_icntnr *c)
++{
++#ifdef CONFIG_AUFS_DEBUG
++ c->vfs_inode.i_mode = 0;
++#endif
+}
+
-+/* ---------------------------------------------------------------------- */
++static inline unsigned int au_iigen(struct inode *inode, unsigned int *igflags)
++{
++ unsigned int gen;
++ struct au_iinfo *iinfo;
++ struct au_iigen *iigen;
+
-+/* mainly for link(2) and rename(2) */
-+int au_wbr(struct dentry *dentry, aufs_bindex_t btgt)
++ iinfo = au_ii(inode);
++ iigen = &iinfo->ii_generation;
++ spin_lock(&iigen->ig_spin);
++ if (igflags)
++ *igflags = iigen->ig_flags;
++ gen = iigen->ig_generation;
++ spin_unlock(&iigen->ig_spin);
++
++ return gen;
++}
++
++/* tiny test for inode number */
++/* tmpfs generation is too rough */
++static inline int au_test_higen(struct inode *inode, struct inode *h_inode)
+{
-+ aufs_bindex_t bdiropq, bwh;
-+ struct dentry *parent;
-+ struct au_branch *br;
++ struct au_iinfo *iinfo;
+
-+ parent = dentry->d_parent;
-+ IMustLock(d_inode(parent)); /* dir is locked */
++ iinfo = au_ii(inode);
++ AuRwMustAnyLock(&iinfo->ii_rwsem);
++ return !(iinfo->ii_hsb1 == h_inode->i_sb
++ && iinfo->ii_higen == h_inode->i_generation);
++}
+
-+ bdiropq = au_dbdiropq(parent);
-+ bwh = au_dbwh(dentry);
-+ br = au_sbr(dentry->d_sb, btgt);
-+ if (au_br_rdonly(br)
-+ || (0 <= bdiropq && bdiropq < btgt)
-+ || (0 <= bwh && bwh < btgt))
-+ btgt = -1;
++static inline void au_iigen_dec(struct inode *inode)
++{
++ struct au_iinfo *iinfo;
++ struct au_iigen *iigen;
+
-+ AuDbg("btgt %d\n", btgt);
-+ return btgt;
++ iinfo = au_ii(inode);
++ iigen = &iinfo->ii_generation;
++ spin_lock(&iigen->ig_spin);
++ iigen->ig_generation--;
++ spin_unlock(&iigen->ig_spin);
+}
+
-+/* sets src_btop, dst_btop and btgt */
-+static int au_ren_wbr(struct au_ren_args *a)
++static inline int au_iigen_test(struct inode *inode, unsigned int sigen)
+{
+ int err;
-+ struct au_wr_dir_args wr_dir_args = {
-+ /* .force_btgt = -1, */
-+ .flags = AuWrDir_ADD_ENTRY
-+ };
+
-+ a->src_btop = au_dbtop(a->src_dentry);
-+ a->dst_btop = au_dbtop(a->dst_dentry);
-+ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)
-+ || au_ftest_ren(a->auren_flags, ISDIR_DST))
-+ au_fset_wrdir(wr_dir_args.flags, ISDIR);
-+ wr_dir_args.force_btgt = a->src_btop;
-+ if (a->dst_inode && a->dst_btop < a->src_btop)
-+ wr_dir_args.force_btgt = a->dst_btop;
-+ wr_dir_args.force_btgt = au_wbr(a->dst_dentry, wr_dir_args.force_btgt);
-+ err = au_wr_dir(a->dst_dentry, a->src_dentry, &wr_dir_args);
-+ a->btgt = err;
-+ if (a->exchange)
-+ au_update_dbtop(a->dst_dentry);
++ err = 0;
++ if (unlikely(inode && au_iigen(inode, NULL) != sigen))
++ err = -EIO;
+
+ return err;
+}
+
-+static void au_ren_dt(struct au_ren_args *a)
++/* ---------------------------------------------------------------------- */
++
++static inline struct au_hinode *au_hinode(struct au_iinfo *iinfo,
++ aufs_bindex_t bindex)
+{
-+ a->h_path.dentry = a->src_h_parent;
-+ au_dtime_store(a->src_dt + AuPARENT, a->src_parent, &a->h_path);
-+ if (!au_ftest_ren(a->auren_flags, ISSAMEDIR)) {
-+ a->h_path.dentry = a->dst_h_parent;
-+ au_dtime_store(a->dst_dt + AuPARENT, a->dst_parent, &a->h_path);
-+ }
++ return iinfo->ii_hinode + bindex;
++}
+
-+ au_fclr_ren(a->auren_flags, DT_DSTDIR);
-+ if (!au_ftest_ren(a->auren_flags, ISDIR_SRC)
-+ && !a->exchange)
-+ return;
++static inline int au_is_bad_inode(struct inode *inode)
++{
++ return !!(is_bad_inode(inode) || !au_hinode(au_ii(inode), 0));
++}
+
-+ a->h_path.dentry = a->src_h_dentry;
-+ au_dtime_store(a->src_dt + AuCHILD, a->src_dentry, &a->h_path);
-+ if (d_is_positive(a->dst_h_dentry)) {
-+ au_fset_ren(a->auren_flags, DT_DSTDIR);
-+ a->h_path.dentry = a->dst_h_dentry;
-+ au_dtime_store(a->dst_dt + AuCHILD, a->dst_dentry, &a->h_path);
-+ }
++static inline aufs_bindex_t au_ii_br_id(struct inode *inode,
++ aufs_bindex_t bindex)
++{
++ IiMustAnyLock(inode);
++ return au_hinode(au_ii(inode), bindex)->hi_id;
+}
+
-+static void au_ren_rev_dt(int err, struct au_ren_args *a)
++static inline aufs_bindex_t au_ibtop(struct inode *inode)
+{
-+ struct dentry *h_d;
-+ struct inode *h_inode;
++ IiMustAnyLock(inode);
++ return au_ii(inode)->ii_btop;
++}
+
-+ au_dtime_revert(a->src_dt + AuPARENT);
-+ if (!au_ftest_ren(a->auren_flags, ISSAMEDIR))
-+ au_dtime_revert(a->dst_dt + AuPARENT);
++static inline aufs_bindex_t au_ibbot(struct inode *inode)
++{
++ IiMustAnyLock(inode);
++ return au_ii(inode)->ii_bbot;
++}
+
-+ if (au_ftest_ren(a->auren_flags, ISDIR_SRC) && err != -EIO) {
-+ h_d = a->src_dt[AuCHILD].dt_h_path.dentry;
-+ h_inode = d_inode(h_d);
-+ inode_lock_nested(h_inode, AuLsc_I_CHILD);
-+ au_dtime_revert(a->src_dt + AuCHILD);
-+ inode_unlock(h_inode);
++static inline struct au_vdir *au_ivdir(struct inode *inode)
++{
++ IiMustAnyLock(inode);
++ return au_ii(inode)->ii_vdir;
++}
+
-+ if (au_ftest_ren(a->auren_flags, DT_DSTDIR)) {
-+ h_d = a->dst_dt[AuCHILD].dt_h_path.dentry;
-+ h_inode = d_inode(h_d);
-+ inode_lock_nested(h_inode, AuLsc_I_CHILD);
-+ au_dtime_revert(a->dst_dt + AuCHILD);
-+ inode_unlock(h_inode);
-+ }
-+ }
++static inline struct dentry *au_hi_wh(struct inode *inode, aufs_bindex_t bindex)
++{
++ IiMustAnyLock(inode);
++ return au_hinode(au_ii(inode), bindex)->hi_whdentry;
++}
++
++static inline void au_set_ibtop(struct inode *inode, aufs_bindex_t bindex)
++{
++ IiMustWriteLock(inode);
++ au_ii(inode)->ii_btop = bindex;
++}
++
++static inline void au_set_ibbot(struct inode *inode, aufs_bindex_t bindex)
++{
++ IiMustWriteLock(inode);
++ au_ii(inode)->ii_bbot = bindex;
++}
++
++static inline void au_set_ivdir(struct inode *inode, struct au_vdir *vdir)
++{
++ IiMustWriteLock(inode);
++ au_ii(inode)->ii_vdir = vdir;
++}
++
++static inline struct au_hinode *au_hi(struct inode *inode, aufs_bindex_t bindex)
++{
++ IiMustAnyLock(inode);
++ return au_hinode(au_ii(inode), bindex);
+}
+
+/* ---------------------------------------------------------------------- */
+
-+int aufs_rename(struct inode *_src_dir, struct dentry *_src_dentry,
-+ struct inode *_dst_dir, struct dentry *_dst_dentry,
-+ unsigned int _flags)
++static inline struct dentry *au_pinned_parent(struct au_pin *pin)
+{
-+ int err, lock_flags;
-+ void *rev;
-+ /* reduce stack space */
-+ struct au_ren_args *a;
-+ struct au_pin pin;
++ if (pin)
++ return pin->parent;
++ return NULL;
++}
+
-+ AuDbg("%pd, %pd, 0x%x\n", _src_dentry, _dst_dentry, _flags);
-+ IMustLock(_src_dir);
-+ IMustLock(_dst_dir);
++static inline struct inode *au_pinned_h_dir(struct au_pin *pin)
++{
++ if (pin && pin->hdir)
++ return pin->hdir->hi_inode;
++ return NULL;
++}
+
-+ err = -EINVAL;
-+ if (unlikely(_flags & RENAME_WHITEOUT))
-+ goto out;
++static inline struct au_hinode *au_pinned_hdir(struct au_pin *pin)
++{
++ if (pin)
++ return pin->hdir;
++ return NULL;
++}
+
-+ err = -ENOMEM;
-+ BUILD_BUG_ON(sizeof(*a) > PAGE_SIZE);
-+ a = kzalloc(sizeof(*a), GFP_NOFS);
-+ if (unlikely(!a))
-+ goto out;
++static inline void au_pin_set_dentry(struct au_pin *pin, struct dentry *dentry)
++{
++ if (pin)
++ pin->dentry = dentry;
++}
+
-+ a->flags = _flags;
-+ a->exchange = _flags & RENAME_EXCHANGE;
-+ a->src_dir = _src_dir;
-+ a->src_dentry = _src_dentry;
-+ a->src_inode = NULL;
-+ if (d_really_is_positive(a->src_dentry))
-+ a->src_inode = d_inode(a->src_dentry);
-+ a->src_parent = a->src_dentry->d_parent; /* dir inode is locked */
-+ a->dst_dir = _dst_dir;
-+ a->dst_dentry = _dst_dentry;
-+ a->dst_inode = NULL;
-+ if (d_really_is_positive(a->dst_dentry))
-+ a->dst_inode = d_inode(a->dst_dentry);
-+ a->dst_parent = a->dst_dentry->d_parent; /* dir inode is locked */
-+ if (a->dst_inode) {
-+ /*
-+ * if EXCHANGE && src is non-dir && dst is dir,
-+ * dst is not locked.
-+ */
-+ /* IMustLock(a->dst_inode); */
-+ au_igrab(a->dst_inode);
++static inline void au_pin_set_parent_lflag(struct au_pin *pin,
++ unsigned char lflag)
++{
++ if (pin) {
++ if (lflag)
++ au_fset_pin(pin->flags, DI_LOCKED);
++ else
++ au_fclr_pin(pin->flags, DI_LOCKED);
+ }
++}
+
-+ err = -ENOTDIR;
-+ lock_flags = AuLock_FLUSH | AuLock_NOPLM | AuLock_GEN;
-+ if (d_is_dir(a->src_dentry)) {
-+ au_fset_ren(a->auren_flags, ISDIR_SRC);
-+ if (unlikely(!a->exchange
-+ && d_really_is_positive(a->dst_dentry)
-+ && !d_is_dir(a->dst_dentry)))
-+ goto out_free;
-+ lock_flags |= AuLock_DIRS;
-+ }
-+ if (a->dst_inode && d_is_dir(a->dst_dentry)) {
-+ au_fset_ren(a->auren_flags, ISDIR_DST);
-+ if (unlikely(!a->exchange
-+ && d_really_is_positive(a->src_dentry)
-+ && !d_is_dir(a->src_dentry)))
-+ goto out_free;
-+ lock_flags |= AuLock_DIRS;
++#if 0 /* reserved */
++static inline void au_pin_set_parent(struct au_pin *pin, struct dentry *parent)
++{
++ if (pin) {
++ dput(pin->parent);
++ pin->parent = dget(parent);
+ }
-+ err = aufs_read_and_write_lock2(a->dst_dentry, a->src_dentry,
-+ lock_flags);
-+ if (unlikely(err))
-+ goto out_free;
++}
++#endif
+
-+ err = au_d_hashed_positive(a->src_dentry);
-+ if (unlikely(err))
-+ goto out_unlock;
-+ err = -ENOENT;
-+ if (a->dst_inode) {
-+ /*
-+ * If it is a dir, VFS unhash it before this
-+ * function. It means we cannot rely upon d_unhashed().
-+ */
-+ if (unlikely(!a->dst_inode->i_nlink))
-+ goto out_unlock;
-+ if (!au_ftest_ren(a->auren_flags, ISDIR_DST)) {
-+ err = au_d_hashed_positive(a->dst_dentry);
-+ if (unlikely(err && !a->exchange))
-+ goto out_unlock;
-+ } else if (unlikely(IS_DEADDIR(a->dst_inode)))
-+ goto out_unlock;
-+ } else if (unlikely(d_unhashed(a->dst_dentry)))
-+ goto out_unlock;
++/* ---------------------------------------------------------------------- */
++
++struct au_branch;
++#ifdef CONFIG_AUFS_HNOTIFY
++struct au_hnotify_op {
++ void (*ctl)(struct au_hinode *hinode, int do_set);
++ int (*alloc)(struct au_hinode *hinode);
+
+ /*
-+ * is it possible?
-+ * yes, it happened (in linux-3.3-rcN) but I don't know why.
-+ * there may exist a problem somewhere else.
++ * if it returns true, the the caller should free hinode->hi_notify,
++ * otherwise ->free() frees it.
+ */
-+ err = -EINVAL;
-+ if (unlikely(d_inode(a->dst_parent) == d_inode(a->src_dentry)))
-+ goto out_unlock;
++ int (*free)(struct au_hinode *hinode,
++ struct au_hnotify *hn) __must_check;
+
-+ au_fset_ren(a->auren_flags, ISSAMEDIR); /* temporary */
-+ di_write_lock_parent(a->dst_parent);
++ void (*fin)(void);
++ int (*init)(void);
+
-+ /* which branch we process */
-+ err = au_ren_wbr(a);
-+ if (unlikely(err < 0))
-+ goto out_parent;
-+ a->br = au_sbr(a->dst_dentry->d_sb, a->btgt);
-+ a->h_path.mnt = au_br_mnt(a->br);
++ int (*reset_br)(unsigned int udba, struct au_branch *br, int perm);
++ void (*fin_br)(struct au_branch *br);
++ int (*init_br)(struct au_branch *br, int perm);
++};
+
-+ /* are they available to be renamed */
-+ err = au_ren_may_dir(a);
-+ if (unlikely(err))
-+ goto out_children;
++/* hnotify.c */
++int au_hn_alloc(struct au_hinode *hinode, struct inode *inode);
++void au_hn_free(struct au_hinode *hinode);
++void au_hn_ctl(struct au_hinode *hinode, int do_set);
++void au_hn_reset(struct inode *inode, unsigned int flags);
++int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
++ struct qstr *h_child_qstr, struct inode *h_child_inode);
++int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm);
++int au_hnotify_init_br(struct au_branch *br, int perm);
++void au_hnotify_fin_br(struct au_branch *br);
++int __init au_hnotify_init(void);
++void au_hnotify_fin(void);
+
-+ /* prepare the writable parent dir on the same branch */
-+ if (a->dst_btop == a->btgt) {
-+ au_fset_ren(a->auren_flags, WHDST);
-+ } else {
-+ err = au_cpup_dirs(a->dst_dentry, a->btgt);
-+ if (unlikely(err))
-+ goto out_children;
-+ }
++/* hfsnotify.c */
++extern const struct au_hnotify_op au_hnotify_op;
+
-+ err = 0;
-+ if (!a->exchange) {
-+ if (a->src_dir != a->dst_dir) {
-+ /*
-+ * this temporary unlock is safe,
-+ * because both dir->i_mutex are locked.
-+ */
-+ di_write_unlock(a->dst_parent);
-+ di_write_lock_parent(a->src_parent);
-+ err = au_wr_dir_need_wh(a->src_dentry,
-+ au_ftest_ren(a->auren_flags,
-+ ISDIR_SRC),
-+ &a->btgt);
-+ di_write_unlock(a->src_parent);
-+ di_write_lock2_parent(a->src_parent, a->dst_parent,
-+ /*isdir*/1);
-+ au_fclr_ren(a->auren_flags, ISSAMEDIR);
-+ } else
-+ err = au_wr_dir_need_wh(a->src_dentry,
-+ au_ftest_ren(a->auren_flags,
-+ ISDIR_SRC),
-+ &a->btgt);
-+ }
-+ if (unlikely(err < 0))
-+ goto out_children;
-+ if (err)
-+ au_fset_ren(a->auren_flags, WHSRC);
++static inline
++void au_hn_init(struct au_hinode *hinode)
++{
++ hinode->hi_notify = NULL;
++}
+
-+ /* cpup src */
-+ if (a->src_btop != a->btgt) {
-+ err = au_pin(&pin, a->src_dentry, a->btgt,
-+ au_opt_udba(a->src_dentry->d_sb),
-+ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
-+ if (!err) {
-+ struct au_cp_generic cpg = {
-+ .dentry = a->src_dentry,
-+ .bdst = a->btgt,
-+ .bsrc = a->src_btop,
-+ .len = -1,
-+ .pin = &pin,
-+ .flags = AuCpup_DTIME | AuCpup_HOPEN
-+ };
-+ AuDebugOn(au_dbtop(a->src_dentry) != a->src_btop);
-+ err = au_sio_cpup_simple(&cpg);
-+ au_unpin(&pin);
-+ }
-+ if (unlikely(err))
-+ goto out_children;
-+ a->src_btop = a->btgt;
-+ a->src_h_dentry = au_h_dptr(a->src_dentry, a->btgt);
-+ if (!a->exchange)
-+ au_fset_ren(a->auren_flags, WHSRC);
-+ }
++static inline struct au_hnotify *au_hn(struct au_hinode *hinode)
++{
++ return hinode->hi_notify;
++}
+
-+ /* cpup dst */
-+ if (a->exchange && a->dst_inode
-+ && a->dst_btop != a->btgt) {
-+ err = au_pin(&pin, a->dst_dentry, a->btgt,
-+ au_opt_udba(a->dst_dentry->d_sb),
-+ AuPin_DI_LOCKED | AuPin_MNT_WRITE);
-+ if (!err) {
-+ struct au_cp_generic cpg = {
-+ .dentry = a->dst_dentry,
-+ .bdst = a->btgt,
-+ .bsrc = a->dst_btop,
-+ .len = -1,
-+ .pin = &pin,
-+ .flags = AuCpup_DTIME | AuCpup_HOPEN
-+ };
-+ err = au_sio_cpup_simple(&cpg);
-+ au_unpin(&pin);
-+ }
-+ if (unlikely(err))
-+ goto out_children;
-+ a->dst_btop = a->btgt;
-+ a->dst_h_dentry = au_h_dptr(a->dst_dentry, a->btgt);
-+ }
++#else
++AuStub(int, au_hn_alloc, return -EOPNOTSUPP,
++ struct au_hinode *hinode __maybe_unused,
++ struct inode *inode __maybe_unused)
++AuStub(struct au_hnotify *, au_hn, return NULL, struct au_hinode *hinode)
++AuStubVoid(au_hn_free, struct au_hinode *hinode __maybe_unused)
++AuStubVoid(au_hn_ctl, struct au_hinode *hinode __maybe_unused,
++ int do_set __maybe_unused)
++AuStubVoid(au_hn_reset, struct inode *inode __maybe_unused,
++ unsigned int flags __maybe_unused)
++AuStubInt0(au_hnotify_reset_br, unsigned int udba __maybe_unused,
++ struct au_branch *br __maybe_unused,
++ int perm __maybe_unused)
++AuStubInt0(au_hnotify_init_br, struct au_branch *br __maybe_unused,
++ int perm __maybe_unused)
++AuStubVoid(au_hnotify_fin_br, struct au_branch *br __maybe_unused)
++AuStubInt0(__init au_hnotify_init, void)
++AuStubVoid(au_hnotify_fin, void)
++AuStubVoid(au_hn_init, struct au_hinode *hinode __maybe_unused)
++#endif /* CONFIG_AUFS_HNOTIFY */
++
++static inline void au_hn_suspend(struct au_hinode *hdir)
++{
++ au_hn_ctl(hdir, /*do_set*/0);
++}
++
++static inline void au_hn_resume(struct au_hinode *hdir)
++{
++ au_hn_ctl(hdir, /*do_set*/1);
++}
++
++static inline void au_hn_inode_lock(struct au_hinode *hdir)
++{
++ inode_lock(hdir->hi_inode);
++ au_hn_suspend(hdir);
++}
++
++static inline void au_hn_inode_lock_nested(struct au_hinode *hdir,
++ unsigned int sc __maybe_unused)
++{
++ inode_lock_nested(hdir->hi_inode, sc);
++ au_hn_suspend(hdir);
++}
++
++#if 0 /* unused */
++#include "vfsub.h"
++static inline void au_hn_inode_lock_shared_nested(struct au_hinode *hdir,
++ unsigned int sc)
++{
++ vfsub_inode_lock_shared_nested(hdir->hi_inode, sc);
++ au_hn_suspend(hdir);
++}
++#endif
++
++static inline void au_hn_inode_unlock(struct au_hinode *hdir)
++{
++ au_hn_resume(hdir);
++ inode_unlock(hdir->hi_inode);
++}
++
++#endif /* __KERNEL__ */
++#endif /* __AUFS_INODE_H__ */
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/ioctl.c linux-4.14/fs/aufs/ioctl.c
+--- linux-4.14/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/ioctl.c 2021-02-24 21:42:43.444448075 +0100
+@@ -0,0 +1,219 @@
++/*
++ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ *
++ * This program, aufs 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/>.
++ */
+
-+ /* lock them all */
-+ err = au_ren_lock(a);
-+ if (unlikely(err))
-+ /* leave the copied-up one */
-+ goto out_children;
++/*
++ * ioctl
++ * plink-management and readdir in userspace.
++ * assist the pathconf(3) wrapper library.
++ * move-down
++ * File-based Hierarchical Storage Management.
++ */
+
-+ if (!a->exchange) {
-+ if (!au_opt_test(au_mntflags(a->dst_dir->i_sb), UDBA_NONE))
-+ err = au_may_ren(a);
-+ else if (unlikely(a->dst_dentry->d_name.len > AUFS_MAX_NAMELEN))
-+ err = -ENAMETOOLONG;
-+ if (unlikely(err))
-+ goto out_hdir;
-+ }
++#include <linux/compat.h>
++#include <linux/file.h>
++#include "aufs.h"
+
-+ /* store timestamps to be revertible */
-+ au_ren_dt(a);
++static int au_wbr_fd(struct path *path, struct aufs_wbr_fd __user *arg)
++{
++ int err, fd;
++ aufs_bindex_t wbi, bindex, bbot;
++ struct file *h_file;
++ struct super_block *sb;
++ struct dentry *root;
++ struct au_branch *br;
++ struct aufs_wbr_fd wbrfd = {
++ .oflags = au_dir_roflags,
++ .brid = -1
++ };
++ const int valid = O_RDONLY | O_NONBLOCK | O_LARGEFILE | O_DIRECTORY
++ | O_NOATIME | O_CLOEXEC;
+
-+ /* store dirren info */
-+ if (au_ftest_ren(a->auren_flags, DIRREN)) {
-+ err = au_dr_rename(a->src_dentry, a->btgt,
-+ &a->dst_dentry->d_name, &rev);
-+ AuTraceErr(err);
-+ if (unlikely(err))
-+ goto out_dt;
-+ }
++ AuDebugOn(wbrfd.oflags & ~valid);
+
-+ /* here we go */
-+ err = do_rename(a);
-+ if (unlikely(err))
-+ goto out_dirren;
++ if (arg) {
++ err = copy_from_user(&wbrfd, arg, sizeof(wbrfd));
++ if (unlikely(err)) {
++ err = -EFAULT;
++ goto out;
++ }
+
-+ if (au_ftest_ren(a->auren_flags, DIRREN))
-+ au_dr_rename_fin(a->src_dentry, a->btgt, rev);
++ err = -EINVAL;
++ AuDbg("wbrfd{0%o, %d}\n", wbrfd.oflags, wbrfd.brid);
++ wbrfd.oflags |= au_dir_roflags;
++ AuDbg("0%o\n", wbrfd.oflags);
++ if (unlikely(wbrfd.oflags & ~valid))
++ goto out;
++ }
+
-+ /* update dir attributes */
-+ au_ren_refresh_dir(a);
++ fd = get_unused_fd_flags(0);
++ err = fd;
++ if (unlikely(fd < 0))
++ goto out;
+
-+ /* dput/iput all lower dentries */
-+ au_ren_refresh(a);
++ h_file = ERR_PTR(-EINVAL);
++ wbi = 0;
++ br = NULL;
++ sb = path->dentry->d_sb;
++ root = sb->s_root;
++ aufs_read_lock(root, AuLock_IR);
++ bbot = au_sbbot(sb);
++ if (wbrfd.brid >= 0) {
++ wbi = au_br_index(sb, wbrfd.brid);
++ if (unlikely(wbi < 0 || wbi > bbot))
++ goto out_unlock;
++ }
+
-+ goto out_hdir; /* success */
++ h_file = ERR_PTR(-ENOENT);
++ br = au_sbr(sb, wbi);
++ if (!au_br_writable(br->br_perm)) {
++ if (arg)
++ goto out_unlock;
+
-+out_dirren:
-+ if (au_ftest_ren(a->auren_flags, DIRREN))
-+ au_dr_rename_rev(a->src_dentry, a->btgt, rev);
-+out_dt:
-+ au_ren_rev_dt(err, a);
-+out_hdir:
-+ au_ren_unlock(a);
-+out_children:
-+ au_nhash_wh_free(&a->whlist);
-+ if (err && a->dst_inode && a->dst_btop != a->btgt) {
-+ AuDbg("btop %d, btgt %d\n", a->dst_btop, a->btgt);
-+ au_set_h_dptr(a->dst_dentry, a->btgt, NULL);
-+ au_set_dbtop(a->dst_dentry, a->dst_btop);
-+ }
-+out_parent:
-+ if (!err) {
-+ if (d_unhashed(a->src_dentry))
-+ au_fset_ren(a->auren_flags, DROPPED_SRC);
-+ if (d_unhashed(a->dst_dentry))
-+ au_fset_ren(a->auren_flags, DROPPED_DST);
-+ if (!a->exchange)
-+ d_move(a->src_dentry, a->dst_dentry);
-+ else {
-+ d_exchange(a->src_dentry, a->dst_dentry);
-+ if (au_ftest_ren(a->auren_flags, DROPPED_DST))
-+ d_drop(a->dst_dentry);
++ bindex = wbi + 1;
++ wbi = -1;
++ for (; bindex <= bbot; bindex++) {
++ br = au_sbr(sb, bindex);
++ if (au_br_writable(br->br_perm)) {
++ wbi = bindex;
++ br = au_sbr(sb, wbi);
++ break;
++ }
+ }
-+ if (au_ftest_ren(a->auren_flags, DROPPED_SRC))
-+ d_drop(a->src_dentry);
-+ } else {
-+ au_update_dbtop(a->dst_dentry);
-+ if (!a->dst_inode)
-+ d_drop(a->dst_dentry);
+ }
-+ if (au_ftest_ren(a->auren_flags, ISSAMEDIR))
-+ di_write_unlock(a->dst_parent);
-+ else
-+ di_write_unlock2(a->src_parent, a->dst_parent);
++ AuDbg("wbi %d\n", wbi);
++ if (wbi >= 0)
++ h_file = au_h_open(root, wbi, wbrfd.oflags, NULL,
++ /*force_wr*/0);
++
+out_unlock:
-+ aufs_read_and_write_unlock2(a->dst_dentry, a->src_dentry);
-+out_free:
-+ iput(a->dst_inode);
-+ if (a->thargs)
-+ au_whtmp_rmdir_free(a->thargs);
-+ kfree(a);
++ aufs_read_unlock(root, AuLock_IR);
++ err = PTR_ERR(h_file);
++ if (IS_ERR(h_file))
++ goto out_fd;
++
++ au_br_put(br); /* cf. au_h_open() */
++ fd_install(fd, h_file);
++ err = fd;
++ goto out; /* success */
++
++out_fd:
++ put_unused_fd(fd);
+out:
+ AuTraceErr(err);
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
---- /usr/share/empty/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Kconfig 2017-11-12 22:24:44.697577553 +0100
-@@ -0,0 +1,198 @@
-+config AUFS_FS
-+ tristate "Aufs (Advanced multi layered unification filesystem) support"
-+ help
-+ Aufs is a stackable unification filesystem such as Unionfs,
-+ which unifies several directories and provides a merged single
-+ directory.
-+ In the early days, aufs was entirely re-designed and
-+ re-implemented Unionfs Version 1.x series. Introducing many
-+ original ideas, approaches and improvements, it becomes totally
-+ different from Unionfs while keeping the basic features.
+
-+if AUFS_FS
-+choice
-+ prompt "Maximum number of branches"
-+ default AUFS_BRANCH_MAX_127
-+ help
-+ Specifies the maximum number of branches (or member directories)
-+ in a single aufs. The larger value consumes more system
-+ resources and has a minor impact to performance.
-+config AUFS_BRANCH_MAX_127
-+ bool "127"
-+ help
-+ Specifies the maximum number of branches (or member directories)
-+ in a single aufs. The larger value consumes more system
-+ resources and has a minor impact to performance.
-+config AUFS_BRANCH_MAX_511
-+ bool "511"
-+ help
-+ Specifies the maximum number of branches (or member directories)
-+ in a single aufs. The larger value consumes more system
-+ resources and has a minor impact to performance.
-+config AUFS_BRANCH_MAX_1023
-+ bool "1023"
-+ help
-+ Specifies the maximum number of branches (or member directories)
-+ in a single aufs. The larger value consumes more system
-+ resources and has a minor impact to performance.
-+config AUFS_BRANCH_MAX_32767
-+ bool "32767"
-+ help
-+ Specifies the maximum number of branches (or member directories)
-+ in a single aufs. The larger value consumes more system
-+ resources and has a minor impact to performance.
-+endchoice
++/* ---------------------------------------------------------------------- */
+
-+config AUFS_SBILIST
-+ bool
-+ depends on AUFS_MAGIC_SYSRQ || PROC_FS
-+ default y
-+ help
-+ Automatic configuration for internal use.
-+ When aufs supports Magic SysRq or /proc, enabled automatically.
++long aufs_ioctl_dir(struct file *file, unsigned int cmd, unsigned long arg)
++{
++ long err;
++ struct dentry *dentry;
+
-+config AUFS_HNOTIFY
-+ bool "Detect direct branch access (bypassing aufs)"
-+ help
-+ If you want to modify files on branches directly, eg. bypassing aufs,
-+ and want aufs to detect the changes of them fully, then enable this
-+ option and use 'udba=notify' mount option.
-+ Currently there is only one available configuration, "fsnotify".
-+ It will have a negative impact to the performance.
-+ See detail in aufs.5.
++ switch (cmd) {
++ case AUFS_CTL_RDU:
++ case AUFS_CTL_RDU_INO:
++ err = au_rdu_ioctl(file, cmd, arg);
++ break;
+
-+choice
-+ prompt "method" if AUFS_HNOTIFY
-+ default AUFS_HFSNOTIFY
-+config AUFS_HFSNOTIFY
-+ bool "fsnotify"
-+ select FSNOTIFY
-+endchoice
++ case AUFS_CTL_WBR_FD:
++ err = au_wbr_fd(&file->f_path, (void __user *)arg);
++ break;
+
-+config AUFS_EXPORT
-+ bool "NFS-exportable aufs"
-+ depends on EXPORTFS
-+ help
-+ If you want to export your mounted aufs via NFS, then enable this
-+ option. There are several requirements for this configuration.
-+ See detail in aufs.5.
++ case AUFS_CTL_IBUSY:
++ err = au_ibusy_ioctl(file, arg);
++ break;
+
-+config AUFS_INO_T_64
-+ bool
-+ depends on AUFS_EXPORT
-+ depends on 64BIT && !(ALPHA || S390)
-+ default y
-+ help
-+ Automatic configuration for internal use.
-+ /* typedef unsigned long/int __kernel_ino_t */
-+ /* alpha and s390x are int */
++ case AUFS_CTL_BRINFO:
++ err = au_brinfo_ioctl(file, arg);
++ break;
+
-+config AUFS_XATTR
-+ bool "support for XATTR/EA (including Security Labels)"
-+ help
-+ If your branch fs supports XATTR/EA and you want to make them
-+ available in aufs too, then enable this opsion and specify the
-+ branch attributes for EA.
-+ See detail in aufs.5.
++ case AUFS_CTL_FHSM_FD:
++ dentry = file->f_path.dentry;
++ if (IS_ROOT(dentry))
++ err = au_fhsm_fd(dentry->d_sb, arg);
++ else
++ err = -ENOTTY;
++ break;
+
-+config AUFS_FHSM
-+ bool "File-based Hierarchical Storage Management"
-+ help
-+ Hierarchical Storage Management (or HSM) is a well-known feature
-+ in the storage world. Aufs provides this feature as file-based.
-+ with multiple branches.
-+ These multiple branches are prioritized, ie. the topmost one
-+ should be the fastest drive and be used heavily.
++ default:
++ /* do not call the lower */
++ AuDbg("0x%x\n", cmd);
++ err = -ENOTTY;
++ }
+
-+config AUFS_RDU
-+ bool "Readdir in userspace"
-+ help
-+ Aufs has two methods to provide a merged view for a directory,
-+ by a user-space library and by kernel-space natively. The latter
-+ is always enabled but sometimes large and slow.
-+ If you enable this option, install the library in aufs2-util
-+ package, and set some environment variables for your readdir(3),
-+ then the work will be handled in user-space which generally
-+ shows better performance in most cases.
-+ See detail in aufs.5.
++ AuTraceErr(err);
++ return err;
++}
+
-+config AUFS_DIRREN
-+ bool "Workaround for rename(2)-ing a directory"
-+ help
-+ By default, aufs returns EXDEV error in renameing a dir who has
-+ his child on the lower branch, since it is a bad idea to issue
-+ rename(2) internally for every lower branch. But user may not
-+ accept this behaviour. So here is a workaround to allow such
-+ rename(2) and store some extra infromation on the writable
-+ branch. Obviously this costs high (and I don't like it).
-+ To use this feature, you need to enable this configuration AND
-+ to specify the mount option `dirren.'
-+ See details in aufs.5 and the design documents.
++long aufs_ioctl_nondir(struct file *file, unsigned int cmd, unsigned long arg)
++{
++ long err;
+
-+config AUFS_SHWH
-+ bool "Show whiteouts"
-+ help
-+ If you want to make the whiteouts in aufs visible, then enable
-+ this option and specify 'shwh' mount option. Although it may
-+ sounds like philosophy or something, but in technically it
-+ simply shows the name of whiteout with keeping its behaviour.
++ switch (cmd) {
++ case AUFS_CTL_MVDOWN:
++ err = au_mvdown(file->f_path.dentry, (void __user *)arg);
++ break;
+
-+config AUFS_BR_RAMFS
-+ bool "Ramfs (initramfs/rootfs) as an aufs branch"
-+ help
-+ If you want to use ramfs as an aufs branch fs, then enable this
-+ option. Generally tmpfs is recommended.
-+ Aufs prohibited them to be a branch fs by default, because
-+ initramfs becomes unusable after switch_root or something
-+ generally. If you sets initramfs as an aufs branch and boot your
-+ system by switch_root, you will meet a problem easily since the
-+ files in initramfs may be inaccessible.
-+ Unless you are going to use ramfs as an aufs branch fs without
-+ switch_root or something, leave it N.
++ case AUFS_CTL_WBR_FD:
++ err = au_wbr_fd(&file->f_path, (void __user *)arg);
++ break;
+
-+config AUFS_BR_FUSE
-+ bool "Fuse fs as an aufs branch"
-+ depends on FUSE_FS
-+ select AUFS_POLL
-+ help
-+ If you want to use fuse-based userspace filesystem as an aufs
-+ branch fs, then enable this option.
-+ It implements the internal poll(2) operation which is
-+ implemented by fuse only (curretnly).
++ default:
++ /* do not call the lower */
++ AuDbg("0x%x\n", cmd);
++ err = -ENOTTY;
++ }
+
-+config AUFS_POLL
-+ bool
-+ help
-+ Automatic configuration for internal use.
++ AuTraceErr(err);
++ return err;
++}
+
-+config AUFS_BR_HFSPLUS
-+ bool "Hfsplus as an aufs branch"
-+ depends on HFSPLUS_FS
-+ default y
-+ help
-+ If you want to use hfsplus fs as an aufs branch fs, then enable
-+ this option. This option introduces a small overhead at
-+ copying-up a file on hfsplus.
++#ifdef CONFIG_COMPAT
++long aufs_compat_ioctl_dir(struct file *file, unsigned int cmd,
++ unsigned long arg)
++{
++ long err;
+
-+config AUFS_BDEV_LOOP
-+ bool
-+ depends on BLK_DEV_LOOP
-+ default y
-+ help
-+ Automatic configuration for internal use.
-+ Convert =[ym] into =y.
++ switch (cmd) {
++ case AUFS_CTL_RDU:
++ case AUFS_CTL_RDU_INO:
++ err = au_rdu_compat_ioctl(file, cmd, arg);
++ break;
+
-+config AUFS_DEBUG
-+ bool "Debug aufs"
-+ help
-+ Enable this to compile aufs internal debug code.
-+ It will have a negative impact to the performance.
++ case AUFS_CTL_IBUSY:
++ err = au_ibusy_compat_ioctl(file, arg);
++ break;
+
-+config AUFS_MAGIC_SYSRQ
-+ bool
-+ depends on AUFS_DEBUG && MAGIC_SYSRQ
-+ default y
-+ help
-+ Automatic configuration for internal use.
-+ When aufs supports Magic SysRq, enabled automatically.
-+endif
-diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
---- /usr/share/empty/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.c 2017-11-12 22:24:42.270843503 +0100
-@@ -0,0 +1,147 @@
++ case AUFS_CTL_BRINFO:
++ err = au_brinfo_compat_ioctl(file, arg);
++ break;
++
++ default:
++ err = aufs_ioctl_dir(file, cmd, arg);
++ }
++
++ AuTraceErr(err);
++ return err;
++}
++
++long aufs_compat_ioctl_nondir(struct file *file, unsigned int cmd,
++ unsigned long arg)
++{
++ return aufs_ioctl_nondir(file, cmd, (unsigned long)compat_ptr(arg));
++}
++#endif
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/loop.c linux-4.14/fs/aufs/loop.c
+--- linux-4.14/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/loop.c 2021-02-24 21:42:43.447781402 +0100
+@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ *
+ symbol_put(loop_backing_file);
+ kfree(au_warn_loopback_array);
+}
-diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
---- /usr/share/empty/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.h 2017-07-29 12:14:25.903042072 +0200
-@@ -0,0 +1,52 @@
++
++/* ---------------------------------------------------------------------- */
++
++/* 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 -urNp -x '*.orig' linux-4.14/fs/aufs/loop.h linux-4.14/fs/aufs/loop.h
+--- linux-4.14/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/loop.h 2021-02-24 21:42:43.447781402 +0100
+@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ *
+
+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)
+
+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__ */
+#endif /* __AUFS_LOOP_H__ */
-diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
---- /usr/share/empty/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/magic.mk 2017-07-29 12:14:25.903042072 +0200
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/magic.mk linux-4.14/fs/aufs/magic.mk
+--- linux-4.14/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/magic.mk 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,30 @@
+
+# defined in ${srctree}/fs/fuse/inode.c
+ifdef CONFIG_HFSPLUS_FS
+ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b
+endif
-diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
---- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile 2017-11-12 22:24:44.697577553 +0100
-@@ -0,0 +1,45 @@
-+
-+include ${src}/magic.mk
-+ifeq (${CONFIG_AUFS_FS},m)
-+include ${src}/conf.mk
-+endif
-+-include ${src}/priv_def.mk
-+
-+# cf. include/linux/kernel.h
-+# enable pr_debug
-+ccflags-y += -DDEBUG
-+# sparse requires the full pathname
-+ifdef M
-+ccflags-y += -include ${M}/../../include/uapi/linux/aufs_type.h
-+else
-+ccflags-y += -include ${srctree}/include/uapi/linux/aufs_type.h
-+endif
-+
-+obj-$(CONFIG_AUFS_FS) += aufs.o
-+aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \
-+ wkq.o vfsub.o dcsub.o \
-+ cpup.o whout.o wbr_policy.o \
-+ dinfo.o dentry.o \
-+ dynop.o \
-+ finfo.o file.o f_op.o \
-+ dir.o vdir.o \
-+ iinfo.o inode.o i_op.o i_op_add.o i_op_del.o i_op_ren.o \
-+ mvdown.o ioctl.o
-+
-+# all are boolean
-+aufs-$(CONFIG_PROC_FS) += procfs.o plink.o
-+aufs-$(CONFIG_SYSFS) += sysfs.o
-+aufs-$(CONFIG_DEBUG_FS) += dbgaufs.o
-+aufs-$(CONFIG_AUFS_BDEV_LOOP) += loop.o
-+aufs-$(CONFIG_AUFS_HNOTIFY) += hnotify.o
-+aufs-$(CONFIG_AUFS_HFSNOTIFY) += hfsnotify.o
-+aufs-$(CONFIG_AUFS_EXPORT) += export.o
-+aufs-$(CONFIG_AUFS_XATTR) += xattr.o
-+aufs-$(CONFIG_FS_POSIX_ACL) += posix_acl.o
-+aufs-$(CONFIG_AUFS_DIRREN) += dirren.o
-+aufs-$(CONFIG_AUFS_FHSM) += fhsm.o
-+aufs-$(CONFIG_AUFS_POLL) += poll.o
-+aufs-$(CONFIG_AUFS_RDU) += rdu.o
-+aufs-$(CONFIG_AUFS_BR_HFSPLUS) += hfsplus.o
-+aufs-$(CONFIG_AUFS_DEBUG) += debug.o
-+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
-diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
---- /usr/share/empty/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/module.c linux-4.14/fs/aufs/module.c
+--- linux-4.14/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/module.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+module_init(aufs_init);
+module_exit(aufs_exit);
-diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
---- /usr/share/empty/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h 2017-11-12 22:24:42.270843503 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/module.h linux-4.14/fs/aufs/module.h
+--- linux-4.14/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/module.h 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_MODULE_H__ */
-diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
---- /usr/share/empty/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/mvdown.c linux-4.14/fs/aufs/mvdown.c
+--- linux-4.14/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/mvdown.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,704 @@
+/*
+ * Copyright (C) 2011-2017 Junjiro R. Okajima
+ AuTraceErr(err);
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
---- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/opts.c linux-4.14/fs/aufs/opts.c
+--- linux-4.14/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/opts.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,1891 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+{
+ return au_mntflags(sb) & AuOptMask_UDBA;
+}
-diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
---- /usr/share/empty/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/opts.h linux-4.14/fs/aufs/opts.h
+--- linux-4.14/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/opts.h 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#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 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/plink.c linux-4.14/fs/aufs/plink.c
+--- linux-4.14/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/plink.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,515 @@
+/*
+ * Copyright (C) 2005-2017 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 2017-11-12 22:24:42.274176929 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/poll.c linux-4.14/fs/aufs/poll.c
+--- linux-4.14/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/poll.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ AuTraceErr((int)mask);
+ return mask;
+}
-diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
---- /usr/share/empty/fs/aufs/posix_acl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/posix_acl.c 2017-11-12 22:24:42.274176929 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/posix_acl.c linux-4.14/fs/aufs/posix_acl.c
+--- linux-4.14/fs/aufs/posix_acl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/posix_acl.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2014-2017 Junjiro R. Okajima
+out:
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
---- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/procfs.c linux-4.14/fs/aufs/procfs.c
+--- linux-4.14/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/procfs.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2010-2017 Junjiro R. Okajima
+out:
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
---- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c 2017-11-12 22:24:42.274176929 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/rdu.c linux-4.14/fs/aufs/rdu.c
+--- linux-4.14/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/rdu.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,381 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ return err;
+}
+#endif
-diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
---- /usr/share/empty/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/rwsem.h linux-4.14/fs/aufs/rwsem.h
+--- linux-4.14/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/rwsem.h 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_RWSEM_H__ */
-diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
---- /usr/share/empty/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sbinfo.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/sbinfo.c linux-4.14/fs/aufs/sbinfo.c
+--- linux-4.14/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/sbinfo.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,304 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ di_write_unlock2(d1, d2);
+ si_read_unlock(d1->d_sb);
+}
-diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
---- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c 2017-11-12 22:24:44.707577830 +0100
-@@ -0,0 +1,1046 @@
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/super.c linux-4.14/fs/aufs/super.c
+--- linux-4.14/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/super.c 2021-02-24 21:42:43.447781402 +0100
+@@ -0,0 +1,1049 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ *
+ .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
+};
+
+/* ---------------------------------------------------------------------- */
+ /* no need to __module_get() and module_put(). */
+ .owner = THIS_MODULE,
+};
-diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
---- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/super.h linux-4.14/fs/aufs/super.h
+--- linux-4.14/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/super.h 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,626 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_SUPER_H__ */
-diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
---- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c 2017-07-29 12:14:25.906375514 +0200
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/sysaufs.c linux-4.14/fs/aufs/sysaufs.c
+--- linux-4.14/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/sysaufs.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+out:
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
---- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.h 2017-07-29 12:14:25.906375514 +0200
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/sysaufs.h linux-4.14/fs/aufs/sysaufs.h
+--- linux-4.14/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/sysaufs.h 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __SYSAUFS_H__ */
-diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
---- /usr/share/empty/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysfs.c 2017-11-12 22:24:42.274176929 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/sysfs.c linux-4.14/fs/aufs/sysfs.c
+--- linux-4.14/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/sysfs.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,376 @@
+/*
+ * Copyright (C) 2005-2017 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 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/sysrq.c linux-4.14/fs/aufs/sysrq.c
+--- linux-4.14/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/sysrq.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ if (unlikely(err))
+ pr_err("err %d (ignored)\n", err);
+}
-diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
---- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c 2017-11-12 22:24:42.274176929 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/vdir.c linux-4.14/fs/aufs/vdir.c
+--- linux-4.14/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/vdir.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,892 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ /* smp_mb(); */
+ return 0;
+}
-diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
---- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/vfsub.c linux-4.14/fs/aufs/vfsub.c
+--- linux-4.14/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/vfsub.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,894 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+ return 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 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/vfsub.h linux-4.14/fs/aufs/vfsub.h
+--- linux-4.14/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/vfsub.h 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,360 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_VFSUB_H__ */
-diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
---- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2017-11-12 22:24:42.274176929 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/wbr_policy.c linux-4.14/fs/aufs/wbr_policy.c
+--- linux-4.14/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/wbr_policy.c 2021-02-24 21:42:43.444448075 +0100
@@ -0,0 +1,830 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ .fin = au_wbr_create_fin_mfs
+ }
+};
-diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
---- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2017-11-12 22:24:42.274176929 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/whout.c linux-4.14/fs/aufs/whout.c
+--- linux-4.14/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/whout.c 2021-02-24 21:42:43.447781402 +0100
@@ -0,0 +1,1061 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+ au_whtmp_rmdir_free(args);
+ }
+}
-diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
---- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h 2017-09-05 10:42:11.058755349 +0200
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/whout.h linux-4.14/fs/aufs/whout.h
+--- linux-4.14/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/whout.h 2021-02-24 21:42:43.447781402 +0100
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_WHOUT_H__ */
-diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
---- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/wkq.c linux-4.14/fs/aufs/wkq.c
+--- linux-4.14/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/wkq.c 2021-02-24 21:42:43.447781402 +0100
@@ -0,0 +1,390 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+ return err;
+}
-diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
---- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/wkq.h linux-4.14/fs/aufs/wkq.h
+--- linux-4.14/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/wkq.h 2021-02-24 21:42:43.447781402 +0100
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_WKQ_H__ */
-diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
---- /usr/share/empty/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c 2017-11-12 22:24:44.707577830 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/xattr.c linux-4.14/fs/aufs/xattr.c
+--- linux-4.14/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/xattr.c 2021-02-24 21:42:43.447781402 +0100
@@ -0,0 +1,355 @@
+/*
+ * Copyright (C) 2014-2017 Junjiro R. Okajima
+{
+ sb->s_xattr = au_xattr_handlers;
+}
-diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
---- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c 2017-11-12 22:24:44.710911257 +0100
+diff -urNp -x '*.orig' linux-4.14/fs/aufs/xino.c linux-4.14/fs/aufs/xino.c
+--- linux-4.14/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/fs/aufs/xino.c 2021-02-24 21:42:43.447781402 +0100
@@ -0,0 +1,1418 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+
+ xino = &au_sbr(sb, bindex)->br_xino;
+
-+again:
-+ spin_lock(&xino->xi_nondir.spin);
-+ found = au_xinondir_find(xino, h_ino);
-+ if (found == -1) {
-+ empty = au_xinondir_find(xino, /*h_ino*/0);
-+ if (empty == -1) {
-+ empty = xino->xi_nondir.total;
-+ err = au_xinondir_expand(xino);
-+ if (unlikely(err))
-+ goto out_unlock;
-+ }
-+ xino->xi_nondir.array[empty] = h_ino;
-+ *idx = empty;
-+ } else {
-+ spin_unlock(&xino->xi_nondir.spin);
-+ wait_event(xino->xi_nondir.wqh,
-+ xino->xi_nondir.array[found] != h_ino);
-+ goto again;
-+ }
++again:
++ spin_lock(&xino->xi_nondir.spin);
++ found = au_xinondir_find(xino, h_ino);
++ if (found == -1) {
++ empty = au_xinondir_find(xino, /*h_ino*/0);
++ if (empty == -1) {
++ empty = xino->xi_nondir.total;
++ err = au_xinondir_expand(xino);
++ if (unlikely(err))
++ goto out_unlock;
++ }
++ xino->xi_nondir.array[empty] = h_ino;
++ *idx = empty;
++ } else {
++ spin_unlock(&xino->xi_nondir.spin);
++ wait_event(xino->xi_nondir.wqh,
++ xino->xi_nondir.array[found] != h_ino);
++ goto again;
++ }
++
++out_unlock:
++ spin_unlock(&xino->xi_nondir.spin);
++out:
++ return err;
++}
+diff -urNp -x '*.orig' linux-4.14/fs/dcache.c linux-4.14/fs/dcache.c
+--- linux-4.14/fs/dcache.c 2021-02-24 21:42:35.464465471 +0100
++++ linux-4.14/fs/dcache.c 2021-02-24 21:42:43.437781422 +0100
+@@ -1217,7 +1217,7 @@ enum d_walk_ret {
+ *
+ * The @enter() and @finish() callbacks are called with d_lock held.
+ */
+-static void d_walk(struct dentry *parent, void *data,
++void d_walk(struct dentry *parent, void *data,
+ enum d_walk_ret (*enter)(void *, struct dentry *),
+ void (*finish)(void *))
+ {
+@@ -1325,6 +1325,7 @@ rename_retry:
+ seq = 1;
+ goto again;
+ }
++EXPORT_SYMBOL_GPL(d_walk);
+
+ struct check_mount {
+ struct vfsmount *mnt;
+@@ -2950,6 +2951,7 @@ void d_exchange(struct dentry *dentry1,
+
+ write_sequnlock(&rename_lock);
+ }
++EXPORT_SYMBOL_GPL(d_exchange);
+
+ /**
+ * d_ancestor - search for an ancestor
+diff -urNp -x '*.orig' linux-4.14/fs/exec.c linux-4.14/fs/exec.c
+--- linux-4.14/fs/exec.c 2021-02-24 21:42:35.467798797 +0100
++++ linux-4.14/fs/exec.c 2021-02-24 21:42:43.437781422 +0100
+@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path
+ return (path->mnt->mnt_flags & MNT_NOEXEC) ||
+ (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
+ }
++EXPORT_SYMBOL_GPL(path_noexec);
+
+ #ifdef CONFIG_USELIB
+ /*
+diff -urNp -x '*.orig' linux-4.14/fs/fcntl.c linux-4.14/fs/fcntl.c
+--- linux-4.14/fs/fcntl.c 2021-02-24 21:42:35.474465447 +0100
++++ linux-4.14/fs/fcntl.c 2021-02-24 21:42:43.437781422 +0100
+@@ -32,7 +32,7 @@
+
+ #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
+
+-static int setfl(int fd, struct file * filp, unsigned long arg)
++int setfl(int fd, struct file * filp, unsigned long arg)
+ {
+ struct inode * inode = file_inode(filp);
+ int error = 0;
+@@ -63,6 +63,8 @@ static int setfl(int fd, struct file * f
+
+ if (filp->f_op->check_flags)
+ error = filp->f_op->check_flags(arg);
++ if (!error && filp->f_op->setfl)
++ error = filp->f_op->setfl(filp, arg);
+ if (error)
+ return error;
+
+@@ -83,6 +85,7 @@ static int setfl(int fd, struct file * f
+ out:
+ return error;
+ }
++EXPORT_SYMBOL_GPL(setfl);
+
+ static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
+ int force)
+diff -urNp -x '*.orig' linux-4.14/fs/file_table.c linux-4.14/fs/file_table.c
+--- linux-4.14/fs/file_table.c 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/fs/file_table.c 2021-02-24 21:42:43.437781422 +0100
+@@ -148,6 +148,7 @@ over:
+ }
+ return ERR_PTR(-ENFILE);
+ }
++EXPORT_SYMBOL_GPL(get_empty_filp);
+
+ /**
+ * alloc_file - allocate and initialize a 'struct file'
+@@ -258,6 +259,7 @@ void flush_delayed_fput(void)
+ {
+ delayed_fput(NULL);
+ }
++EXPORT_SYMBOL_GPL(flush_delayed_fput);
+
+ static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
+
+@@ -300,6 +302,7 @@ void __fput_sync(struct file *file)
+ }
+
+ EXPORT_SYMBOL(fput);
++EXPORT_SYMBOL_GPL(__fput_sync);
+
+ void put_filp(struct file *file)
+ {
+@@ -308,6 +311,7 @@ void put_filp(struct file *file)
+ file_free(file);
+ }
+ }
++EXPORT_SYMBOL_GPL(put_filp);
+
+ void __init files_init(void)
+ {
+diff -urNp -x '*.orig' linux-4.14/fs/inode.c linux-4.14/fs/inode.c
+--- linux-4.14/fs/inode.c 2021-02-24 21:42:35.481132097 +0100
++++ linux-4.14/fs/inode.c 2021-02-24 21:42:43.437781422 +0100
+@@ -1664,7 +1664,7 @@ EXPORT_SYMBOL(generic_update_time);
+ * This does the actual work of updating an inodes time or version. Must have
+ * had called mnt_want_write() before calling this.
+ */
+-static int update_time(struct inode *inode, struct timespec *time, int flags)
++int update_time(struct inode *inode, struct timespec *time, int flags)
+ {
+ int (*update_time)(struct inode *, struct timespec *, int);
+
+@@ -1673,6 +1673,7 @@ static int update_time(struct inode *ino
+
+ return update_time(inode, time, flags);
+ }
++EXPORT_SYMBOL_GPL(update_time);
+
+ /**
+ * touch_atime - update the access time
+diff -urNp -x '*.orig' linux-4.14/fs/namespace.c linux-4.14/fs/namespace.c
+--- linux-4.14/fs/namespace.c 2021-02-24 21:42:35.481132097 +0100
++++ linux-4.14/fs/namespace.c 2021-02-24 21:42:43.437781422 +0100
+@@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *m
+ mnt_dec_writers(real_mount(mnt));
+ preempt_enable();
+ }
++EXPORT_SYMBOL_GPL(__mnt_drop_write);
+
+ /**
+ * mnt_drop_write - give up write access to a mount
+@@ -855,6 +856,13 @@ static inline int check_mnt(struct mount
+ return mnt->mnt_ns == current->nsproxy->mnt_ns;
+ }
+
++/* for aufs, CONFIG_AUFS_BR_FUSE */
++int is_current_mnt_ns(struct vfsmount *mnt)
++{
++ return check_mnt(real_mount(mnt));
++}
++EXPORT_SYMBOL_GPL(is_current_mnt_ns);
++
+ /*
+ * vfsmount lock must be held for write
+ */
+@@ -1918,6 +1926,7 @@ int iterate_mounts(int (*f)(struct vfsmo
+ }
+ return 0;
+ }
++EXPORT_SYMBOL_GPL(iterate_mounts);
+
+ static void cleanup_group_ids(struct mount *mnt, struct mount *end)
+ {
+diff -urNp -x '*.orig' linux-4.14/fs/notify/group.c linux-4.14/fs/notify/group.c
+--- linux-4.14/fs/notify/group.c 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/fs/notify/group.c 2021-02-24 21:42:43.437781422 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/srcu.h>
+ #include <linux/rculist.h>
+ #include <linux/wait.h>
++#include <linux/module.h>
+
+ #include <linux/fsnotify_backend.h>
+ #include "fsnotify.h"
+@@ -109,6 +110,7 @@ void fsnotify_get_group(struct fsnotify_
+ {
+ atomic_inc(&group->refcnt);
+ }
++EXPORT_SYMBOL_GPL(fsnotify_get_group);
+
+ /*
+ * Drop a reference to a group. Free it if it's through.
+@@ -118,6 +120,7 @@ void fsnotify_put_group(struct fsnotify_
+ if (atomic_dec_and_test(&group->refcnt))
+ fsnotify_final_destroy_group(group);
+ }
++EXPORT_SYMBOL_GPL(fsnotify_put_group);
+
+ /*
+ * Create a new fsnotify_group and hold a reference for the group returned.
+@@ -147,6 +150,7 @@ struct fsnotify_group *fsnotify_alloc_gr
+
+ return group;
+ }
++EXPORT_SYMBOL_GPL(fsnotify_alloc_group);
+
+ int fsnotify_fasync(int fd, struct file *file, int on)
+ {
+diff -urNp -x '*.orig' linux-4.14/fs/notify/mark.c linux-4.14/fs/notify/mark.c
+--- linux-4.14/fs/notify/mark.c 2021-02-24 21:42:35.491132073 +0100
++++ linux-4.14/fs/notify/mark.c 2021-02-24 21:42:43.437781422 +0100
+@@ -124,6 +124,7 @@ static void __fsnotify_recalc_mask(struc
+ else if (conn->flags & FSNOTIFY_OBJ_TYPE_VFSMOUNT)
+ real_mount(conn->mnt)->mnt_fsnotify_mask = new_mask;
+ }
++EXPORT_SYMBOL_GPL(fsnotify_put_mark);
+
+ /*
+ * Calculate mask of events for a list of marks. The caller must make sure
+@@ -392,6 +393,7 @@ void fsnotify_destroy_mark(struct fsnoti
+ mutex_unlock(&group->mark_mutex);
+ fsnotify_free_mark(mark);
+ }
++EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
+
+ /*
+ * Sorting function for lists of fsnotify marks.
+@@ -604,6 +606,7 @@ err:
+ fsnotify_put_mark(mark);
+ return ret;
+ }
++EXPORT_SYMBOL_GPL(fsnotify_add_mark);
+
+ int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
+ struct vfsmount *mnt, int allow_dups)
+@@ -739,6 +742,7 @@ void fsnotify_init_mark(struct fsnotify_
+ fsnotify_get_group(group);
+ mark->group = group;
+ }
++EXPORT_SYMBOL_GPL(fsnotify_init_mark);
+
+ /*
+ * Destroy all marks in destroy_list, waits for SRCU period to finish before
+diff -urNp -x '*.orig' linux-4.14/fs/open.c linux-4.14/fs/open.c
+--- linux-4.14/fs/open.c 2021-02-24 21:42:35.494465399 +0100
++++ linux-4.14/fs/open.c 2021-02-24 21:42:43.437781422 +0100
+@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, l
+ inode_unlock(dentry->d_inode);
+ return ret;
+ }
++EXPORT_SYMBOL_GPL(do_truncate);
+
+ long vfs_truncate(const struct path *path, loff_t length)
+ {
+@@ -710,6 +711,7 @@ int open_check_o_direct(struct file *f)
+ }
+ return 0;
+ }
++EXPORT_SYMBOL_GPL(open_check_o_direct);
+
+ static int do_dentry_open(struct file *f,
+ struct inode *inode,
+diff -urNp -x '*.orig' linux-4.14/fs/proc/base.c linux-4.14/fs/proc/base.c
+--- linux-4.14/fs/proc/base.c 2021-02-24 21:42:35.494465399 +0100
++++ linux-4.14/fs/proc/base.c 2021-02-24 21:42:43.434448095 +0100
+@@ -2030,7 +2030,7 @@ static int map_files_get_link(struct den
+ down_read(&mm->mmap_sem);
+ vma = find_exact_vma(mm, vm_start, vm_end);
+ if (vma && vma->vm_file) {
+- *path = vma->vm_file->f_path;
++ *path = vma_pr_or_file(vma)->f_path;
+ path_get(path);
+ rc = 0;
+ }
+diff -urNp -x '*.orig' linux-4.14/fs/proc/nommu.c linux-4.14/fs/proc/nommu.c
+--- linux-4.14/fs/proc/nommu.c 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/fs/proc/nommu.c 2021-02-24 21:42:43.434448095 +0100
+@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_
+ file = region->vm_file;
+
+ if (file) {
+- struct inode *inode = file_inode(region->vm_file);
++ struct inode *inode;
++
++ file = vmr_pr_or_file(region);
++ inode = file_inode(file);
+ dev = inode->i_sb->s_dev;
+ ino = inode->i_ino;
+ }
+diff -urNp -x '*.orig' linux-4.14/fs/proc/task_mmu.c linux-4.14/fs/proc/task_mmu.c
+--- linux-4.14/fs/proc/task_mmu.c 2021-02-24 21:42:35.497798724 +0100
++++ linux-4.14/fs/proc/task_mmu.c 2021-02-24 21:42:43.434448095 +0100
+@@ -310,7 +310,10 @@ show_map_vma(struct seq_file *m, struct
+ const char *name = NULL;
+
+ if (file) {
+- struct inode *inode = file_inode(vma->vm_file);
++ struct inode *inode;
++
++ 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;
+@@ -1775,7 +1778,7 @@ static int show_numa_map(struct seq_file
+ 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 = {
+ .hugetlb_entry = gather_hugetlb_stats,
+diff -urNp -x '*.orig' linux-4.14/fs/proc/task_nommu.c linux-4.14/fs/proc/task_nommu.c
+--- linux-4.14/fs/proc/task_nommu.c 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/fs/proc/task_nommu.c 2021-02-24 21:42:43.434448095 +0100
+@@ -156,7 +156,10 @@ static int nommu_vma_show(struct seq_fil
+ file = vma->vm_file;
+
+ if (file) {
+- struct inode *inode = file_inode(vma->vm_file);
++ struct inode *inode;
++
++ 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 -urNp -x '*.orig' linux-4.14/fs/read_write.c linux-4.14/fs/read_write.c
+--- linux-4.14/fs/read_write.c 2021-02-24 21:42:35.497798724 +0100
++++ linux-4.14/fs/read_write.c 2021-02-24 21:42:43.437781422 +0100
+@@ -454,6 +454,7 @@ ssize_t vfs_read(struct file *file, char
+
+ return ret;
+ }
++EXPORT_SYMBOL_GPL(vfs_read);
+
+ static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
+ {
+@@ -484,6 +485,30 @@ ssize_t __vfs_write(struct file *file, c
+ return -EINVAL;
+ }
+
++vfs_readf_t vfs_readf(struct file *file)
++{
++ const struct file_operations *fop = file->f_op;
++
++ if (fop->read)
++ return fop->read;
++ if (fop->read_iter)
++ return new_sync_read;
++ return ERR_PTR(-ENOSYS);
++}
++EXPORT_SYMBOL_GPL(vfs_readf);
++
++vfs_writef_t vfs_writef(struct file *file)
++{
++ const struct file_operations *fop = file->f_op;
++
++ if (fop->write)
++ return fop->write;
++ if (fop->write_iter)
++ return new_sync_write;
++ return ERR_PTR(-ENOSYS);
++}
++EXPORT_SYMBOL_GPL(vfs_writef);
++
+ ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
+ {
+ mm_segment_t old_fs;
+@@ -552,6 +577,7 @@ ssize_t vfs_write(struct file *file, con
+
+ return ret;
+ }
++EXPORT_SYMBOL_GPL(vfs_write);
+
+ static inline loff_t file_pos_read(struct file *file)
+ {
+diff -urNp -x '*.orig' linux-4.14/fs/splice.c linux-4.14/fs/splice.c
+--- linux-4.14/fs/splice.c 2021-02-24 21:42:35.497798724 +0100
++++ linux-4.14/fs/splice.c 2021-02-24 21:42:43.437781422 +0100
+@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+ * Attempt to initiate a splice from pipe to file.
+ */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+- loff_t *ppos, size_t len, unsigned int flags)
++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags)
+ {
+ ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ loff_t *, size_t, unsigned int);
+@@ -850,13 +850,14 @@ static long do_splice_from(struct pipe_i
+
+ return splice_write(pipe, out, ppos, len, flags);
+ }
++EXPORT_SYMBOL_GPL(do_splice_from);
+
+ /*
+ * Attempt to initiate a splice from a file to a pipe.
+ */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+- struct pipe_inode_info *pipe, size_t len,
+- unsigned int flags)
++long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags)
+ {
+ ssize_t (*splice_read)(struct file *, loff_t *,
+ struct pipe_inode_info *, size_t, unsigned int);
+@@ -879,6 +880,7 @@ static long do_splice_to(struct file *in
+
+ return splice_read(in, ppos, pipe, len, flags);
+ }
++EXPORT_SYMBOL_GPL(do_splice_to);
+
+ /**
+ * splice_direct_to_actor - splices data directly between two non-pipes
+diff -urNp -x '*.orig' linux-4.14/fs/sync.c linux-4.14/fs/sync.c
+--- linux-4.14/fs/sync.c 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/fs/sync.c 2021-02-24 21:42:43.437781422 +0100
+@@ -28,7 +28,7 @@
+ * wait == 1 case since in that case write_inode() functions do
+ * sync_dirty_buffer() and thus effectively write one block at a time.
+ */
+-static int __sync_filesystem(struct super_block *sb, int wait)
++int __sync_filesystem(struct super_block *sb, int wait)
+ {
+ if (wait)
+ sync_inodes_sb(sb);
+@@ -39,6 +39,7 @@ static int __sync_filesystem(struct supe
+ sb->s_op->sync_fs(sb, wait);
+ return __sync_blockdev(sb->s_bdev, wait);
+ }
++EXPORT_SYMBOL_GPL(__sync_filesystem);
+
+ /*
+ * Write out and wait upon all dirty data associated with this
+diff -urNp -x '*.orig' linux-4.14/fs/xattr.c linux-4.14/fs/xattr.c
+--- linux-4.14/fs/xattr.c 2021-02-24 21:42:35.501132049 +0100
++++ linux-4.14/fs/xattr.c 2021-02-24 21:42:43.437781422 +0100
+@@ -334,6 +334,7 @@ vfs_getxattr_alloc(struct dentry *dentry
+ *xattr_value = value;
+ return error;
+ }
++EXPORT_SYMBOL_GPL(vfs_getxattr_alloc);
+
+ ssize_t
+ __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
+diff -urNp -x '*.orig' linux-4.14/include/linux/file.h linux-4.14/include/linux/file.h
+--- linux-4.14/include/linux/file.h 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/include/linux/file.h 2021-02-24 21:42:43.434448095 +0100
+@@ -20,6 +20,7 @@ struct dentry;
+ struct path;
+ extern struct file *alloc_file(const struct path *, fmode_t mode,
+ const struct file_operations *fop);
++extern struct file *get_empty_filp(void);
+
+ static inline void fput_light(struct file *file, int fput_needed)
+ {
+diff -urNp -x '*.orig' linux-4.14/include/linux/fs.h linux-4.14/include/linux/fs.h
+--- linux-4.14/include/linux/fs.h 2021-02-24 21:42:35.511132025 +0100
++++ linux-4.14/include/linux/fs.h 2021-02-24 21:42:43.447781402 +0100
+@@ -1271,6 +1271,7 @@ extern void fasync_free(struct fasync_st
+ /* can be called from interrupts */
+ extern void kill_fasync(struct fasync_struct **, int, int);
+
++extern int setfl(int fd, struct file * filp, unsigned long arg);
+ extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
+ extern int f_setown(struct file *filp, unsigned long arg, int force);
+ extern void f_delown(struct file *filp);
+@@ -1718,6 +1719,7 @@ struct file_operations {
+ ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
+ unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
+ int (*check_flags)(int);
++ int (*setfl)(struct file *, unsigned long);
+ int (*flock) (struct file *, int, struct file_lock *);
+ ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
+ ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
+@@ -1788,6 +1790,12 @@ ssize_t rw_copy_check_uvector(int type,
+ struct iovec *fast_pointer,
+ struct iovec **ret_pointer);
+
++typedef ssize_t (*vfs_readf_t)(struct file *, char __user *, size_t, loff_t *);
++typedef ssize_t (*vfs_writef_t)(struct file *, const char __user *, size_t,
++ loff_t *);
++vfs_readf_t vfs_readf(struct file *file);
++vfs_writef_t vfs_writef(struct file *file);
++
+ extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
+ extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
+ extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
+@@ -1840,6 +1848,10 @@ struct super_operations {
+ struct shrink_control *);
+ long (*free_cached_objects)(struct super_block *,
+ struct shrink_control *);
++#if defined(CONFIG_BLK_DEV_LOOP) || defined(CONFIG_BLK_DEV_LOOP_MODULE)
++ /* and aufs */
++ struct file *(*real_loop)(struct file *);
++#endif
+ };
+
+ /*
+@@ -2196,6 +2208,7 @@ extern int current_umask(void);
+ extern void ihold(struct inode * inode);
+ extern void iput(struct inode *);
+ extern int generic_update_time(struct inode *, struct timespec *, int);
++extern int update_time(struct inode *, struct timespec *, int);
+
+ /* /sys/fs */
+ extern struct kobject *fs_kobj;
+@@ -2476,6 +2489,7 @@ static inline bool sb_is_blkdev_sb(struc
+ return false;
+ }
+ #endif
++extern int __sync_filesystem(struct super_block *, int);
+ extern int sync_filesystem(struct super_block *);
+ extern const struct file_operations def_blk_fops;
+ extern const struct file_operations def_chr_fops;
+diff -urNp -x '*.orig' linux-4.14/include/linux/lockdep.h linux-4.14/include/linux/lockdep.h
+--- linux-4.14/include/linux/lockdep.h 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/include/linux/lockdep.h 2021-02-24 21:42:43.434448095 +0100
+@@ -406,6 +406,8 @@ static inline int lockdep_match_key(stru
+ return lock->key == key;
+ }
+
++struct lock_class *lockdep_hlock_class(struct held_lock *hlock);
++
+ /*
+ * Acquire a lock.
+ *
+@@ -530,6 +532,7 @@ struct lock_class_key { };
+
+ #define lockdep_depth(tsk) (0)
+
++#define lockdep_is_held(lock) (1)
+ #define lockdep_is_held_type(l, r) (1)
+
+ #define lockdep_assert_held(l) do { (void)(l); } while (0)
+diff -urNp -x '*.orig' linux-4.14/include/linux/mm.h linux-4.14/include/linux/mm.h
+--- linux-4.14/include/linux/mm.h 2021-02-24 21:42:35.517798675 +0100
++++ linux-4.14/include/linux/mm.h 2021-02-24 21:42:43.434448095 +0100
+@@ -1370,6 +1370,28 @@ static inline int fixup_user_fault(struc
+ }
+ #endif
+
++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);
++extern void vma_do_get_file(struct vm_area_struct *, const char[], int);
++extern void vma_do_fput(struct vm_area_struct *, const char[], int);
++
++#define vma_file_update_time(vma) vma_do_file_update_time(vma, __func__, \
++ __LINE__)
++#define vma_pr_or_file(vma) vma_do_pr_or_file(vma, __func__, \
++ __LINE__)
++#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__)
++#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__)
++
++#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 */
++
+ extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len,
+ unsigned int gup_flags);
+ extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+diff -urNp -x '*.orig' linux-4.14/include/linux/mm_types.h linux-4.14/include/linux/mm_types.h
+--- linux-4.14/include/linux/mm_types.h 2021-02-24 21:42:35.517798675 +0100
++++ linux-4.14/include/linux/mm_types.h 2021-02-24 21:42:43.434448095 +0100
+@@ -258,6 +258,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 */
++ struct file *vm_prfile; /* the virtual 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
+@@ -332,6 +333,7 @@ struct vm_area_struct {
+ unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
+ units */
+ struct file * vm_file; /* File we map to (can be NULL). */
++ struct file *vm_prfile; /* shadow of vm_file */
+ void * vm_private_data; /* was vm_pte (shared mem) */
+
+ atomic_long_t swap_readahead_info;
+diff -urNp -x '*.orig' linux-4.14/include/linux/mnt_namespace.h linux-4.14/include/linux/mnt_namespace.h
+--- linux-4.14/include/linux/mnt_namespace.h 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/include/linux/mnt_namespace.h 2021-02-24 21:42:43.434448095 +0100
+@@ -6,11 +6,14 @@
+ struct mnt_namespace;
+ struct fs_struct;
+ struct user_namespace;
++struct vfsmount;
+
+ extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *,
+ struct user_namespace *, struct fs_struct *);
+ extern void put_mnt_ns(struct mnt_namespace *ns);
+
++extern int is_current_mnt_ns(struct vfsmount *mnt);
++
+ extern const struct file_operations proc_mounts_operations;
+ extern const struct file_operations proc_mountinfo_operations;
+ extern const struct file_operations proc_mountstats_operations;
+diff -urNp -x '*.orig' linux-4.14/include/linux/splice.h linux-4.14/include/linux/splice.h
+--- linux-4.14/include/linux/splice.h 2017-11-12 19:46:13.000000000 +0100
++++ linux-4.14/include/linux/splice.h 2021-02-24 21:42:43.434448095 +0100
+@@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct spl
+
+ extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
+ extern const struct pipe_buf_operations default_pipe_buf_ops;
+
-+out_unlock:
-+ spin_unlock(&xino->xi_nondir.spin);
-+out:
-+ return 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 2017-11-12 22:24:44.710911257 +0100
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags);
++extern long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags);
+ #endif
+diff -urNp -x '*.orig' linux-4.14/include/uapi/linux/aufs_type.h linux-4.14/include/uapi/linux/aufs_type.h
+--- linux-4.14/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/include/uapi/linux/aufs_type.h 2021-02-24 21:42:43.447781402 +0100
@@ -0,0 +1,447 @@
+/*
+ * Copyright (C) 2005-2017 Junjiro R. Okajima
+#define AUFS_CTL_FHSM_FD _IOW(AuCtlType, AuCtl_FHSM_FD, int)
+
+#endif /* __AUFS_TYPE_H__ */
-aufs4.x-rcN loopback patch
-
-diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index d44de9d..095672b 100644
---- a/drivers/block/loop.c
-+++ b/drivers/block/loop.c
-@@ -595,6 +595,15 @@ static inline void loop_update_dio(struct loop_device *lo)
- lo->use_dio);
- }
-
-+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;
-+}
-+
- static void loop_reread_partitions(struct loop_device *lo,
- struct block_device *bdev)
- {
-@@ -629,6 +638,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;
+diff -urNp -x '*.orig' linux-4.14/kernel/fork.c linux-4.14/kernel/fork.c
+--- linux-4.14/kernel/fork.c 2021-02-24 21:42:35.541131952 +0100
++++ linux-4.14/kernel/fork.c 2021-02-24 21:42:43.434448095 +0100
+@@ -670,7 +670,7 @@ static __latent_entropy int dup_mmap(str
+ struct inode *inode = file_inode(file);
+ struct address_space *mapping = file->f_mapping;
-@@ -645,9 +655,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);
-+ }
+- get_file(file);
++ vma_get_file(tmp);
+ if (tmp->vm_flags & VM_DENYWRITE)
+ atomic_dec(&inode->i_writecount);
+ i_mmap_lock_write(mapping);
+diff -urNp -x '*.orig' linux-4.14/kernel/locking/lockdep.c linux-4.14/kernel/locking/lockdep.c
+--- linux-4.14/kernel/locking/lockdep.c 2021-02-24 21:42:35.544465277 +0100
++++ linux-4.14/kernel/locking/lockdep.c 2021-02-24 21:42:43.437781422 +0100
+@@ -143,7 +143,7 @@ static struct lock_list list_entries[MAX
+ unsigned long nr_lock_classes;
+ static struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
- inode = file->f_mapping->host;
- old_file = lo->lo_backing_file;
-+ old_virt_file = lo->lo_backing_virt_file;
+-static inline struct lock_class *hlock_class(struct held_lock *hlock)
++inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+ {
+ if (!hlock->class_idx) {
+ /*
+@@ -154,6 +154,8 @@ static inline struct lock_class *hlock_c
+ }
+ return lock_classes + hlock->class_idx - 1;
+ }
++EXPORT_SYMBOL_GPL(lockdep_hlock_class);
++#define hlock_class(hlock) lockdep_hlock_class(hlock)
- error = -EINVAL;
+ #ifdef CONFIG_LOCK_STAT
+ static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
+diff -urNp -x '*.orig' linux-4.14/kernel/task_work.c linux-4.14/kernel/task_work.c
+--- linux-4.14/kernel/task_work.c 2021-02-24 21:42:35.551131928 +0100
++++ linux-4.14/kernel/task_work.c 2021-02-24 21:42:43.437781422 +0100
+@@ -116,3 +116,4 @@ void task_work_run(void)
+ } while (work);
+ }
+ }
++EXPORT_SYMBOL_GPL(task_work_run);
+diff -urNp -x '*.orig' linux-4.14/mm/Makefile linux-4.14/mm/Makefile
+--- linux-4.14/mm/Makefile 2021-02-24 21:42:35.564465229 +0100
++++ linux-4.14/mm/Makefile 2021-02-24 21:42:43.434448095 +0100
+@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.
+ mm_init.o mmu_context.o percpu.o slab_common.o \
+ compaction.o vmacache.o swap_slots.o \
+ interval_tree.o list_lru.o workingset.o \
+- debug.o $(mmu-y)
++ prfile.o debug.o $(mmu-y)
-@@ -662,6 +679,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- blk_mq_freeze_queue(lo->lo_queue);
- mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
- lo->lo_backing_file = file;
-+ lo->lo_backing_virt_file = virt_file;
- lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
- mapping_set_gfp_mask(file->f_mapping,
- lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
-@@ -669,12 +687,16 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- blk_mq_unfreeze_queue(lo->lo_queue);
+ obj-y += init-mm.o
- fput(old_file);
-+ if (old_virt_file)
-+ fput(old_virt_file);
- if (lo->lo_flags & LO_FLAGS_PARTSCAN)
- loop_reread_partitions(lo, bdev);
- return 0;
+diff -urNp -x '*.orig' linux-4.14/mm/filemap.c linux-4.14/mm/filemap.c
+--- linux-4.14/mm/filemap.c 2021-02-24 21:42:35.564465229 +0100
++++ linux-4.14/mm/filemap.c 2021-02-24 21:42:43.434448095 +0100
+@@ -2612,7 +2612,7 @@ int filemap_page_mkwrite(struct vm_fault
+ int ret = VM_FAULT_LOCKED;
- out_putf:
- fput(file);
-+ if (virt_file)
-+ fput(virt_file);
- out:
- return error;
- }
-@@ -868,7 +890,7 @@ static int loop_prepare_queue(struct loop_device *lo)
- static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- struct block_device *bdev, unsigned int arg)
- {
-- struct file *file, *f;
-+ struct file *file, *f, *virt_file = NULL;
- struct inode *inode;
- struct address_space *mapping;
- int lo_flags = 0;
-@@ -882,6 +904,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);
-+ }
+ sb_start_pagefault(inode->i_sb);
+- file_update_time(vmf->vma->vm_file);
++ vma_file_update_time(vmf->vma);
+ lock_page(page);
+ if (page->mapping != inode->i_mapping) {
+ unlock_page(page);
+diff -urNp -x '*.orig' linux-4.14/mm/mmap.c linux-4.14/mm/mmap.c
+--- linux-4.14/mm/mmap.c 2021-02-24 21:42:35.567798554 +0100
++++ linux-4.14/mm/mmap.c 2021-02-24 21:42:43.434448095 +0100
+@@ -166,7 +166,7 @@ static struct vm_area_struct *remove_vma
+ if (vma->vm_ops && vma->vm_ops->close)
+ vma->vm_ops->close(vma);
+ if (vma->vm_file)
+- fput(vma->vm_file);
++ vma_fput(vma);
+ mpol_put(vma_policy(vma));
+ kmem_cache_free(vm_area_cachep, vma);
+ return next;
+@@ -891,7 +891,7 @@ again:
+ if (remove_next) {
+ if (file) {
+ uprobe_munmap(next, next->vm_start, next->vm_end);
+- fput(file);
++ vma_fput(vma);
+ }
+ if (next->anon_vma)
+ anon_vma_merge(vma, next);
+@@ -1773,8 +1773,8 @@ out:
+ return addr;
- error = -EBUSY;
- if (lo->lo_state != Lo_unbound)
-@@ -930,6 +958,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 = NULL;
- lo->ioctl = NULL;
- lo->lo_sizelimit = 0;
-@@ -963,6 +992,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+ unmap_and_free_vma:
++ vma_fput(vma);
+ vma->vm_file = NULL;
+- fput(file);
- out_putf:
- fput(file);
-+ if (virt_file)
-+ fput(virt_file);
- out:
- /* This is safe: open() is still holding a reference. */
- module_put(THIS_MODULE);
-@@ -1009,6 +1040,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;
+ /* Undo any partial mapping done by a device driver. */
+ unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
+@@ -2603,7 +2603,7 @@ int __split_vma(struct mm_struct *mm, st
+ goto out_free_mpol;
-@@ -1040,6 +1072,7 @@ static int loop_clr_fd(struct loop_device *lo)
- spin_lock_irq(&lo->lo_lock);
- lo->lo_state = Lo_rundown;
- lo->lo_backing_file = NULL;
-+ lo->lo_backing_virt_file = NULL;
- spin_unlock_irq(&lo->lo_lock);
+ if (new->vm_file)
+- get_file(new->vm_file);
++ vma_get_file(new);
- loop_release_xfer(lo);
-@@ -1087,6 +1120,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;
- }
+ if (new->vm_ops && new->vm_ops->open)
+ new->vm_ops->open(new);
+@@ -2622,7 +2622,7 @@ int __split_vma(struct mm_struct *mm, st
+ if (new->vm_ops && new->vm_ops->close)
+ new->vm_ops->close(new);
+ if (new->vm_file)
+- fput(new->vm_file);
++ vma_fput(new);
+ unlink_anon_vmas(new);
+ out_free_mpol:
+ mpol_put(vma_policy(new));
+@@ -2784,7 +2784,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
+ struct vm_area_struct *vma;
+ unsigned long populate = 0;
+ unsigned long ret = -EINVAL;
+- struct file *file;
++ struct file *file, *prfile;
-diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index 1f39567..128b137 100644
---- a/drivers/block/loop.h
-+++ b/drivers/block/loop.h
-@@ -46,7 +46,7 @@ struct loop_device {
- int (*ioctl)(struct loop_device *, int cmd,
- unsigned long arg);
+ pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
+ current->comm, current->pid);
+@@ -2859,10 +2859,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
+ }
+ }
-- struct file * lo_backing_file;
-+ struct file * lo_backing_file, *lo_backing_virt_file;
- struct block_device *lo_device;
- void *key_data;
+- file = get_file(vma->vm_file);
++ vma_get_file(vma);
++ file = vma->vm_file;
++ prfile = vma->vm_prfile;
+ ret = do_mmap_pgoff(vma->vm_file, start, size,
+ prot, flags, pgoff, &populate, NULL);
++ if (!IS_ERR_VALUE(ret) && file && prfile) {
++ struct vm_area_struct *new_vma;
++
++ new_vma = find_vma(mm, ret);
++ if (!new_vma->vm_prfile)
++ new_vma->vm_prfile = prfile;
++ if (new_vma != vma)
++ get_file(prfile);
++ }
++ /*
++ * two fput()s instead of vma_fput(vma),
++ * coz vma may not be available anymore.
++ */
+ fput(file);
++ if (prfile)
++ fput(prfile);
+ out:
+ up_write(&mm->mmap_sem);
+ if (populate)
+@@ -3174,7 +3191,7 @@ struct vm_area_struct *copy_vma(struct v
+ if (anon_vma_clone(new_vma, vma))
+ goto out_free_mempol;
+ if (new_vma->vm_file)
+- get_file(new_vma->vm_file);
++ vma_get_file(new_vma);
+ if (new_vma->vm_ops && new_vma->vm_ops->open)
+ new_vma->vm_ops->open(new_vma);
+ vma_link(mm, new_vma, prev, rb_link, rb_parent);
+diff -urNp -x '*.orig' linux-4.14/mm/nommu.c linux-4.14/mm/nommu.c
+--- linux-4.14/mm/nommu.c 2021-02-24 21:42:35.567798554 +0100
++++ linux-4.14/mm/nommu.c 2021-02-24 21:42:43.434448095 +0100
+@@ -645,7 +645,7 @@ static void __put_nommu_region(struct vm
+ up_write(&nommu_region_sem);
-diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 8aff060..e853272 100644
---- a/fs/aufs/f_op.c
-+++ b/fs/aufs/f_op.c
-@@ -357,7 +357,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
- if (IS_ERR(h_file))
- goto out;
+ if (region->vm_file)
+- fput(region->vm_file);
++ vmr_fput(region);
-- 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 e35f015..b37f1ae 100644
---- a/fs/aufs/loop.c
-+++ b/fs/aufs/loop.c
-@@ -132,3 +132,19 @@ void au_loopback_fin(void)
- symbol_put(loop_backing_file);
- kfree(au_warn_loopback_array);
+ /* IO memory and memory shared directly out of the pagecache
+ * from ramfs/tmpfs mustn't be released here */
+@@ -803,7 +803,7 @@ static void delete_vma(struct mm_struct
+ if (vma->vm_ops && vma->vm_ops->close)
+ vma->vm_ops->close(vma);
+ if (vma->vm_file)
+- fput(vma->vm_file);
++ vma_fput(vma);
+ put_nommu_region(vma->vm_region);
+ kmem_cache_free(vm_area_cachep, vma);
}
+@@ -1325,7 +1325,7 @@ unsigned long do_mmap(struct file *file,
+ goto error_just_free;
+ }
+ }
+- fput(region->vm_file);
++ vmr_fput(region);
+ kmem_cache_free(vm_region_jar, region);
+ region = pregion;
+ result = start;
+@@ -1400,10 +1400,10 @@ error_just_free:
+ up_write(&nommu_region_sem);
+ error:
+ if (region->vm_file)
+- fput(region->vm_file);
++ vmr_fput(region);
+ kmem_cache_free(vm_region_jar, region);
+ if (vma->vm_file)
+- fput(vma->vm_file);
++ vma_fput(vma);
+ kmem_cache_free(vm_area_cachep, vma);
+ return ret;
+
+diff -urNp -x '*.orig' linux-4.14/mm/prfile.c linux-4.14/mm/prfile.c
+--- linux-4.14/mm/prfile.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14/mm/prfile.c 2021-02-24 21:42:43.434448095 +0100
+@@ -0,0 +1,85 @@
++/*
++ * Mainly for aufs which mmap(2) different file and wants to print different
++ * path in /proc/PID/maps.
++ * Call these functions via macros defined in linux/mm.h.
++ *
++ * See Documentation/filesystems/aufs/design/06mmap.txt
++ *
++ * Copyright (c) 2014-2017 Junjro R. Okajima
++ * Copyright (c) 2014 Ian Campbell
++ */
+
-+/* ---------------------------------------------------------------------- */
++#include <linux/mm.h>
++#include <linux/file.h>
++#include <linux/fs.h>
+
-+/* support the loopback block device insude aufs */
++/* #define PRFILE_TRACE */
++static inline void prfile_trace(struct file *f, struct file *pr,
++ const char func[], int line, const char func2[])
++{
++#ifdef PRFILE_TRACE
++ if (pr)
++ pr_info("%s:%d: %s, %pD2\n", func, line, func2, f);
++#endif
++}
+
-+struct file *aufs_real_loop(struct file *file)
++void vma_do_file_update_time(struct vm_area_struct *vma, const char func[],
++ int line)
+{
-+ struct file *f;
++ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
+
-+ 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;
++ prfile_trace(f, pr, func, line, __func__);
++ file_update_time(f);
++ if (f && pr)
++ file_update_time(pr);
+}
-diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index e2df495..36e5052 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)
++struct file *vma_do_pr_or_file(struct vm_area_struct *vma, const char func[],
++ int line)
++{
++ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
+
- 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)
++ prfile_trace(f, pr, func, line, __func__);
++ return (f && pr) ? pr : f;
++}
+
-+AuStub(struct file *, aufs_real_loop, return NULL, struct file *file)
- #endif /* BLK_DEV_LOOP */
++void vma_do_get_file(struct vm_area_struct *vma, const char func[], int line)
++{
++ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
++
++ prfile_trace(f, pr, func, line, __func__);
++ get_file(f);
++ if (f && pr)
++ get_file(pr);
++}
++
++void vma_do_fput(struct vm_area_struct *vma, const char func[], int line)
++{
++ struct file *f = vma->vm_file, *pr = vma->vm_prfile;
++
++ prfile_trace(f, pr, func, line, __func__);
++ fput(f);
++ if (f && pr)
++ fput(pr);
++}
++
++#ifndef CONFIG_MMU
++struct file *vmr_do_pr_or_file(struct vm_region *region, const char func[],
++ int line)
++{
++ struct file *f = region->vm_file, *pr = region->vm_prfile;
++
++ prfile_trace(f, pr, func, line, __func__);
++ return (f && pr) ? pr : f;
++}
++
++void vmr_do_fput(struct vm_region *region, const char func[], int line)
++{
++ struct file *f = region->vm_file, *pr = region->vm_prfile;
++
++ prfile_trace(f, pr, func, line, __func__);
++ fput(f);
++ if (f && pr)
++ fput(pr);
++}
++#endif /* !CONFIG_MMU */
+diff -urNp -x '*.orig' linux-4.14/security/commoncap.c linux-4.14/security/commoncap.c
+--- linux-4.14/security/commoncap.c 2021-02-24 21:42:35.641131710 +0100
++++ linux-4.14/security/commoncap.c 2021-02-24 21:42:43.437781422 +0100
+@@ -1270,12 +1270,14 @@ int cap_mmap_addr(unsigned long addr)
+ }
+ return ret;
+ }
++EXPORT_SYMBOL_GPL(cap_mmap_addr);
- #endif /* __KERNEL__ */
-diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 3c300125..128d790 100644
---- a/fs/aufs/super.c
-+++ b/fs/aufs/super.c
-@@ -838,7 +838,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
- };
+ int cap_mmap_file(struct file *file, unsigned long reqprot,
+ unsigned long prot, unsigned long flags)
+ {
+ return 0;
+ }
++EXPORT_SYMBOL_GPL(cap_mmap_file);
- /* ---------------------------------------------------------------------- */
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 8ab6566..8dbaa52 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -1838,6 +1838,10 @@ struct super_operations {
- struct shrink_control *);
- long (*free_cached_objects)(struct super_block *,
- struct shrink_control *);
-+#if defined(CONFIG_BLK_DEV_LOOP) || defined(CONFIG_BLK_DEV_LOOP_MODULE)
-+ /* and aufs */
-+ struct file *(*real_loop)(struct file *);
-+#endif
- };
+ #ifdef CONFIG_SECURITY
- /*
+diff -urNp -x '*.orig' linux-4.14/security/device_cgroup.c linux-4.14/security/device_cgroup.c
+--- linux-4.14/security/device_cgroup.c 2021-02-24 21:42:35.641131710 +0100
++++ linux-4.14/security/device_cgroup.c 2021-02-24 21:42:43.437781422 +0100
+@@ -8,6 +8,7 @@
+ #include <linux/device_cgroup.h>
+ #include <linux/cgroup.h>
+ #include <linux/ctype.h>
++#include <linux/export.h>
+ #include <linux/list.h>
+ #include <linux/uaccess.h>
+ #include <linux/seq_file.h>
+@@ -850,6 +851,7 @@ int __devcgroup_inode_permission(struct
+ return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
+ access);
+ }
++EXPORT_SYMBOL_GPL(__devcgroup_inode_permission);
+
+ int devcgroup_inode_mknod(int mode, dev_t dev)
+ {
+diff -urNp -x '*.orig' linux-4.14/security/security.c linux-4.14/security/security.c
+--- linux-4.14/security/security.c 2021-02-24 21:42:35.641131710 +0100
++++ linux-4.14/security/security.c 2021-02-24 21:42:43.437781422 +0100
+@@ -532,6 +532,7 @@ int security_path_rmdir(const struct pat
+ return 0;
+ return call_int_hook(path_rmdir, 0, dir, dentry);
+ }
++EXPORT_SYMBOL_GPL(security_path_rmdir);
+
+ int security_path_unlink(const struct path *dir, struct dentry *dentry)
+ {
+@@ -548,6 +549,7 @@ int security_path_symlink(const struct p
+ return 0;
+ return call_int_hook(path_symlink, 0, dir, dentry, old_name);
+ }
++EXPORT_SYMBOL_GPL(security_path_symlink);
+
+ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+ struct dentry *new_dentry)
+@@ -556,6 +558,7 @@ int security_path_link(struct dentry *ol
+ return 0;
+ return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
+ }
++EXPORT_SYMBOL_GPL(security_path_link);
+
+ int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
+ const struct path *new_dir, struct dentry *new_dentry,
+@@ -583,6 +586,7 @@ int security_path_truncate(const struct
+ return 0;
+ return call_int_hook(path_truncate, 0, path);
+ }
++EXPORT_SYMBOL_GPL(security_path_truncate);
+
+ int security_path_chmod(const struct path *path, umode_t mode)
+ {
+@@ -590,6 +594,7 @@ int security_path_chmod(const struct pat
+ return 0;
+ return call_int_hook(path_chmod, 0, path, mode);
+ }
++EXPORT_SYMBOL_GPL(security_path_chmod);
+
+ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+ {
+@@ -597,6 +602,7 @@ int security_path_chown(const struct pat
+ return 0;
+ return call_int_hook(path_chown, 0, path, uid, gid);
+ }
++EXPORT_SYMBOL_GPL(security_path_chown);
+
+ int security_path_chroot(const struct path *path)
+ {
+@@ -682,6 +688,7 @@ int security_inode_readlink(struct dentr
+ return 0;
+ return call_int_hook(inode_readlink, 0, dentry);
+ }
++EXPORT_SYMBOL_GPL(security_inode_readlink);
+
+ int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
+ bool rcu)
+@@ -697,6 +704,7 @@ int security_inode_permission(struct ino
+ return 0;
+ return call_int_hook(inode_permission, 0, inode, mask);
+ }
++EXPORT_SYMBOL_GPL(security_inode_permission);
+
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -868,6 +876,7 @@ int security_file_permission(struct file
+
+ return fsnotify_perm(file, mask);
+ }
++EXPORT_SYMBOL_GPL(security_file_permission);
+
+ int security_file_alloc(struct file *file)
+ {
+@@ -927,6 +936,7 @@ int security_mmap_file(struct file *file
+ return ret;
+ return ima_file_mmap(file, prot, prot_adj, flags);
+ }
++EXPORT_SYMBOL_GPL(security_mmap_file);
+
+ int security_mmap_addr(unsigned long addr)
+ {
projects / packages / kernel.git / blobdiff