aufs4.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index 7aee6d6..ec92031 100644
+index bc821a8..7ae814c 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -248,6 +248,7 @@ source "fs/pstore/Kconfig"
+@@ -251,6 +251,7 @@ source "fs/pstore/Kconfig"
source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/exofs/Kconfig"
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index ef772f1..51779e68c 100644
+index c9375fd..8af5671 100644
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -129,3 +129,4 @@ obj-y += exofs/ # Multiple modules
+@@ -128,3 +128,4 @@ obj-y += exofs/ # Multiple modules
obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/
obj-$(CONFIG_EFIVAR_FS) += efivarfs/
aufs4.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index 82ad0ea..7d8b461 100644
+index 92be777..138f5e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2478,6 +2478,19 @@ F: include/linux/audit.h
+@@ -2517,6 +2517,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
W: http://miguelojeda.es/auxdisplay.htm
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index bc8e615..e51a59d 100644
+index c9d0449..79902c1 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -691,6 +691,24 @@ static inline int is_loop_device(struct file *file)
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
-index 5c7df1d..019f14b 100644
+index 86d2de6..213ddcd 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1197,7 +1197,7 @@ enum d_walk_ret {
+@@ -1234,7 +1234,7 @@ enum d_walk_ret {
*
* The @enter() and @finish() callbacks are called with d_lock held.
*/
void (*finish)(void *))
{
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 0522e28..74c255d 100644
+index d737ff0..7550799 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -32,7 +32,7 @@
return error;
diff --git a/fs/inode.c b/fs/inode.c
-index 03102d6..517883c 100644
+index 13ceb98..68b3b45 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -1655,7 +1655,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1662,7 +1662,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.
*/
int (*update_time)(struct inode *, struct timespec *, int);
diff --git a/fs/namespace.c b/fs/namespace.c
-index e158ec6..312bdbd8 100644
+index 5f75969..61129ff 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -846,6 +846,12 @@ static inline int check_mnt(struct mount *mnt)
* vfsmount lock must be held for write
*/
diff --git a/fs/read_write.c b/fs/read_write.c
-index f8547b8..0a5c47b 100644
+index c4eabbf..ddd6e67 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
-@@ -484,6 +484,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
+@@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
return -EINVAL;
}
{
mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c
-index 39e2dc0..c5fb195 100644
+index 005d09c..f617ab0 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
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 6e0a2cb..a6891ee 100644
+index b54e054..2860782 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -28,7 +28,7 @@
static inline void fput_light(struct file *file, int fput_needed)
{
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 511fbaa..96e05b3 100644
+index 760d8da..09a2542 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1265,6 +1265,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1270,6 +1270,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int);
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp);
-@@ -1712,6 +1713,7 @@ struct file_operations {
+@@ -1724,6 +1725,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
-@@ -1782,6 +1784,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -1794,6 +1796,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -2201,6 +2209,7 @@ extern int current_umask(void);
+@@ -2199,6 +2207,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);
/* /sys/fs */
extern struct kobject *fs_kobj;
-@@ -2481,6 +2490,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2485,6 +2494,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false;
}
#endif
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 a842551..453e941 100644
+index 6fc77d4..27e76f0 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
-@@ -406,6 +406,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
+@@ -313,6 +313,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key;
}
/*
* Acquire a lock.
*
-@@ -535,6 +537,7 @@ struct lockdep_map { };
+@@ -439,6 +441,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0)
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 670d8d7..2cd0282 100644
+index 0233863..06e0d7a 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -156,7 +156,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
+@@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
unsigned long nr_lock_classes;
static struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
{
if (!hlock->class_idx) {
/*
-@@ -167,6 +167,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
+@@ -151,6 +151,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
}
return lock_classes + hlock->class_idx - 1;
}
aufs4.x-rcN mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 60316b5..ce5314e 100644
+index 1b2ede6..dc3fd6d 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)
+@@ -2024,7 +2024,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
down_read(&mm->mmap_sem);
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 339e4c1..1138098 100644
+index c486ad4..76b71f8 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
-@@ -306,7 +306,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
const char *name = NULL;
if (file) {
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1736,7 +1739,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1726,7 +1729,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index ea818ff..fbd4799 100644
+index 1ac1f06..49997d9 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1362,6 +1362,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1380,6 +1380,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+ unmap_mapping_range(mapping, holebegin, holelen, 0);
}
- #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[],
+#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_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 cfd0ac4..135e11c 100644
+index 2161234..78aa367 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -255,6 +255,7 @@ struct vm_region {
+@@ -251,6 +251,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */
int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -329,6 +330,7 @@ struct vm_area_struct {
+@@ -325,6 +326,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). */
atomic_long_t swap_readahead_info;
diff --git a/kernel/fork.c b/kernel/fork.c
-index 432eadf..8b2ba5b 100644
+index a5d21c4..e965e09 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -676,7 +676,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -473,7 +473,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping;
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
-index e669f02..9c36567 100644
+index b4e54a9a..77892ae 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 \
+ compaction.o vmacache.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 ee83baa..7677d13 100644
+index 0604cb0..45d2369 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -2704,7 +2704,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -2700,7 +2700,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
int ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
if (page->mapping != inode->i_mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
-index a4d5468..cb06cbd 100644
+index 188f195..3c1ca1d 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 (next->anon_vma)
anon_vma_merge(vma, next);
-@@ -1761,8 +1761,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1779,8 +1779,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2586,7 +2586,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2604,7 +2604,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
-@@ -2605,7 +2605,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2623,7 +2623,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)
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
-@@ -2767,7 +2767,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2785,7 +2785,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;
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
current->comm, current->pid);
-@@ -2842,10 +2842,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2860,10 +2860,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
}
}
out:
up_write(&mm->mmap_sem);
if (populate)
-@@ -3153,7 +3170,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3171,7 +3188,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma))
goto out_free_mempol;
if (new_vma->vm_file)
new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c
-index 17c00d9..4bcdf94 100644
+index 1372373..6362dde 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
-@@ -641,7 +641,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -629,7 +629,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);
if (region->vm_file)
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
-@@ -799,7 +799,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -767,7 +767,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
put_nommu_region(vma->vm_region);
kmem_cache_free(vm_area_cachep, vma);
}
-@@ -1321,7 +1321,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1289,7 +1289,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
-@@ -1396,10 +1396,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1364,10 +1364,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem);
error:
if (region->vm_file)
diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644
-index 0000000..3f56669
+index 0000000..14efc4f
--- /dev/null
+++ b/mm/prfile.c
@@ -0,0 +1,86 @@
+ *
+ * See Documentation/filesystems/aufs/design/06mmap.txt
+ *
-+ * Copyright (c) 2014-2017 Junjro R. Okajima
++ * Copyright (c) 2014-2018 Junjro R. Okajima
+ * Copyright (c) 2014 Ian Campbell
+ */
+
aufs4.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
-index 019f14b..10c1a6d 100644
+index 213ddcd..137176b 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1305,6 +1305,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1342,6 +1342,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
struct check_mount {
struct vfsmount *mnt;
-@@ -2892,6 +2893,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2920,6 +2921,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock);
}
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
-index 6be2aa0..1e003f9 100644
+index 183059c..35adee4 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
#ifdef CONFIG_USELIB
/*
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 74c255d..ec53ee1 100644
+index 7550799..d403576 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
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 2dc9f38..7bf57df 100644
+index 7ec0b3e..819ee07 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
-@@ -148,6 +148,7 @@ struct file *get_empty_filp(void)
+@@ -147,6 +147,7 @@ struct file *get_empty_filp(void)
}
return ERR_PTR(-ENFILE);
}
/**
* alloc_file - allocate and initialize a 'struct file'
-@@ -258,6 +259,7 @@ void flush_delayed_fput(void)
+@@ -257,6 +258,7 @@ void flush_delayed_fput(void)
{
delayed_fput(NULL);
}
static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
-@@ -300,6 +302,7 @@ void __fput_sync(struct file *file)
+@@ -299,6 +301,7 @@ void __fput_sync(struct file *file)
}
EXPORT_SYMBOL(fput);
void put_filp(struct file *file)
{
-@@ -308,6 +311,7 @@ void put_filp(struct file *file)
+@@ -307,6 +310,7 @@ void put_filp(struct file *file)
file_free(file);
}
}
void __init files_init(void)
{
diff --git a/fs/inode.c b/fs/inode.c
-index 517883c..5cece5e 100644
+index 68b3b45..af4551e 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -1664,6 +1664,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
+@@ -1671,6 +1671,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
return update_time(inode, time, flags);
}
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
-index 312bdbd8..a5baeb5 100644
+index 61129ff..5d3e0382 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
/*
* vfsmount lock must be held for write
-@@ -1887,6 +1889,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1893,6 +1895,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
/*
* 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
+index c5ee7cd..86bfe2d 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,
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 0a5c47b..d423a5f 100644
+index ddd6e67..aabf92d 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
-@@ -454,6 +454,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
+@@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
return ret;
}
static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
{
-@@ -494,6 +495,7 @@ vfs_readf_t vfs_readf(struct file *file)
+@@ -499,6 +500,7 @@ vfs_readf_t vfs_readf(struct file *file)
return new_sync_read;
return ERR_PTR(-ENOSYS);
}
vfs_writef_t vfs_writef(struct file *file)
{
-@@ -505,6 +507,7 @@ vfs_writef_t vfs_writef(struct file *file)
+@@ -510,6 +512,7 @@ vfs_writef_t vfs_writef(struct file *file)
return new_sync_write;
return ERR_PTR(-ENOSYS);
}
ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
{
-@@ -574,6 +577,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
+@@ -579,6 +582,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
return ret;
}
static inline loff_t file_pos_read(struct file *file)
{
diff --git a/fs/splice.c b/fs/splice.c
-index c5fb195..ce01a74 100644
+index f617ab0..ec0ad02 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,
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/fs/sync.c b/fs/sync.c
-index a6891ee..47a78bd 100644
+index 2860782..ffd7ea4 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
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 2cd0282..af59768 100644
+index 06e0d7a..6af91bd 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -167,6 +167,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+@@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
}
return lock_classes + hlock->class_idx - 1;
}
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/commoncap.c b/security/commoncap.c
-index 4f8e093..f1e0544 100644
+index 48620c9..4981104 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
-@@ -1333,12 +1333,14 @@ int cap_mmap_addr(unsigned long addr)
+@@ -1330,12 +1330,14 @@ int cap_mmap_addr(unsigned long addr)
}
return ret;
}
}
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c
-index 1cd8526..f2e4736 100644
+index 7bc2fde..6bd0468 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -531,6 +531,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -537,6 +537,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
}
int security_path_unlink(const struct path *dir, struct dentry *dentry)
{
-@@ -547,6 +548,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -553,6 +554,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);
}
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
-@@ -555,6 +557,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -561,6 +563,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);
}
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
-@@ -582,6 +585,7 @@ int security_path_truncate(const struct path *path)
+@@ -588,6 +591,7 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
int security_path_chmod(const struct path *path, umode_t mode)
{
-@@ -589,6 +593,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -595,6 +599,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
-@@ -596,6 +601,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -602,6 +607,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);
}
int security_path_chroot(const struct path *path)
{
-@@ -681,6 +687,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -687,6 +693,7 @@ int security_inode_readlink(struct dentry *dentry)
return 0;
return call_int_hook(inode_readlink, 0, dentry);
}
int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
bool rcu)
-@@ -696,6 +703,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -702,6 +709,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return call_int_hook(inode_permission, 0, inode, mask);
}
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
-@@ -867,6 +875,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -873,6 +881,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
int security_file_alloc(struct file *file)
{
-@@ -926,6 +935,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
+@@ -932,6 +941,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
return ret;
return ima_file_mmap(file, prot);
}
{
diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/debugfs-aufs 2016-01-13 20:11:11.663093444 +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
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs 2016-01-13 20:11:11.663093444 +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
+ 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 2018-01-29 07:56:20.046658203 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,171 @@
+
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,258 @@
+
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,85 @@
+
-+# Copyright (C) 2015-2017 Junjiro R. Okajima
++# Copyright (C) 2015-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+ 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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,113 @@
+
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+ 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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,74 @@
+
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+ 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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,64 @@
+
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+ 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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,31 @@
+
+// to view this graph, run dot(1) command in GRAPHVIZ.
+}
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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,102 @@
+
-+# Copyright (C) 2017 Junjiro R. Okajima
++# Copyright (C) 2017-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,120 @@
+
-+# Copyright (C) 2011-2017 Junjiro R. Okajima
++# Copyright (C) 2011-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,72 @@
+
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,96 @@
+
-+# Copyright (C) 2014-2017 Junjiro R. Okajima
++# Copyright (C) 2014-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,58 @@
+
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+ 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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,52 @@
+
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+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 2018-01-29 07:56:20.049991637 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,47 @@
+
-+# Copyright (C) 2010-2017 Junjiro R. Okajima
++# Copyright (C) 2010-2018 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+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 2018-01-29 07:56:20.046658203 +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
+# 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 2018-01-29 07:56:20.049991637 +0100
++++ linux/fs/aufs/aufs.h 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,60 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.049991637 +0100
++++ linux/fs/aufs/branch.c 2018-04-15 08:49:13.394483860 +0200
@@ -0,0 +1,1432 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.049991637 +0100
++++ linux/fs/aufs/branch.h 2018-06-04 09:08:09.181412645 +0200
@@ -0,0 +1,333 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.049991637 +0100
++++ linux/fs/aufs/conf.mk 2018-06-04 09:08:09.181412645 +0200
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0
+
+-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 2018-01-29 07:56:20.053325069 +0100
-@@ -0,0 +1,1442 @@
++++ linux/fs/aufs/cpup.c 2018-06-04 09:08:09.181412645 +0200
+@@ -0,0 +1,1441 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ else {
+ inode_unlock_shared(h_src_inode);
+ err = au_copy_file(dst, src, len);
-+ vfsub_inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD);
++ inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD);
+ }
+
+ return err;
+ if (!au_test_nfs(h_src_sb)) {
+ inode_unlock_shared(h_src_inode);
+ err = vfsub_clone_file_range(src, dst, len);
-+ vfsub_inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD);
++ inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD);
+ } else
+ err = vfsub_clone_file_range(src, dst, len);
+ /* older XFS has a condition in cloning */
+ cpg->len = l;
+ if (cpg->len) {
+ /* try stopping to update while we are referencing */
-+ vfsub_inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD);
++ inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD);
+ au_pin_hdir_unlock(cpg->pin);
+
+ h_path.dentry = au_h_dptr(cpg->dentry, cpg->bsrc);
+ else {
+ inode_unlock_shared(h_src_inode);
+ err = vfsub_getattr(&h_path, &h_src_attr->st);
-+ vfsub_inode_lock_shared_nested(h_src_inode,
-+ AuLsc_I_CHILD);
++ inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD);
+ }
+ if (unlikely(err)) {
+ inode_unlock_shared(h_src_inode);
+}
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/cpup.h 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,99 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dbgaufs.c 2018-06-04 09:08:09.181412645 +0200
@@ -0,0 +1,437 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dbgaufs.h 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,48 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dcsub.c 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,225 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dcsub.h 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,136 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/debug.c 2018-06-04 09:08:09.181412645 +0200
@@ -0,0 +1,440 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ return;
+ }
+
-+ dpri("deblk %u, nblk %lu, deblk %p, last{%lu, %p}, ver %lu\n",
++ dpri("deblk %u, nblk %lu, deblk %p, last{%lu, %p}, ver %llu\n",
+ vdir->vd_deblk_sz, vdir->vd_nblk, vdir->vd_deblk,
+ vdir->vd_last.ul, vdir->vd_last.p.deblk, vdir->vd_version);
+ for (ul = 0; ul < vdir->vd_nblk; ul++) {
+ i_size_read(inode), (unsigned long long)inode->i_blocks,
+ hn, (long long)timespec_to_ns(&inode->i_ctime) & 0x0ffff,
+ inode->i_mapping ? inode->i_mapping->nrpages : 0,
-+ inode->i_state, inode->i_flags, inode->i_version,
++ inode->i_state, inode->i_flags, inode_peek_iversion(inode),
+ inode->i_generation,
+ l ? ", wh " : "", l, n);
+ 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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/debug.h 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,225 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dentry.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,1152 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ || (d_really_is_positive(dentry) && !d_is_dir(dentry)))
+ goto out; /* success */
+
-+ vfsub_inode_lock_shared_nested(h_inode, AuLsc_I_CHILD);
++ inode_lock_shared_nested(h_inode, AuLsc_I_CHILD);
+ opq = au_diropq_test(h_dentry);
+ inode_unlock_shared(h_inode);
+ if (opq > 0)
+ }
+
+ h_dir = d_inode(h_parent);
-+ vfsub_inode_lock_shared_nested(h_dir, AuLsc_I_PARENT);
++ inode_lock_shared_nested(h_dir, AuLsc_I_PARENT);
+ h_dentry = au_do_lookup(h_parent, dentry, bindex, &args);
+ inode_unlock_shared(h_dir);
+ err = PTR_ERR(h_dentry);
+ /* ia->i_nlink = h_inode->i_nlink; */
+ ia->i_uid = h_inode->i_uid;
+ ia->i_gid = h_inode->i_gid;
-+ ia->i_version = h_inode->i_version;
++ ia->i_version = inode_query_iversion(h_inode);
+/*
+ ia->i_size = h_inode->i_size;
+ ia->i_blocks = h_inode->i_blocks;
+ /* || ia->i_nlink != h_inode->i_nlink */
+ || !uid_eq(ia->i_uid, h_inode->i_uid)
+ || !gid_eq(ia->i_gid, h_inode->i_gid)
-+ || ia->i_version != h_inode->i_version
++ || !inode_eq_iversion(h_inode, ia->i_version)
+/*
+ || ia->i_size != h_inode->i_size
+ || ia->i_blocks != h_inode->i_blocks
+};
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dentry.h 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,266 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dinfo.c 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,553 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dir.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,759 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ err = 0;
+ mnt = file->f_path.mnt;
+ dentry = file->f_path.dentry;
-+ file->f_version = d_inode(dentry)->i_version;
++ file->f_version = inode_query_iversion(d_inode(dentry));
+ bindex = au_dbtop(dentry);
+ au_set_fbtop(file, bindex);
+ btail = au_dbtaildir(dentry);
+ h_dentry = au_h_dptr(dentry, arg->bindex);
+ h_inode = d_inode(h_dentry);
+ /* todo: i_mode changes anytime? */
-+ vfsub_inode_lock_shared_nested(h_inode, AuLsc_I_CHILD);
++ inode_lock_shared_nested(h_inode, AuLsc_I_CHILD);
+ err = au_test_h_perm_sio(h_inode, MAY_EXEC | MAY_READ);
+ inode_unlock_shared(h_inode);
+ if (!err)
+};
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dir.h 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,131 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ union au_vdir_deblk_p p;
+ } vd_last;
+
-+ unsigned long vd_version;
++ u64 vd_version;
+ unsigned int vd_deblk_sz;
+ unsigned long vd_jiffy;
+} ____cacheline_aligned_in_smp;
+#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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dirren.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,1315 @@
+/*
-+ * Copyright (C) 2017 Junjiro R. Okajima
++ * Copyright (C) 2017-2018 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
+ drinfo = NULL;
+ unlocked = 0;
+ h_dir = d_inode(h_ppath->dentry);
-+ vfsub_inode_lock_shared_nested(h_dir, AuLsc_I_PARENT);
++ inode_lock_shared_nested(h_dir, AuLsc_I_PARENT);
+ infopath.dentry = vfsub_lookup_one_len(whname, h_ppath->dentry,
+ whnamelen);
+ if (IS_ERR(infopath.dentry)) {
+}
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dirren.h 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,139 @@
+/*
-+ * Copyright (C) 2017 Junjiro R. Okajima
++ * Copyright (C) 2017-2018 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
+#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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dynop.c 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,369 @@
+/*
-+ * Copyright (C) 2010-2017 Junjiro R. Okajima
++ * Copyright (C) 2010-2018 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
+}
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/dynop.h 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,74 @@
+/*
-+ * Copyright (C) 2010-2017 Junjiro R. Okajima
++ * Copyright (C) 2010-2018 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
+#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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/export.c 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,836 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/fhsm.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,426 @@
+/*
-+ * Copyright (C) 2011-2017 Junjiro R. Okajima
++ * Copyright (C) 2011-2018 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
+
+/* ---------------------------------------------------------------------- */
+
-+static unsigned int au_fhsm_poll(struct file *file,
-+ struct poll_table_struct *wait)
++static __poll_t au_fhsm_poll(struct file *file, struct poll_table_struct *wait)
+{
-+ unsigned int mask;
++ __poll_t mask;
+ struct au_sbinfo *sbinfo;
+ struct au_fhsm *fhsm;
+
+ fhsm = &sbinfo->si_fhsm;
+ poll_wait(file, &fhsm->fhsm_wqh, wait);
+ if (atomic_read(&fhsm->fhsm_readable))
-+ mask = POLLIN /* | POLLRDNORM */;
++ mask = EPOLLIN /* | EPOLLRDNORM */;
+
-+ AuTraceErr((int)mask);
++ if (!mask)
++ AuDbg("mask 0x%x\n", mask);
+ return mask;
+}
+
+}
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/file.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,856 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+};
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/file.h 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,340 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+
+/* poll.c */
+#ifdef CONFIG_AUFS_POLL
-+unsigned int aufs_poll(struct file *file, poll_table *wait);
++__poll_t aufs_poll(struct file *file, poll_table *wait);
+#endif
+
+#ifdef CONFIG_AUFS_BR_HFSPLUS
+#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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/finfo.c 2018-04-15 08:49:13.397817296 +0200
@@ -0,0 +1,148 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.053325069 +0100
++++ linux/fs/aufs/f_op.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,817 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+};
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/fstype.h 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,400 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/hbl.h 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,64 @@
+/*
-+ * Copyright (C) 2017 Junjiro R. Okajima
++ * Copyright (C) 2017-2018 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
+#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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/hfsnotify.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,289 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+};
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/hfsplus.c 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,56 @@
+/*
-+ * Copyright (C) 2010-2017 Junjiro R. Okajima
++ * Copyright (C) 2010-2018 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
+}
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/hnotify.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,719 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ if (au_ftest_hnjob(a->flags, TRYXINO0)
+ && a->inode
+ && a->h_inode) {
-+ vfsub_inode_lock_shared_nested(a->h_inode, AuLsc_I_CHILD);
++ inode_lock_shared_nested(a->h_inode, AuLsc_I_CHILD);
+ if (!a->h_inode->i_nlink
+ && !(a->h_inode->i_state & I_LINKABLE))
+ hn_xino(a->inode, a->h_inode); /* ignore this error */
+ if (vdir)
+ vdir->vd_jiffy = 0;
+ /* IMustLock(a->inode); */
-+ /* a->inode->i_version++; */
++ /* inode_inc_iversion(a->inode); */
+ }
+
+ /* can do nothing but warn */
+}
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/iinfo.c 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,285 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/inode.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,527 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ au_cpup_attr_all(inode, /*force*/0);
+ au_update_iigen(inode, /*half*/1);
+ if (do_version)
-+ inode->i_version++;
++ inode_inc_iversion(inode);
+}
+
+static int au_ii_refresh(struct inode *inode, int *update)
+}
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/inode.h 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,695 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+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);
++ inode_lock_shared_nested(hdir->hi_inode, sc);
+ au_hn_suspend(hdir);
+}
+#endif
+#endif /* __AUFS_INODE_H__ */
diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
--- /usr/share/empty/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/ioctl.c 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,219 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/i_op_add.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,920 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ dir = d_inode(dentry->d_parent); /* dir inode is locked */
+ IMustLock(dir);
+ au_dir_ts(dir, bindex);
-+ dir->i_version++;
++ inode_inc_iversion(dir);
+ au_fhsm_wrote(sb, bindex, /*force*/0);
+ return 0; /* success */
+ }
+ }
+
+ au_dir_ts(dir, a->bdst);
-+ dir->i_version++;
++ inode_inc_iversion(dir);
+ inc_nlink(inode);
+ inode->i_ctime = dir->i_ctime;
+ d_instantiate(dentry, au_igrab(inode));
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/i_op.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,1459 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ 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);
++ 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);
+ 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);
++ 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);
+};
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/i_op_del.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,511 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ inode->i_ctime = dir->i_ctime;
+
+ au_dir_ts(dir, bindex);
-+ dir->i_version++;
++ inode_inc_iversion(dir);
+}
+
+/*
+}
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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/i_op_ren.c 2018-06-04 09:08:09.184746078 +0200
@@ -0,0 +1,1246 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ struct inode *dir;
+
+ dir = a->dst_dir;
-+ dir->i_version++;
++ inode_inc_iversion(dir);
+ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)) {
+ /* is this updating defined in POSIX? */
+ au_cpup_attr_timesizes(a->src_inode);
+
+ if (a->exchange) {
+ dir = a->src_dir;
-+ dir->i_version++;
++ inode_inc_iversion(dir);
+ if (au_ftest_ren(a->auren_flags, ISDIR_DST)) {
+ /* is this updating defined in POSIX? */
+ au_cpup_attr_timesizes(a->dst_inode);
+ return;
+
+ dir = a->src_dir;
-+ dir->i_version++;
++ inode_inc_iversion(dir);
+ if (au_ftest_ren(a->auren_flags, ISDIR_SRC))
+ au_cpup_attr_nlink(dir, /*force*/1);
+ au_dir_ts(dir, a->btgt);
+}
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 2018-01-29 07:56:20.049991637 +0100
++++ linux/fs/aufs/Kconfig 2018-06-04 09:08:09.181412645 +0200
@@ -0,0 +1,199 @@
+# SPDX-License-Identifier: GPL-2.0
+config AUFS_FS
+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 2018-01-29 07:56:20.056658502 +0100
++++ linux/fs/aufs/loop.c 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,147 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/loop.h 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,52 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/magic.mk 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0
+
+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 2018-01-29 07:56:20.049991637 +0100
++++ linux/fs/aufs/Makefile 2018-06-04 09:08:09.181412645 +0200
@@ -0,0 +1,46 @@
+# SPDX-License-Identifier: GPL-2.0
+
+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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/module.c 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,266 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/module.h 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,101 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/mvdown.c 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,704 @@
+/*
-+ * Copyright (C) 2011-2017 Junjiro R. Okajima
++ * Copyright (C) 2011-2018 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
+}
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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/opts.c 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,1891 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/opts.h 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,224 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/plink.c 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,515 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ struct inode *h_inode;
+
+ h_inode = d_inode(h_parent);
-+ vfsub_inode_lock_shared_nested(h_inode, AuLsc_I_CHILD2);
++ inode_lock_shared_nested(h_inode, AuLsc_I_CHILD2);
+ h_dentry = vfsub_lkup_one(tgtname, h_parent);
+ inode_unlock_shared(h_inode);
+ return h_dentry;
+}
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 2018-01-29 07:56:20.059991935 +0100
-@@ -0,0 +1,52 @@
++++ linux/fs/aufs/poll.c 2018-06-04 09:08:09.188079511 +0200
+@@ -0,0 +1,53 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+
+#include "aufs.h"
+
-+unsigned int aufs_poll(struct file *file, poll_table *wait)
++__poll_t aufs_poll(struct file *file, poll_table *wait)
+{
-+ unsigned int mask;
++ __poll_t mask;
+ int err;
+ struct file *h_file;
+ struct super_block *sb;
+
+ /* We should pretend an error happened. */
-+ mask = POLLERR /* | POLLIN | POLLOUT */;
++ mask = EPOLLERR /* | EPOLLIN | EPOLLOUT */;
+ sb = file->f_path.dentry->d_sb;
+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
+
+
+out:
+ si_read_unlock(sb);
-+ AuTraceErr((int)mask);
++ if (mask & POLLERR)
++ AuDbg("mask 0x%x\n", 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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/posix_acl.c 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,102 @@
+/*
-+ * Copyright (C) 2014-2017 Junjiro R. Okajima
++ * Copyright (C) 2014-2018 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
+}
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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/procfs.c 2018-04-15 08:49:13.401150731 +0200
@@ -0,0 +1,170 @@
+/*
-+ * Copyright (C) 2010-2017 Junjiro R. Okajima
++ * Copyright (C) 2010-2018 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
+}
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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/rdu.c 2018-04-15 08:49:13.404484168 +0200
@@ -0,0 +1,381 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/rwsem.h 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,72 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/sbinfo.c 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,304 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ au_update_digen(sb->s_root);
+ inode = d_inode(sb->s_root);
+ au_update_iigen(inode, /*half*/0);
-+ inode->i_version++;
++ inode_inc_iversion(inode);
+ return gen;
+}
+
+}
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 2018-01-29 07:56:20.059991935 +0100
-@@ -0,0 +1,1046 @@
++++ linux/fs/aufs/super.c 2018-06-04 09:08:09.188079511 +0200
+@@ -0,0 +1,1051 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ c = au_cache_alloc_icntnr();
+ if (c) {
+ au_icntnr_init(c);
-+ c->vfs_inode.i_version = 1; /* sigen(sb); */
++ inode_set_iversion(&c->vfs_inode, 1); /* sigen(sb); */
+ c->iinfo.ii_hinode = NULL;
+ return &c->vfs_inode;
+ }
+ if (!err)
+ err = au_iinfo_init(inode);
+ if (!err)
-+ inode->i_version++;
++ inode_inc_iversion(inode);
+ else {
+ iget_failed(inode);
+ inode = ERR_PTR(err);
+ sb = dentry->d_sb;
+ if (sb->s_flags & SB_POSIXACL)
+ seq_puts(m, ",acl");
++#if 0
++ if (sb->s_flags & SB_I_VERSION)
++ seq_puts(m, ",i_version");
++#endif
+
+ /* lock free root dinfo */
+ si_noflush_read_lock(sb);
+
+ /* all timestamps always follow the ones on the branch */
+ sb->s_flags |= SB_NOATIME | SB_NODIRATIME;
++ sb->s_flags |= SB_I_VERSION; /* do we really need this? */
+ sb->s_op = &aufs_sop;
+ sb->s_d_op = &aufs_dop;
+ sb->s_magic = AUFS_SUPER_MAGIC;
+};
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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/super.h 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,626 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/sysaufs.c 2018-04-15 08:49:13.404484168 +0200
@@ -0,0 +1,104 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/sysaufs.h 2018-04-15 08:49:13.404484168 +0200
@@ -0,0 +1,101 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/sysfs.c 2018-04-15 08:49:13.404484168 +0200
@@ -0,0 +1,376 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.059991935 +0100
++++ linux/fs/aufs/sysrq.c 2018-04-15 08:49:13.404484168 +0200
@@ -0,0 +1,159 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.063325368 +0100
-@@ -0,0 +1,892 @@
++++ linux/fs/aufs/vdir.c 2018-06-04 09:08:09.188079511 +0200
+@@ -0,0 +1,893 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+ err = 0;
+ allocated = vdir;
+ } else if (may_read
-+ && (inode->i_version != vdir->vd_version
++ && (!inode_eq_iversion(inode, vdir->vd_version)
+ || time_after(jiffies, vdir->vd_jiffy + expire))) {
+ do_read = 1;
+ err = reinit_vdir(vdir);
+ err = au_do_read_vdir(&arg);
+ if (!err) {
+ /* file->f_pos = 0; */ /* todo: ctx->pos? */
-+ vdir->vd_version = inode->i_version;
++ vdir->vd_version = inode_query_iversion(inode);
+ vdir->vd_last.ul = 0;
+ vdir->vd_last.p.deblk = vdir->vd_deblk[0];
+ if (allocated)
+ inode = file_inode(file);
+ err = copy_vdir(vdir_cache, au_ivdir(inode));
+ if (!err) {
-+ file->f_version = inode->i_version;
++ file->f_version = inode_query_iversion(inode);
+ if (allocated)
+ au_set_fvdir_cache(file, allocated);
+ } else if (allocated)
+
+out:
+ /* smp_mb(); */
-+ AuTraceErr(!valid);
++ if (!valid)
++ AuDbg("valid %d\n", !valid);
+ return valid;
+}
+
+}
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 2018-01-29 07:56:20.063325368 +0100
-@@ -0,0 +1,894 @@
++++ linux/fs/aufs/vfsub.c 2018-06-04 09:08:11.628152835 +0200
+@@ -0,0 +1,893 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+
+ if (!err) {
+ /* todo: call VFS:may_open() here */
-+ err = open_check_o_direct(file);
+ /* todo: ima_file_check() too? */
+ if (!err && (args->open_flag & __FMODE_EXEC))
+ err = deny_write_access(file);
+}
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 2018-01-29 07:56:20.063325368 +0100
-@@ -0,0 +1,360 @@
++++ linux/fs/aufs/vfsub.h 2018-06-04 09:08:11.628152835 +0200
+@@ -0,0 +1,353 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#ifdef __KERNEL__
+
+#include <linux/fs.h>
++#include <linux/iversion.h>
+#include <linux/mount.h>
+#include <linux/posix_acl.h>
+#include <linux/xattr.h>
+/* copied from linux/fs/internal.h */
+/* todo: BAD approach!! */
+extern void __mnt_drop_write(struct vfsmount *);
-+extern int open_check_o_direct(struct file *f);
+
+/* ---------------------------------------------------------------------- */
+
+#define MtxMustLock(mtx) AuDebugOn(!mutex_is_locked(mtx))
+#define IMustLock(i) AuDebugOn(!inode_is_locked(i))
+
-+/* why VFS doesn't define it? */
-+static inline
-+void vfsub_inode_lock_shared_nested(struct inode *inode, unsigned int sc)
-+{
-+ down_read_nested(&inode->i_rwsem, sc);
-+}
-+
+/* ---------------------------------------------------------------------- */
+
+static inline void vfsub_drop_nlink(struct inode *inode)
+#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 2018-01-29 07:56:20.063325368 +0100
++++ linux/fs/aufs/wbr_policy.c 2018-04-15 08:49:13.404484168 +0200
@@ -0,0 +1,830 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+};
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 2018-01-29 07:56:20.063325368 +0100
++++ linux/fs/aufs/whout.c 2018-04-15 08:49:13.404484168 +0200
@@ -0,0 +1,1061 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.063325368 +0100
++++ linux/fs/aufs/whout.h 2018-04-15 08:49:13.404484168 +0200
@@ -0,0 +1,85 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.063325368 +0100
++++ linux/fs/aufs/wkq.c 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,390 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+}
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 2018-01-29 07:56:20.063325368 +0100
++++ linux/fs/aufs/wkq.h 2018-04-15 08:49:13.404484168 +0200
@@ -0,0 +1,93 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#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 2018-01-29 07:56:20.063325368 +0100
++++ linux/fs/aufs/xattr.c 2018-06-04 09:08:09.188079511 +0200
@@ -0,0 +1,355 @@
+/*
-+ * Copyright (C) 2014-2017 Junjiro R. Okajima
++ * Copyright (C) 2014-2018 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
+ h_isrc = d_inode(h_src);
+ h_idst = d_inode(h_dst);
+ inode_unlock(h_idst);
-+ vfsub_inode_lock_shared_nested(h_isrc, AuLsc_I_CHILD);
++ inode_lock_shared_nested(h_isrc, AuLsc_I_CHILD);
+ inode_lock_nested(h_idst, AuLsc_I_CHILD2);
+ unlocked = 0;
+
+}
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 2018-01-29 07:56:20.063325368 +0100
-@@ -0,0 +1,1418 @@
++++ linux/fs/aufs/xino.c 2018-06-04 09:08:09.188079511 +0200
+@@ -0,0 +1,1469 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+#include <linux/statfs.h>
+#include "aufs.h"
+
++static ssize_t xino_fread_wkq(vfs_readf_t func, struct file *file, void *buf,
++ size_t size, loff_t *pos);
++
+/* todo: unnecessary to support mmap_sem since kernel-space? */
+ssize_t xino_fread(vfs_readf_t func, struct file *file, void *kbuf, size_t size,
+ loff_t *pos)
+ void *k;
+ char __user *u;
+ } buf;
++ int i;
++ const int prevent_endless = 10;
+
++ i = 0;
+ buf.k = kbuf;
+ oldfs = get_fs();
+ set_fs(KERNEL_DS);
+ do {
-+ /* todo: signal_pending? */
+ err = func(file, buf.u, size, pos);
-+ } while (err == -EAGAIN || err == -EINTR);
++ if (err == -EINTR
++ && !au_wkq_test()
++ && fatal_signal_pending(current)) {
++ set_fs(oldfs);
++ err = xino_fread_wkq(func, file, kbuf, size, pos);
++ BUG_ON(err == -EINTR);
++ oldfs = get_fs();
++ set_fs(KERNEL_DS);
++ }
++ } while (i++ < prevent_endless
++ && (err == -EAGAIN || err == -EINTR));
+ set_fs(oldfs);
+
+#if 0 /* reserved for future use */
+ return err;
+}
+
++struct xino_fread_args {
++ ssize_t *errp;
++ vfs_readf_t func;
++ struct file *file;
++ void *buf;
++ size_t size;
++ loff_t *pos;
++};
++
++static void call_xino_fread(void *args)
++{
++ struct xino_fread_args *a = args;
++ *a->errp = xino_fread(a->func, a->file, a->buf, a->size, a->pos);
++}
++
++static ssize_t xino_fread_wkq(vfs_readf_t func, struct file *file, void *buf,
++ size_t size, loff_t *pos)
++{
++ ssize_t err;
++ int wkq_err;
++ struct xino_fread_args args = {
++ .errp = &err,
++ .func = func,
++ .file = file,
++ .buf = buf,
++ .size = size,
++ .pos = pos
++ };
++
++ wkq_err = au_wkq_wait(call_xino_fread, &args);
++ if (unlikely(wkq_err))
++ err = wkq_err;
++
++ return err;
++}
++
+/* ---------------------------------------------------------------------- */
+
+static ssize_t xino_fwrite_wkq(vfs_writef_t func, struct file *file, void *buf,
+}
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 2018-01-29 07:56:20.063325368 +0100
++++ linux/include/uapi/linux/aufs_type.h 2018-06-04 09:08:11.628152835 +0200
@@ -0,0 +1,447 @@
+/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 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
+
+#include <linux/limits.h>
+
-+#define AUFS_VERSION "4.x-rcN-20171218"
++#define AUFS_VERSION "4.x-rcN-20180430"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
aufs4.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index e51a59d..b4f7d3a 100644
+index 79902c1..40db6d1 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -600,6 +600,15 @@ static inline void loop_update_dio(struct loop_device *lo)
void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 0d4ea929..af293c2 100644
+index ad30f42..5caf353 100644
--- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c
@@ -358,7 +358,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
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 3b217c2..0f5ab22 100644
+index 3e9d59a..42811d3 100644
--- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c
@@ -133,3 +133,19 @@ void au_loopback_fin(void)
+ return f;
+}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index 7d7bf34..ba7c188 100644
+index dc3f3be..c33d060 100644
--- a/fs/aufs/loop.h
+++ b/fs/aufs/loop.h
@@ -26,7 +26,11 @@ void au_warn_loopback(struct super_block *h_sb);
#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 357bf04..c6614df 100644
+index 80644ef..19cde48 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
-@@ -839,7 +839,10 @@ static const struct super_operations aufs_sop = {
+@@ -843,7 +843,10 @@ static const struct super_operations aufs_sop = {
.statfs = aufs_statfs,
.put_super = aufs_put_super,
.sync_fs = aufs_sync_fs,
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 96e05b3..ba5e627 100644
+index 09a2542..11a6346 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1840,6 +1840,10 @@ struct super_operations {
+@@ -1852,6 +1852,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
projects / packages / kernel.git / blobdiff