SPDX-License-Identifier: GPL-2.0
-aufs5.11 kbuild patch
+aufs5.12 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index da524c4d7b7e0..50ab89368c2b5 100644
+index a55bda4233bbe..c4984b5bf340f 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -288,6 +288,7 @@ source "fs/sysv/Kconfig"
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index 999d1a23f036c..0cd76857ca764 100644
+index 3215fe205256d..7218277473b8f 100644
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
+@@ -135,3 +135,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_EROFS_FS) += erofs/
obj-$(CONFIG_VBOXSF_FS) += vboxsf/
obj-$(CONFIG_ZONEFS_FS) += zonefs/
+obj-$(CONFIG_AUFS_FS) += aufs/
SPDX-License-Identifier: GPL-2.0
-aufs5.11 base patch
+aufs5.12 base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index bfc1b86e3e733..cf773a5624338 100644
+index 9450e052f1b13..f7db6edba5a37 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3017,6 +3017,19 @@ F: include/linux/audit.h
+@@ -2992,6 +2992,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
M: Miguel Ojeda <ojeda@kernel.org>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index e5ff328f09175..39d539df0349d 100644
+index a370cde3ddd49..01ca256575fb2 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -761,6 +761,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
-index 97e81a844a966..a7522ebbca659 100644
+index 7d24ff7eb2068..3caa7ab4b84f1 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1292,7 +1292,7 @@ enum d_walk_ret {
+@@ -1318,7 +1318,7 @@ enum d_walk_ret {
*
* The @enter() callbacks are called with d_lock held.
*/
{
struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 05b36b28f2e87..e747a47a97da4 100644
+index dfc72f15be7fc..d8a12eb63961d 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
#define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
{
struct inode * inode = file_inode(filp);
int error = 0;
-@@ -63,6 +63,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
+@@ -64,6 +64,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);
return error;
diff --git a/fs/inode.c b/fs/inode.c
-index 6442d97d9a4ab..e4a25c3fa9e55 100644
+index a047ab306f9a8..ba1df0895b69f 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -1769,7 +1769,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1772,7 +1772,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.
*/
if (inode->i_op->update_time)
return inode->i_op->update_time(inode, time, flags);
diff --git a/fs/namespace.c b/fs/namespace.c
-index 9d33909d0f9e3..3e16fc64df8b8 100644
+index 56bb5a5fdc0d0..540679d7e0434 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -792,6 +792,12 @@ static inline int check_mnt(struct mount *mnt)
+@@ -807,6 +807,12 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns;
}
* vfsmount lock must be held for write
*/
diff --git a/fs/splice.c b/fs/splice.c
-index 866d5c2367b23..55b5356262085 100644
+index 5dbce4dcc1a7d..3e6ba363b7775 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -756,8 +756,8 @@ static int warn_unsupported(struct file *file, const char *op)
+@@ -759,8 +759,8 @@ static int warn_unsupported(struct file *file, const char *op)
/*
* Attempt to initiate a splice from pipe to file.
*/
{
if (unlikely(!out->f_op->splice_write))
return warn_unsupported(out, "write");
-@@ -767,9 +767,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -770,9 +770,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.
*/
if (wait)
sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index fd47deea7c176..91f3fbe5b57ff 100644
+index ec8f3ddf4a6aa..4fa4b24535fde 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1330,6 +1330,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1332,6 +1332,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);
-@@ -1841,6 +1842,7 @@ struct file_operations {
+@@ -1909,6 +1910,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);
-@@ -2326,6 +2328,7 @@ extern int current_umask(void);
+@@ -2428,6 +2430,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 timespec64 *, int);
/* /sys/fs */
extern struct kobject *fs_kobj;
-@@ -2562,6 +2565,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2668,6 +2671,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
}
void emergency_thaw_all(void);
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 b9e9adec73e8b..e152c49cc3163 100644
+index 7b7ebf2e28ec5..20c46305e057e 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
-@@ -241,6 +241,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
+@@ -248,6 +248,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key;
}
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index bdaf4829098c0..5c3bff75de111 100644
+index f160f1c97ca1e..fe71c2737eb9e 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -188,7 +188,7 @@ static
#ifdef CONFIG_LOCK_STAT
static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
SPDX-License-Identifier: GPL-2.0
-aufs5.11 mmap patch
+aufs5.12 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index b3422cda2a91e..bda8e8ece7208 100644
+index 3851bfcdba56e..d632ddd5f5ee8 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
-@@ -2184,7 +2184,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2183,7 +2183,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
rc = -ENOENT;
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 602e3a52884d8..a36614b84de16 100644
+index e862cab695838..5c45041943a6f 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1862,7 +1865,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1861,7 +1864,7 @@ static int show_numa_map(struct seq_file *m, void *v)
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 ecdf8a8cd6aeb..d9b3ec02ecbef 100644
+index 8ba434287387b..6d23d40ad1523 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1715,6 +1715,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1759,6 +1759,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
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 07d9acb5b19c4..2f395ab624f38 100644
+index 6613b26a88946..e94df45b5483a 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -278,6 +278,7 @@ struct vm_region {
+@@ -279,6 +279,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
-@@ -357,6 +358,7 @@ struct vm_area_struct {
+@@ -358,6 +359,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). */
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
-index d66cd1014211b..a2addc21d63fc 100644
+index 426cd0c51f9eb..ea0ae494c6dde 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -555,7 +555,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
put_write_access(inode);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
-index b6cd2fffa4922..784e2cebe1eac 100644
+index 72227b24a6168..5d03943b08e03 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
# Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c
-index aa0e0fb046700..d883a19f4237e 100644
+index 6ce832dc59e73..8b7a71b6f0e6c 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -2993,7 +2993,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -3162,7 +3162,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(mapping->host->i_sb);
if (page->mapping != mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
-index dc7206032387c..09b10e20c097c 100644
+index 3f287599a7a30..eb36f1b18f048 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
mpol_put(vma_policy(vma));
vm_area_free(vma);
return next;
-@@ -951,7 +951,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
+@@ -949,7 +949,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);
}
if (next->anon_vma)
anon_vma_merge(vma, next);
-@@ -1897,7 +1897,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1895,7 +1895,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
vma->vm_file = NULL;
/* Undo any partial mapping done by a device driver. */
-@@ -2757,7 +2757,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2755,7 +2755,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);
-@@ -2776,7 +2776,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2774,7 +2774,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));
-@@ -2969,7 +2969,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2967,7 +2967,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.rst.\n",
current->comm, current->pid);
-@@ -3044,10 +3044,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -3042,10 +3042,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
}
}
out:
mmap_write_unlock(mm);
if (populate)
-@@ -3334,7 +3351,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3332,7 +3349,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 870fea12823e6..edbc99eee5b6b 100644
+index 5c9ab799c0e63..dd78905704c12 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -533,7 +533,7 @@ static void __put_nommu_region(struct vm_region *region)
+}
+#endif /* !CONFIG_MMU */
SPDX-License-Identifier: GPL-2.0
-aufs5.11 standalone patch
+aufs5.12 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
-index a7522ebbca659..d429c984133ca 100644
+index 3caa7ab4b84f1..00e97c9ae7c45 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1397,6 +1397,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1423,6 +1423,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
struct check_mount {
struct vfsmount *mnt;
-@@ -2942,6 +2943,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2968,6 +2969,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 5d4d52039105c..adc75877cdee7 100644
+index 18594f11c31fe..ac38c0424d2a3 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -114,6 +114,7 @@ bool path_noexec(const struct path *path)
#ifdef CONFIG_USELIB
/*
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index e747a47a97da4..d6211ff25c9a4 100644
+index d8a12eb63961d..0532996186311 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
+@@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
out:
return error;
}
void __init files_init(void)
{
diff --git a/fs/inode.c b/fs/inode.c
-index e4a25c3fa9e55..497326faa1247 100644
+index ba1df0895b69f..0672530acf7dd 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -1775,6 +1775,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
+@@ -1778,6 +1778,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
return inode->i_op->update_time(inode, time, flags);
return generic_update_time(inode, time, flags);
}
/**
* atime_needs_update - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
-index 3e16fc64df8b8..eed3453ec40a8 100644
+index 540679d7e0434..74957d5edaa86 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
+@@ -438,6 +438,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
mnt_dec_writers(real_mount(mnt));
preempt_enable();
}
/**
* mnt_drop_write - give up write access to a mount
-@@ -797,6 +798,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
+@@ -812,6 +813,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
{
return check_mnt(real_mount(mnt));
}
/*
* vfsmount lock must be held for write
-@@ -1967,6 +1969,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1985,6 +1987,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
static void lock_mnt_tree(struct mount *mnt)
{
diff --git a/fs/notify/group.c b/fs/notify/group.c
-index a4a4b1c64d32a..86dc2efb1850c 100644
+index ffd723ffe46de..ec6172836b6f6 100644
--- a/fs/notify/group.c
+++ b/fs/notify/group.c
@@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
/*
* Drop a reference to a group. Free it if it's through.
diff --git a/fs/open.c b/fs/open.c
-index 1e06e443a5651..c3bbb8aafcd1a 100644
+index e53af13b5835f..f37da065e6544 100644
--- a/fs/open.c
+++ b/fs/open.c
-@@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+@@ -65,6 +65,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,
inode_unlock(dentry->d_inode);
return ret;
}
long vfs_truncate(const struct path *path, loff_t length)
{
diff --git a/fs/read_write.c b/fs/read_write.c
-index 75f764b434184..7582bb3fb634b 100644
+index 9db7adf160d20..8dc93a57a933f 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -503,6 +503,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
/* file_ppos returns &file->f_pos or NULL if file is stream */
static inline loff_t *file_ppos(struct file *file)
diff --git a/fs/splice.c b/fs/splice.c
-index 55b5356262085..c13ac0fbac318 100644
+index 3e6ba363b7775..7c1be373eb7cd 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -763,6 +763,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
return warn_unsupported(out, "write");
return out->f_op->splice_write(pipe, out, ppos, len, flags);
}
/*
* Attempt to initiate a splice from a file to a pipe.
-@@ -787,6 +788,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -795,6 +796,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return warn_unsupported(in, "read");
return in->f_op->splice_read(in, ppos, pipe, len, flags);
}
/*
* Write out and wait upon all dirty data associated with this
diff --git a/fs/xattr.c b/fs/xattr.c
-index fd57153b1f617..d8e9d0d6853ef 100644
+index b3444e06cded4..7b0f851b63d75 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
-@@ -371,6 +371,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
+@@ -383,6 +383,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
*xattr_value = value;
return error;
}
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 5c3bff75de111..ff00031462623 100644
+index fe71c2737eb9e..185531f89239a 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -209,6 +209,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c
-index 7b09cfbae94f7..3e060cc948262 100644
+index 5ac96b16f8fab..46d334d6ac1f6 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -1094,6 +1094,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -1102,6 +1102,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)
{
-@@ -1110,6 +1111,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1118,6 +1119,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)
-@@ -1118,6 +1120,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1126,6 +1128,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,
-@@ -1145,6 +1148,7 @@ int security_path_truncate(const struct path *path)
+@@ -1153,6 +1156,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)
{
-@@ -1152,6 +1156,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1160,6 +1164,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)
{
-@@ -1159,6 +1164,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1167,6 +1172,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)
{
-@@ -1259,6 +1265,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -1267,6 +1273,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)
{
-@@ -1451,6 +1458,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -1464,6 +1471,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
{
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 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs 2021-05-02 20:15:14.666670785 +0200
@@ -0,0 +1,55 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
+ When the aufs mount option 'noxino' is specified, it
+ will be empty. About XINO files, see the aufs manual.
+
-+What: /debug/aufs/si_<id>/xi0, xi1 ... xiN and xiN-N
++What: /debug/aufs/si_<id>/xi<branch-index>
+Date: March 2009
+Contact: J. R. Okajima <hooanon05g@gmail.com>
+Description:
+ 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 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs 2021-05-02 20:15:14.666670785 +0200
@@ -0,0 +1,31 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
+ per aufs mount, where <id> is a unique id generated
+ internally.
+
-+What: /sys/fs/aufs/si_<id>/br0, br1 ... brN
++What: /sys/fs/aufs/si_<id>/br<idx>
+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
++What: /sys/fs/aufs/si_<id>/brid<idx>
+Date: July 2013
+Contact: J. R. Okajima <hooanon05g@gmail.com>
+Description:
+ 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 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2021-05-02 20:15:14.666670785 +0200
@@ -0,0 +1,171 @@
+
+# Copyright (C) 2005-2020 Junjiro R. Okajima
+about it. But currently I have implemented it in kernel space.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2021-05-02 20:15:14.666670785 +0200
@@ -0,0 +1,258 @@
+
+# Copyright (C) 2005-2020 Junjiro R. Okajima
+For this purpose, use "aumvdown" command in aufs-util.git.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt linux/Documentation/filesystems/aufs/design/03atomic_open.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2021-05-02 20:15:14.666670785 +0200
@@ -0,0 +1,85 @@
+
+# Copyright (C) 2015-2020 Junjiro R. Okajima
+ be implemented in aufs, but not all I am afraid.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2021-05-02 20:15:14.666670785 +0200
@@ -0,0 +1,113 @@
+
+# Copyright (C) 2005-2020 Junjiro R. Okajima
+ by over-mounting something (or another method).
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,74 @@
+
+# Copyright (C) 2005-2020 Junjiro R. Okajima
+ same named entry on the upper branch.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,64 @@
+
+# Copyright (C) 2005-2020 Junjiro R. Okajima
+ 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 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2021-05-02 20:15:14.670004120 +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 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,102 @@
+
+# Copyright (C) 2017-2020 Junjiro R. Okajima
+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 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,120 @@
+
+# Copyright (C) 2011-2020 Junjiro R. Okajima
+should restore the original file state after an error happens.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,72 @@
+
+# Copyright (C) 2005-2020 Junjiro R. Okajima
+I have to give up this "looks-smater" approach.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt linux/Documentation/filesystems/aufs/design/06xattr.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,96 @@
+
+# Copyright (C) 2014-2020 Junjiro R. Okajima
+now, aufs implements the branch attributes to ignore the error.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,58 @@
+
+# Copyright (C) 2005-2020 Junjiro R. Okajima
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,52 @@
+
+# Copyright (C) 2005-2020 Junjiro R. Okajima
+initramfs will use it to replace the old one at the next boot.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2010-2020 Junjiro R. Okajima
+regular files only.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
--- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/README 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/README 2021-05-02 20:15:14.666670785 +0200
@@ -0,0 +1,401 @@
+
+Aufs5 -- advanced multi layered unification filesystem version 5.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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/aufs.h 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/branch.c 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,1427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.741013619 +0100
-@@ -0,0 +1,364 @@
++++ linux/fs/aufs/branch.h 2021-05-02 20:15:14.670004120 +0200
+@@ -0,0 +1,375 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ return br->br_path.dentry;
+}
+
++static inline struct user_namespace *au_br_userns(struct au_branch *br)
++{
++ return mnt_user_ns(br->br_path.mnt);
++}
++
+static inline struct super_block *au_br_sb(struct au_branch *br)
+{
+ return au_br_mnt(br)->mnt_sb;
+}
+
+static inline
++struct user_namespace *au_sbr_userns(struct super_block *sb, aufs_bindex_t bindex)
++{
++ return au_br_userns(au_sbr(sb, bindex));
++}
++
++static inline
+struct super_block *au_sbr_sb(struct super_block *sb, aufs_bindex_t bindex)
+{
+ return au_br_sb(au_sbr(sb, bindex));
+#endif /* __AUFS_BRANCH_H__ */
diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
--- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/conf.mk 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/conf.mk 2021-05-02 20:15:14.670004120 +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 2021-02-24 13:33:42.741013619 +0100
-@@ -0,0 +1,1445 @@
++++ linux/fs/aufs/cpup.c 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,1457 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+};
+
+static noinline_for_stack
-+int cpup_iattr(struct dentry *dst, aufs_bindex_t bindex, struct dentry *h_src,
++int cpup_iattr(struct dentry *dst, aufs_bindex_t bindex, struct path *h_src,
+ struct au_cpup_reg_attr *h_src_attr)
+{
+ int err, sbits, icex;
+ struct kstat *h_st;
+ struct au_branch *br;
+
-+ h_path.dentry = au_h_dptr(dst, bindex);
-+ h_idst = d_inode(h_path.dentry);
+ br = au_sbr(dst->d_sb, bindex);
+ h_path.mnt = au_br_mnt(br);
-+ h_isrc = d_inode(h_src);
++ h_path.dentry = au_h_dptr(dst, bindex);
++ h_idst = d_inode(h_path.dentry);
++ h_isrc = d_inode(h_src->dentry);
+ ia.ia_valid = ATTR_FORCE | ATTR_UID | ATTR_GID
+ | ATTR_ATIME | ATTR_MTIME
+ | ATTR_ATIME_SET | ATTR_MTIME_SET;
+ if (!err) {
+ mnt_flags = au_mntflags(dst->d_sb);
+ verbose = !!au_opt_test(mnt_flags, VERBOSE);
-+ err = au_cpup_xattr(h_path.dentry, h_src, icex, verbose);
++ err = au_cpup_xattr(&h_path, h_src, icex, verbose);
+ }
+
+ return err;
+ int err;
+ struct dentry *h_dentry;
+ struct inode *h_inode;
++ struct user_namespace *h_userns;
+
++ h_userns = mnt_user_ns(h_path->mnt);
+ h_dentry = h_path->dentry;
+ h_inode = d_inode(h_dentry);
+ /* forget_all_cached_acls(h_inode)); */
-+ err = vfsub_removexattr(h_dentry, XATTR_NAME_POSIX_ACL_ACCESS);
++ err = vfsub_removexattr(h_userns, h_dentry, XATTR_NAME_POSIX_ACL_ACCESS);
+ AuTraceErr(err);
+ if (err == -EOPNOTSUPP)
+ err = 0;
+ if (!err)
-+ err = vfsub_acl_chmod(h_inode, mode);
++ err = vfsub_acl_chmod(h_userns, h_inode, mode);
+
+ AuTraceErr(err);
+ return err;
+{
+ int err;
+ struct inode *dir, *inode;
++ struct user_namespace *h_userns;
+
-+ err = vfsub_removexattr(h_path->dentry, XATTR_NAME_POSIX_ACL_DEFAULT);
++ h_userns = mnt_user_ns(h_path->mnt);
++ err = vfsub_removexattr(h_userns, h_path->dentry,
++ XATTR_NAME_POSIX_ACL_DEFAULT);
+ AuTraceErr(err);
+ if (err == -EOPNOTSUPP)
+ err = 0;
+ struct inode *dst_inode, *h_dir, *inode, *delegated, *src_inode;
+ struct super_block *sb;
+ struct au_branch *br;
++ struct path h_src_path;
+ /* to reduce stack size */
+ struct {
+ struct au_dtime dt;
+ /* todo: necessary? */
+ /* au_pin_hdir_unlock(cpg->pin); */
+
-+ err = cpup_iattr(cpg->dentry, cpg->bdst, h_src, &a->h_src_attr);
++ h_src_path.dentry = h_src;
++ h_src_path.mnt = au_sbr_mnt(sb, cpg->bsrc);
++ err = cpup_iattr(cpg->dentry, cpg->bdst, &h_src_path, &a->h_src_attr);
+ if (unlikely(err)) {
+ /* todo: necessary? */
+ /* au_pin_hdir_relock(cpg->pin); */ /* ignore an error */
+ struct dentry *dentry, *parent;
+ struct file *h_file;
+ struct inode *h_dir;
++ struct user_namespace *h_userns;
+
+ dentry = cpg->dentry;
+ h_file = NULL;
+
+ parent = dget_parent(dentry);
+ h_dir = au_h_iptr(d_inode(parent), cpg->bdst);
-+ if (!au_test_h_perm_sio(h_dir, MAY_EXEC | MAY_WRITE)
++ h_userns = au_sbr_userns(dentry->d_sb, cpg->bdst);
++ if (!au_test_h_perm_sio(h_userns, h_dir, MAY_EXEC | MAY_WRITE)
+ && !au_cpup_sio_test(cpg->pin, d_inode(dentry)->i_mode))
+ err = au_cpup_simple(cpg);
+ else {
+ struct inode *dir, *h_dir, *h_tmpdir;
+ struct au_wbr *wbr;
+ struct au_pin wh_pin, *pin_orig;
++ struct user_namespace *h_userns;
+
+ dentry = cpg->dentry;
+ bdst = cpg->bdst;
+ cpg->pin = &wh_pin;
+ }
+
-+ if (!au_test_h_perm_sio(h_tmpdir, MAY_EXEC | MAY_WRITE)
++ h_userns = au_sbr_userns(dentry->d_sb, bdst);
++ if (!au_test_h_perm_sio(h_userns, h_tmpdir, MAY_EXEC | MAY_WRITE)
+ && !au_cpup_sio_test(cpg->pin, d_inode(dentry)->i_mode))
+ err = au_cpup_wh(cpg, file);
+ else {
+}
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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/cpup.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,100 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dbgaufs.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,526 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dbgaufs.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dcsub.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dcsub.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,137 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/debug.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,441 @@
+// SPDX-License-Identifier: GPL-2.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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/debug.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.741013619 +0100
-@@ -0,0 +1,1154 @@
++++ linux/fs/aufs/dentry.c 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,1160 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ struct dentry *h_dentry;
+ struct inode *h_inode;
+ struct au_branch *br;
++ struct user_namespace *h_userns;
+ int wh_found, opq;
+ unsigned char wh_able;
+ const unsigned char allow_neg = !!au_ftest_lkup(args->flags, ALLOW_NEG);
+
+ wh_found = 0;
+ br = au_sbr(dentry->d_sb, bindex);
++ h_userns = au_br_userns(br);
+ wh_able = !!au_br_whable(br->br_perm);
+ if (wh_able)
-+ wh_found = au_wh_test(h_parent, &args->whname, ignore_perm);
++ wh_found = au_wh_test(h_userns, h_parent, &args->whname,
++ ignore_perm);
+ h_dentry = ERR_PTR(wh_found);
+ if (!wh_found)
+ goto real_lookup;
+ if (!ignore_perm)
+ h_dentry = vfsub_lkup_one(args->name, h_parent);
+ else
-+ h_dentry = au_sio_lkup_one(args->name, h_parent);
++ h_dentry = au_sio_lkup_one(h_userns, args->name, h_parent);
+ if (IS_ERR(h_dentry)) {
+ if (PTR_ERR(h_dentry) == -ENAMETOOLONG
+ && !allow_neg)
+ goto out; /* success */
+
+ inode_lock_shared_nested(h_inode, AuLsc_I_CHILD);
-+ opq = au_diropq_test(h_dentry);
++ opq = au_diropq_test(h_userns, h_dentry);
+ inode_unlock_shared(h_inode);
+ if (opq > 0)
+ au_set_dbdiropq(dentry, bindex);
+ return err;
+}
+
-+struct dentry *au_sio_lkup_one(struct qstr *name, struct dentry *parent)
++struct dentry *au_sio_lkup_one(struct user_namespace *userns, struct qstr *name,
++ struct dentry *parent)
+{
+ struct dentry *dentry;
+ int wkq_err;
+
-+ if (!au_test_h_perm_sio(d_inode(parent), MAY_EXEC))
++ if (!au_test_h_perm_sio(userns, d_inode(parent), MAY_EXEC))
+ dentry = vfsub_lkup_one(name, parent);
+ else {
+ struct vfsub_lkup_one_args args = {
+ int err;
+ struct dentry *parent, *h_parent, *h_dentry;
+ struct au_branch *br;
++ struct user_namespace *h_userns;
+
+ parent = dget_parent(dentry);
+ h_parent = au_h_dptr(parent, bindex);
+ br = au_sbr(dentry->d_sb, bindex);
++ h_userns = au_br_userns(br);
+ if (wh)
+ h_dentry = au_whtmp_lkup(h_parent, br, &dentry->d_name);
+ else
-+ h_dentry = au_sio_lkup_one(&dentry->d_name, h_parent);
++ h_dentry = au_sio_lkup_one(h_userns, &dentry->d_name, h_parent);
+ err = PTR_ERR(h_dentry);
+ if (IS_ERR(h_dentry))
+ goto out;
+};
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 2021-02-24 13:33:42.741013619 +0100
-@@ -0,0 +1,268 @@
++++ linux/fs/aufs/dentry.h 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,269 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+/* dentry.c */
+extern const struct dentry_operations aufs_dop, aufs_dop_noreval;
+struct au_branch;
-+struct dentry *au_sio_lkup_one(struct qstr *name, struct dentry *parent);
++struct dentry *au_sio_lkup_one(struct user_namespace *userns, struct qstr *name,
++ struct dentry *parent);
+int au_h_verify(struct dentry *h_dentry, unsigned int udba, struct inode *h_dir,
+ struct dentry *h_parent, struct au_branch *br);
+
+#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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dinfo.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,554 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.741013619 +0100
-@@ -0,0 +1,763 @@
++++ linux/fs/aufs/dir.c 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,765 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ int err, wkq_err;
+ struct dentry *h_dentry;
+ struct inode *h_inode;
++ struct user_namespace *h_userns;
+
++ h_userns = au_sbr_userns(dentry->d_sb, arg->bindex);
+ h_dentry = au_h_dptr(dentry, arg->bindex);
+ h_inode = d_inode(h_dentry);
+ /* todo: i_mode changes anytime? */
+ inode_lock_shared_nested(h_inode, AuLsc_I_CHILD);
-+ err = au_test_h_perm_sio(h_inode, MAY_EXEC | MAY_READ);
++ err = au_test_h_perm_sio(h_userns, h_inode, MAY_EXEC | MAY_READ);
+ inode_unlock_shared(h_inode);
+ if (!err)
+ err = do_test_empty(dentry, arg);
+};
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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dir.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,134 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dirren.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,1316 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ err = PTR_ERR(hinopath.dentry);
+ if (IS_ERR(hinopath.dentry))
+ goto out_unlock;
++ hinopath.mnt = path->mnt;
+
+ err = 0;
+ flags = O_RDONLY;
+ }
+ flags = O_WRONLY;
+ }
-+ hinopath.mnt = path->mnt;
+ hinofile = vfsub_dentry_open(&hinopath, flags);
+ if (suspend)
+ au_hn_inode_unlock(hdir);
+}
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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dirren.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/dynop.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,368 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/dynop.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/export.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,837 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/fhsm.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/file.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,863 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+};
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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/file.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,342 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/finfo.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.744347058 +0100
-@@ -0,0 +1,762 @@
++++ linux/fs/aufs/f_op.c 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,771 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ return err;
+}
+
++/*
++ * We may be able to remove aufs_splice_{read,write}() since almost all FSes
++ * don't have their own .splice_{read,write} implimentations, and they use
++ * generic_file_splice_read() and iter_file_splice_write() who can act like the
++ * simple converters to f_op->iter_read() and ->iter_write().
++ * But we keep our own implementations because some non-mainlined FSes may have
++ * their own .splice_{read,write} implimentations and aufs doesn't want to take
++ * away an opportunity to co-work with aufs from them.
++ */
+static ssize_t aufs_splice_read(struct file *file, loff_t *ppos,
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags)
+};
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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/fstype.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,401 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/hbl.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/hfsnotify.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,288 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+};
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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/hfsplus.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/hnotify.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,715 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/iinfo.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,286 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.744347058 +0100
-@@ -0,0 +1,529 @@
++++ linux/fs/aufs/inode.c 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,531 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ return err;
+}
+
-+int au_test_h_perm(struct inode *h_inode, int mask)
++int au_test_h_perm(struct user_namespace *h_userns, struct inode *h_inode,
++ int mask)
+{
+ if (uid_eq(current_fsuid(), GLOBAL_ROOT_UID))
+ return 0;
-+ return inode_permission(h_inode, mask);
++ return inode_permission(h_userns, h_inode, mask);
+}
+
-+int au_test_h_perm_sio(struct inode *h_inode, int mask)
++int au_test_h_perm_sio(struct user_namespace *h_userns, 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);
++ return au_test_h_perm(h_userns, h_inode, mask);
+}
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 2021-02-24 13:33:42.744347058 +0100
-@@ -0,0 +1,698 @@
++++ linux/fs/aufs/inode.h 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,705 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+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);
++int au_test_h_perm(struct user_namespace *h_userns, struct inode *h_inode,
++ int mask);
++int au_test_h_perm_sio(struct user_namespace *h_userns, 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)
+/* 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);
++int aufs_mknod(struct user_namespace *userns, struct inode *dir,
++ struct dentry *dentry, umode_t mode, dev_t dev);
++int aufs_symlink(struct user_namespace *userns, struct inode *dir,
++ struct dentry *dentry, const char *symname);
++int aufs_create(struct user_namespace *userns, 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_tmpfile(struct user_namespace *userns, 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);
++int aufs_mkdir(struct user_namespace *userns, struct inode *dir,
++ struct dentry *dentry, umode_t mode);
+
+/* i_op_del.c */
+int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup);
+
+/* 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);
++int aufs_rename(struct user_namespace *userns,
++ struct inode *_src_dir, struct dentry *_src_dentry,
++ struct inode *_dst_dir, struct dentry *_dst_dentry,
++ unsigned int _flags);
+
+/* iinfo.c */
+struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex);
+
+#ifdef CONFIG_AUFS_XATTR
+/* xattr.c */
-+int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags,
++int au_cpup_xattr(struct path *h_dst, struct path *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,
++AuStubInt0(au_cpup_xattr, struct path *h_dst, struct path *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);
++int aufs_set_acl(struct user_namespace *userns, struct inode *inode,
++ struct posix_acl *acl, int type);
+#endif
+
+#if IS_ENABLED(CONFIG_AUFS_XATTR) || IS_ENABLED(CONFIG_FS_POSIX_ACL)
+#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 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/ioctl.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,220 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+#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 2021-02-24 13:33:42.744347058 +0100
-@@ -0,0 +1,936 @@
++++ linux/fs/aufs/i_op_add.c 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,941 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ return err;
+}
+
-+int aufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
-+ dev_t dev)
++int aufs_mknod(struct user_namespace *userns, struct inode *dir,
++ struct dentry *dentry, umode_t mode, dev_t dev)
+{
+ struct simple_arg arg = {
+ .type = Mknod,
+ return add_simple(dir, dentry, &arg);
+}
+
-+int aufs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
++int aufs_symlink(struct user_namespace *userns, struct inode *dir,
++ struct dentry *dentry, const char *symname)
+{
+ struct simple_arg arg = {
+ .type = Symlink,
+ return add_simple(dir, dentry, &arg);
+}
+
-+int aufs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
-+ bool want_excl)
++int aufs_create(struct user_namespace *userns, struct inode *dir,
++ struct dentry *dentry, umode_t mode, bool want_excl)
+{
+ struct simple_arg arg = {
+ .type = Creat,
+ return add_simple(dir, dentry, &arg);
+}
+
-+int aufs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
++int aufs_tmpfile(struct user_namespace *userns, struct inode *dir,
++ struct dentry *dentry, umode_t mode)
+{
+ int err;
+ aufs_bindex_t bindex;
+ struct dentry *parent, *h_parent, *h_dentry;
+ struct inode *h_dir, *inode;
+ struct vfsmount *h_mnt;
++ struct user_namespace *h_userns;
+ struct au_wr_dir_args wr_dir_args = {
+ .force_btgt = -1,
+ .flags = AuWrDir_TMPFILE
+ if (unlikely(err))
+ goto out_parent;
+
++ h_userns = mnt_user_ns(h_mnt);
+ h_parent = au_h_dptr(parent, bindex);
-+ h_dentry = vfs_tmpfile(h_parent, mode, /*open_flag*/0);
++ h_dentry = vfs_tmpfile(h_userns, h_parent, mode, /*open_flag*/0);
+ if (IS_ERR(h_dentry)) {
+ err = PTR_ERR(h_dentry);
+ goto out_mnt;
+ return err;
+}
+
-+int aufs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
++int aufs_mkdir(struct user_namespace *userns, struct inode *dir,
++ struct dentry *dentry, umode_t mode)
+{
+ int err, rerr;
+ aufs_bindex_t bindex;
+}
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 2021-02-24 13:33:42.744347058 +0100
-@@ -0,0 +1,1502 @@
++++ linux/fs/aufs/i_op.c 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,1513 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+{
+ int err;
+ const unsigned char write_mask = !!(mask & (MAY_WRITE | MAY_APPEND));
++ struct user_namespace *h_userns;
+
+ err = -EPERM;
+ if (write_mask && IS_IMMUTABLE(h_inode))
+ * - nfs always sets SB_POSIXACL regardless its mount option 'noacl.'
+ * in this case, generic_permission() returns -EOPNOTSUPP.
+ */
++ h_userns = mnt_user_ns(h_path->mnt);
+ 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 %ps\n", h_inode->i_op->get_acl); */
-+ err = generic_permission(h_inode, mask);
++ err = generic_permission(h_userns, h_inode, mask);
+ if (err == -EOPNOTSUPP && au_test_nfs_noacl(h_inode))
-+ err = h_inode->i_op->permission(h_inode, mask);
++ err = h_inode->i_op->permission(h_userns, h_inode,
++ mask);
+ AuTraceErr(err);
+ } else {
+ /* AuLabel(h_inode->permission); */
-+ err = h_inode->i_op->permission(h_inode, mask);
++ err = h_inode->i_op->permission(h_userns, h_inode, mask);
+ AuTraceErr(err);
+ }
+
+ return err;
+}
+
-+static int aufs_permission(struct inode *inode, int mask)
++static int aufs_permission(struct user_namespace *userns, struct inode *inode,
++ int mask)
+{
+ int err;
+ aufs_bindex_t bindex, bbot;
+ return err;
+}
+
-+static int aufs_setattr(struct dentry *dentry, struct iattr *ia)
++static int aufs_setattr(struct user_namespace *userns, struct dentry *dentry,
++ struct iattr *ia)
+{
+ int err;
+ struct inode *inode, *delegated;
+ struct super_block *sb;
+ struct file *file;
+ struct au_icpup_args *a;
++ struct user_namespace *h_userns;
+
+ inode = d_inode(dentry);
+ IMustLock(inode);
+
-+ err = setattr_prepare(dentry, ia);
++ err = setattr_prepare(userns, dentry, ia);
+ if (unlikely(err))
+ goto out;
+
+ * 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 && (ia->ia_valid & ATTR_MODE)) {
++ h_userns = mnt_user_ns(a->h_path.mnt);
++ err = vfsub_acl_chmod(h_userns, a->h_inode, ia->ia_mode);
++ }
+ if (!err)
+ au_cpup_attr_changeable(inode);
+
+ struct super_block *sb;
+ struct au_icpup_args *a;
+ struct inode *h_inode;
++ struct user_namespace *h_userns;
+
+ IMustLock(inode);
+
+ err = au_h_path_to_set_attr(dentry, a, &h_path);
+ if (unlikely(err))
+ goto out_di;
++ h_userns = mnt_user_ns(h_path.mnt);
+
+ 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,
++ err = vfsub_setxattr(h_userns, 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)
++ if (h_inode->i_op->set_acl) {
+ /* this will call posix_acl_update_mode */
-+ err = h_inode->i_op->set_acl(h_inode,
++ err = h_inode->i_op->set_acl(h_userns, h_inode,
+ arg->u.acl_set.acl,
+ arg->u.acl_set.type);
++ }
+ break;
+ }
+ if (!err)
+ return err;
+}
+
-+static int aufs_getattr(const struct path *path, struct kstat *st,
-+ u32 request, unsigned int query)
++static int aufs_getattr(struct user_namespace *userns, const struct path *path,
++ struct kstat *st, u32 request, unsigned int query)
+{
+ int err;
+ unsigned char positive;
+ goto out_di;
+
+out_fill:
-+ generic_fillattr(inode, st);
++ generic_fillattr(userns, inode, st);
+out_di:
+ di_read_unlock(dentry, AuLock_IR);
+out_si:
+};
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 2021-02-24 13:33:42.744347058 +0100
-@@ -0,0 +1,513 @@
++++ linux/fs/aufs/i_op_del.c 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,515 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ umode_t h_mode;
+ struct dentry *h_dentry, *h_latest;
+ struct inode *h_inode;
++ struct user_namespace *h_userns;
+
+ h_dentry = au_h_dptr(dentry, bindex);
+ if (d_really_is_positive(dentry)) {
+ * let's try heavy test.
+ */
+ err = -EACCES;
++ h_userns = au_sbr_userns(dentry->d_sb, bindex);
+ if (unlikely(!au_opt_test(au_mntflags(dentry->d_sb), DIRPERM1)
-+ && au_test_h_perm(d_inode(h_parent),
++ && au_test_h_perm(h_userns, d_inode(h_parent),
+ MAY_EXEC | MAY_WRITE)))
+ goto out;
+
-+ h_latest = au_sio_lkup_one(&dentry->d_name, h_parent);
++ h_latest = au_sio_lkup_one(h_userns, &dentry->d_name, h_parent);
+ err = -EIO;
+ if (IS_ERR(h_latest))
+ goto out;
+}
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 2021-02-24 13:33:42.744347058 +0100
-@@ -0,0 +1,1250 @@
++++ linux/fs/aufs/i_op_ren.c 2021-05-02 20:15:14.673337458 +0200
+@@ -0,0 +1,1251 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+
+/* ---------------------------------------------------------------------- */
+
-+int aufs_rename(struct inode *_src_dir, struct dentry *_src_dentry,
++int aufs_rename(struct user_namespace *userns,
++ struct inode *_src_dir, struct dentry *_src_dentry,
+ struct inode *_dst_dir, struct dentry *_dst_dentry,
+ unsigned int _flags)
+{
+}
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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/Kconfig 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,199 @@
+# SPDX-License-Identifier: GPL-2.0
+config AUFS_FS
+endif
diff -urN /usr/share/empty/fs/aufs/lcnt.h linux/fs/aufs/lcnt.h
--- /usr/share/empty/fs/aufs/lcnt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/lcnt.h 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/lcnt.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,186 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#endif /* __AUFS_LCNT_H__ */
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/loop.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/loop.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/magic.mk 2021-05-02 20:15:14.673337458 +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 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/Makefile 2021-05-02 20:15:14.670004120 +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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/module.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/module.h 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,166 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/mvdown.c 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,706 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/opts.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,1880 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/opts.h 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,225 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/plink.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,516 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/poll.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
-@@ -0,0 +1,105 @@
++++ linux/fs/aufs/posix_acl.c 2021-05-02 20:15:14.676670793 +0200
+@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2014-2020 Junjiro R. Okajima
+ return acl;
+}
+
-+int aufs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
++int aufs_set_acl(struct user_namespace *userns, struct inode *inode,
++ struct posix_acl *acl, int type)
+{
+ int err;
+ ssize_t ssz;
+}
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/procfs.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/rdu.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,384 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+#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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/rwsem.h 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sbinfo.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,314 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
-@@ -0,0 +1,1047 @@
++++ linux/fs/aufs/super.c 2021-05-02 20:15:14.676670793 +0200
+@@ -0,0 +1,1050 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+struct file_system_type aufs_fs_type = {
+ .name = AUFS_FSTYPE,
+ /* a race between rename and others */
-+ .fs_flags = FS_RENAME_DOES_D_MOVE,
++ .fs_flags = FS_RENAME_DOES_D_MOVE
++ /* untested */
++ /*| FS_ALLOW_IDMAP*/
++ ,
+ .mount = aufs_mount,
+ .kill_sb = aufs_kill_sb,
+ /* no need to __module_get() and module_put(). */
+};
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/super.h 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,587 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sysaufs.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sysaufs.h 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sysfs.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,374 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sysrq.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/vdir.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,896 @@
+// SPDX-License-Identifier: GPL-2.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 2021-02-24 13:33:42.747680497 +0100
-@@ -0,0 +1,885 @@
++++ linux/fs/aufs/vfsub.c 2021-05-02 20:15:14.676670793 +0200
+@@ -0,0 +1,916 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+{
+ int err;
+ struct dentry *d;
++ struct user_namespace *userns;
+
+ IMustLock(dir);
+
+ path->dentry = d;
+ if (unlikely(err))
+ goto out;
++ userns = mnt_user_ns(path->mnt);
+
+ lockdep_off();
-+ err = vfs_create(dir, path->dentry, mode, want_excl);
++ err = vfs_create(userns, dir, path->dentry, mode, want_excl);
+ lockdep_on();
+ if (!err) {
+ struct path tmp = *path;
+{
+ int err;
+ struct dentry *d;
++ struct user_namespace *userns;
+
+ IMustLock(dir);
+
+ path->dentry = d;
+ if (unlikely(err))
+ goto out;
++ userns = mnt_user_ns(path->mnt);
+
+ lockdep_off();
-+ err = vfs_symlink(dir, path->dentry, symname);
++ err = vfs_symlink(userns, dir, path->dentry, symname);
+ lockdep_on();
+ if (!err) {
+ struct path tmp = *path;
+{
+ int err;
+ struct dentry *d;
++ struct user_namespace *userns;
+
+ IMustLock(dir);
+
+ path->dentry = d;
+ if (unlikely(err))
+ goto out;
++ userns = mnt_user_ns(path->mnt);
+
+ lockdep_off();
-+ err = vfs_mknod(dir, path->dentry, mode, dev);
++ err = vfs_mknod(userns, dir, path->dentry, mode, dev);
+ lockdep_on();
+ if (!err) {
+ struct path tmp = *path;
+{
+ int err;
+ struct dentry *d;
++ struct user_namespace *userns;
+
+ IMustLock(dir);
+
+ path->dentry = d;
+ if (unlikely(err))
+ goto out;
++ userns = mnt_user_ns(path->mnt);
+
+ lockdep_off();
-+ err = vfs_link(src_dentry, dir, path->dentry, delegated_inode);
++ err = vfs_link(src_dentry, userns, dir, path->dentry, delegated_inode);
+ lockdep_on();
+ if (!err) {
+ struct path tmp = *path;
+ struct inode **delegated_inode, unsigned int flags)
+{
+ int err;
++ struct renamedata rd;
+ struct path tmp = {
+ .mnt = path->mnt
+ };
+ if (unlikely(err))
+ goto out;
+
++ rd.old_mnt_userns = mnt_user_ns(path->mnt);
++ rd.old_dir = src_dir;
++ rd.old_dentry = src_dentry;
++ rd.new_mnt_userns = rd.old_mnt_userns;
++ rd.new_dir = dir;
++ rd.new_dentry = path->dentry;
++ rd.delegated_inode = delegated_inode;
++ rd.flags = flags;
+ lockdep_off();
-+ err = vfs_rename(src_dir, src_dentry, dir, path->dentry,
-+ delegated_inode, flags);
++ err = vfs_rename(&rd);
+ lockdep_on();
+ if (!err) {
+ int did;
+{
+ int err;
+ struct dentry *d;
++ struct user_namespace *userns;
+
+ IMustLock(dir);
+
+ path->dentry = d;
+ if (unlikely(err))
+ goto out;
++ userns = mnt_user_ns(path->mnt);
+
+ lockdep_off();
-+ err = vfs_mkdir(dir, path->dentry, mode);
++ err = vfs_mkdir(userns, dir, path->dentry, mode);
+ lockdep_on();
+ if (!err) {
+ struct path tmp = *path;
+{
+ int err;
+ struct dentry *d;
++ struct user_namespace *userns;
+
+ IMustLock(dir);
+
+ path->dentry = d;
+ if (unlikely(err))
+ goto out;
++ userns = mnt_user_ns(path->mnt);
+
+ lockdep_off();
-+ err = vfs_rmdir(dir, path->dentry);
++ err = vfs_rmdir(userns, dir, path->dentry);
+ lockdep_on();
+ if (!err) {
+ struct path tmp = {
+ int err;
+ struct inode *h_inode;
+ struct super_block *h_sb;
++ struct user_namespace *h_userns;
+
+ if (!h_file) {
+ err = vfsub_truncate(h_path, length);
+ if (!err)
+ err = security_path_truncate(h_path);
+ if (!err) {
++ h_userns = mnt_user_ns(h_path->mnt);
+ lockdep_off();
-+ err = do_truncate(h_path->dentry, length, attr, h_file);
++ err = do_truncate(h_userns, h_path->dentry, length, attr,
++ h_file);
+ lockdep_on();
+ }
+ lockdep_off();
+int vfsub_sio_mkdir(struct inode *dir, struct path *path, int mode)
+{
+ int err, do_sio, wkq_err;
++ struct user_namespace *userns;
+
-+ do_sio = au_test_h_perm_sio(dir, MAY_EXEC | MAY_WRITE);
++ userns = mnt_user_ns(path->mnt);
++ do_sio = au_test_h_perm_sio(userns, dir, MAY_EXEC | MAY_WRITE);
+ if (!do_sio) {
+ lockdep_off();
+ err = vfsub_mkdir(dir, path, mode);
+int vfsub_sio_rmdir(struct inode *dir, struct path *path)
+{
+ int err, do_sio, wkq_err;
++ struct user_namespace *userns;
+
-+ do_sio = au_test_h_perm_sio(dir, MAY_EXEC | MAY_WRITE);
++ userns = mnt_user_ns(path->mnt);
++ do_sio = au_test_h_perm_sio(userns, dir, MAY_EXEC | MAY_WRITE);
+ if (!do_sio) {
+ lockdep_off();
+ err = vfsub_rmdir(dir, path);
+{
+ struct notify_change_args *a = args;
+ struct inode *h_inode;
++ struct user_namespace *userns;
+
+ h_inode = d_inode(a->path->dentry);
+ IMustLock(h_inode);
+
+ *a->errp = -EPERM;
+ if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) {
++ userns = mnt_user_ns(a->path->mnt);
+ lockdep_off();
-+ *a->errp = notify_change(a->path->dentry, a->ia,
++ *a->errp = notify_change(userns, a->path->dentry, a->ia,
+ a->delegated_inode);
+ lockdep_on();
+ if (!*a->errp)
+ struct unlink_args *a = args;
+ struct dentry *d = a->path->dentry;
+ struct inode *h_inode;
++ struct user_namespace *userns;
+ const int stop_sillyrename = (au_test_nfs(d->d_sb)
+ && au_dcount(d) == 1);
+
+ ihold(h_inode);
+ }
+
++ userns = mnt_user_ns(a->path->mnt);
+ lockdep_off();
-+ *a->errp = vfs_unlink(a->dir, d, a->delegated_inode);
++ *a->errp = vfs_unlink(userns, a->dir, d, a->delegated_inode);
+ lockdep_on();
+ if (!*a->errp) {
+ struct path tmp = {
+}
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 2021-02-24 13:33:42.747680497 +0100
-@@ -0,0 +1,354 @@
++++ linux/fs/aufs/vfsub.h 2021-05-02 20:15:14.676670793 +0200
+@@ -0,0 +1,358 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+}
+
+#ifdef CONFIG_FS_POSIX_ACL
-+static inline int vfsub_acl_chmod(struct inode *h_inode, umode_t h_mode)
++static inline int vfsub_acl_chmod(struct user_namespace *h_userns,
++ struct inode *h_inode, umode_t h_mode)
+{
+ int err;
+
-+ err = posix_acl_chmod(h_inode, h_mode);
++ err = posix_acl_chmod(h_userns, h_inode, h_mode);
+ if (err == -EOPNOTSUPP)
+ err = 0;
+ return err;
+}
+#else
-+AuStubInt0(vfsub_acl_chmod, struct inode *h_inode, umode_t h_mode);
++AuStubInt0(vfsub_acl_chmod, struct user_namespace *h_userns,
++ struct inode *h_inode, umode_t h_mode);
+#endif
+
+long vfsub_splice_to(struct file *in, loff_t *ppos,
+
+/* ---------------------------------------------------------------------- */
+
-+static inline int vfsub_setxattr(struct dentry *dentry, const char *name,
++static inline int vfsub_setxattr(struct user_namespace *userns,
++ struct dentry *dentry, const char *name,
+ const void *value, size_t size, int flags)
+{
+ int err;
+
+ lockdep_off();
-+ err = vfs_setxattr(dentry, name, value, size, flags);
++ err = vfs_setxattr(userns, dentry, name, value, size, flags);
+ lockdep_on();
+
+ return err;
+}
+
-+static inline int vfsub_removexattr(struct dentry *dentry, const char *name)
++static inline int vfsub_removexattr(struct user_namespace *userns,
++ struct dentry *dentry, const char *name)
+{
+ int err;
+
+ lockdep_off();
-+ err = vfs_removexattr(dentry, name);
++ err = vfs_removexattr(userns, dentry, name);
+ lockdep_on();
+
+ return err;
+#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 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/wbr_policy.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+};
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 2021-02-24 13:33:42.751013936 +0100
-@@ -0,0 +1,1062 @@
++++ linux/fs/aufs/whout.c 2021-05-02 20:15:14.676670793 +0200
+@@ -0,0 +1,1070 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ * test if the @wh_name exists under @h_parent.
+ * @try_sio specifies the necessary of super-io.
+ */
-+int au_wh_test(struct dentry *h_parent, struct qstr *wh_name, int try_sio)
++int au_wh_test(struct user_namespace *h_userns, struct dentry *h_parent,
++ struct qstr *wh_name, int try_sio)
+{
+ int err;
+ struct dentry *wh_dentry;
+ if (!try_sio)
+ wh_dentry = vfsub_lkup_one(wh_name, h_parent);
+ else
-+ wh_dentry = au_sio_lkup_one(wh_name, h_parent);
++ wh_dentry = au_sio_lkup_one(h_userns, wh_name, h_parent);
+ err = PTR_ERR(wh_dentry);
+ if (IS_ERR(wh_dentry)) {
+ if (err == -ENAMETOOLONG)
+/*
+ * test if the @h_dentry sets opaque or not.
+ */
-+int au_diropq_test(struct dentry *h_dentry)
++int au_diropq_test(struct user_namespace *h_userns, struct dentry *h_dentry)
+{
+ int err;
+ struct inode *h_dir;
+
+ h_dir = d_inode(h_dentry);
-+ err = au_wh_test(h_dentry, &diropq_name,
-+ au_test_h_perm_sio(h_dir, MAY_EXEC));
++ err = au_wh_test(h_userns, h_dentry, &diropq_name,
++ au_test_h_perm_sio(h_userns, h_dir, MAY_EXEC));
+ return err;
+}
+
+ /* strict atomic_t is unnecessary here */
+ static unsigned short cnt;
+ struct qstr qs;
++ struct user_namespace *h_userns;
+
+ BUILD_BUG_ON(sizeof(cnt) * 2 > AUFS_WH_TMP_LEN);
+
+ *p++ = '.';
+ AuDebugOn(name + qs.len + 1 - p <= AUFS_WH_TMP_LEN);
+
++ h_userns = au_br_userns(br);
+ qs.name = name;
+ for (i = 0; i < 3; i++) {
+ sprintf(p, "%.*x", AUFS_WH_TMP_LEN, cnt++);
-+ dentry = au_sio_lkup_one(&qs, h_parent);
++ dentry = au_sio_lkup_one(h_userns, &qs, h_parent);
+ if (IS_ERR(dentry) || d_is_negative(dentry))
+ goto out_name;
+ dput(dentry);
+ unsigned int flags)
+{
+ struct dentry *diropq, *h_dentry;
++ struct user_namespace *h_userns;
+
++ h_userns = au_sbr_userns(dentry->d_sb, bindex);
+ h_dentry = au_h_dptr(dentry, bindex);
-+ if (!au_test_h_perm_sio(d_inode(h_dentry), MAY_EXEC | MAY_WRITE))
++ if (!au_test_h_perm_sio(h_userns, d_inode(h_dentry),
++ MAY_EXEC | MAY_WRITE))
+ diropq = do_diropq(dentry, bindex, flags);
+ else {
+ int wkq_err;
+ struct path h_tmp;
+ struct inode *wh_inode, *h_dir;
+ struct au_branch *br;
++ struct user_namespace *h_userns;
+
+ h_dir = d_inode(wh_dentry->d_parent); /* dir inode is locked */
+ IMustLock(h_dir);
+
+ br = au_sbr(dir->i_sb, bindex);
++ h_userns = au_br_userns(br);
+ wh_inode = d_inode(wh_dentry);
+ inode_lock_nested(wh_inode, AuLsc_I_CHILD);
+
+ * someone else might change some whiteouts while we were sleeping.
+ * it means this whlist may have an obsoleted entry.
+ */
-+ if (!au_test_h_perm_sio(wh_inode, MAY_EXEC | MAY_WRITE))
++ if (!au_test_h_perm_sio(h_userns, wh_inode, MAY_EXEC | MAY_WRITE))
+ err = del_wh_children(wh_dentry, whlist, bindex, br);
+ else {
+ int wkq_err;
+}
diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
--- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h 2021-02-24 13:33:42.751013936 +0100
-@@ -0,0 +1,86 @@
++++ linux/fs/aufs/whout.h 2021-05-02 20:15:14.676670793 +0200
+@@ -0,0 +1,87 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2005-2020 Junjiro R. Okajima
+
+/* whout.c */
+int au_wh_name_alloc(struct qstr *wh, const struct qstr *name);
-+int au_wh_test(struct dentry *h_parent, struct qstr *wh_name, int try_sio);
-+int au_diropq_test(struct dentry *h_dentry);
++int au_wh_test(struct user_namespace *h_userns, struct dentry *h_parent,
++ struct qstr *wh_name, int try_sio);
++int au_diropq_test(struct user_namespace *h_userns, struct dentry *h_dentry);
+struct au_branch;
+struct dentry *au_whtmp_lkup(struct dentry *h_parent, struct au_branch *br,
+ struct qstr *prefix);
+#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 2021-02-24 13:33:42.751013936 +0100
++++ linux/fs/aufs/wkq.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,372 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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 2021-02-24 13:33:42.751013936 +0100
++++ linux/fs/aufs/wkq.h 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#endif /* __AUFS_WKQ_H__ */
diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
--- /usr/share/empty/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c 2021-02-24 13:33:42.751013936 +0100
-@@ -0,0 +1,356 @@
++++ linux/fs/aufs/xattr.c 2021-05-02 20:15:14.676670793 +0200
+@@ -0,0 +1,368 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2014-2020 Junjiro R. Okajima
+
+static const int au_xattr_out_of_list = AuBrAttr_ICEX_OTH << 1;
+
-+static int au_do_cpup_xattr(struct dentry *h_dst, struct dentry *h_src,
++static int au_do_cpup_xattr(struct path *h_dst, struct path *h_src,
+ char *name, char **buf, unsigned int ignore_flags,
+ unsigned int verbose)
+{
+ int err;
+ ssize_t ssz;
+ struct inode *h_idst;
++ struct dentry *h_dst_dentry, *h_src_dentry;
++ struct user_namespace *h_dst_userns, *h_src_userns;
+
-+ ssz = vfs_getxattr_alloc(h_src, name, buf, 0, GFP_NOFS);
++ h_src_userns = mnt_user_ns(h_src->mnt);
++ h_src_dentry = h_src->dentry;
++ ssz = vfs_getxattr_alloc(h_src_userns, h_src_dentry, name, buf, 0,
++ GFP_NOFS);
+ err = ssz;
+ if (unlikely(err <= 0)) {
+ if (err == -ENODATA
+ || (err == -EOPNOTSUPP
+ && ((ignore_flags & au_xattr_out_of_list)
-+ || (au_test_nfs_noacl(d_inode(h_src))
++ || (au_test_nfs_noacl(d_inode(h_src_dentry))
+ && (!strcmp(name, XATTR_NAME_POSIX_ACL_ACCESS)
+ || !strcmp(name,
+ XATTR_NAME_POSIX_ACL_DEFAULT))))
+ }
+
+ /* unlock it temporary */
-+ h_idst = d_inode(h_dst);
++ h_dst_userns = mnt_user_ns(h_dst->mnt);
++ h_dst_dentry = h_dst->dentry;
++ h_idst = d_inode(h_dst_dentry);
+ inode_unlock(h_idst);
-+ err = vfsub_setxattr(h_dst, name, *buf, ssz, /*flags*/0);
++ err = vfsub_setxattr(h_dst_userns, h_dst_dentry, name, *buf, ssz,
++ /*flags*/0);
+ inode_lock_nested(h_idst, AuLsc_I_CHILD2);
+ if (unlikely(err)) {
+ if (verbose || au_debug_test())
+ return err;
+}
+
-+int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags,
++int au_cpup_xattr(struct path *h_dst, struct path *h_src, int ignore_flags,
+ unsigned int verbose)
+{
+ int err, unlocked, acl_access, acl_default;
+ ssize_t ssz;
++ struct dentry *h_dst_dentry, *h_src_dentry;
+ struct inode *h_isrc, *h_idst;
+ char *value, *p, *o, *e;
+
+ /* try stopping to update the source inode while we are referencing */
+ /* there should not be the parent-child relationship between them */
-+ h_isrc = d_inode(h_src);
-+ h_idst = d_inode(h_dst);
++ h_dst_dentry = h_dst->dentry;
++ h_idst = d_inode(h_dst_dentry);
++ h_src_dentry = h_src->dentry;
++ h_isrc = d_inode(h_src_dentry);
+ inode_unlock(h_idst);
+ inode_lock_shared_nested(h_isrc, AuLsc_I_CHILD);
+ inode_lock_nested(h_idst, AuLsc_I_CHILD2);
+ unlocked = 0;
+
+ /* some filesystems don't list POSIX ACL, for example tmpfs */
-+ ssz = vfs_listxattr(h_src, NULL, 0);
++ ssz = vfs_listxattr(h_src_dentry, NULL, 0);
+ err = ssz;
+ if (unlikely(err < 0)) {
+ AuTraceErr(err);
+ o = p;
+ if (unlikely(!p))
+ goto out;
-+ err = vfs_listxattr(h_src, p, ssz);
++ err = vfs_listxattr(h_src_dentry, p, ssz);
+ }
+ inode_unlock_shared(h_isrc);
+ unlocked = 1;
+ break;
+ case AU_XATTR_GET:
+ AuDebugOn(d_is_negative(h_path.dentry));
-+ err = vfs_getxattr(h_path.dentry,
++ err = vfs_getxattr(mnt_user_ns(h_path.mnt), h_path.dentry,
+ arg->u.get.name, arg->u.get.value,
+ arg->u.get.size);
+ break;
+}
+
+static int au_xattr_set(const struct xattr_handler *handler,
++ struct user_namespace *userns,
+ struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value, size_t size,
+ int flags)
+}
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 2021-02-24 13:33:42.751013936 +0100
++++ linux/fs/aufs/xino.c 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,1925 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ }
+
+ /* no need to mnt_want_write() since we call dentry_open() later */
-+ err = vfs_create(dir, path.dentry, 0666, NULL);
++ err = vfs_create(mnt_user_ns(base->mnt), dir, path.dentry, 0666, NULL);
+ if (unlikely(err)) {
+ file = ERR_PTR(err);
+ pr_err("%pd create err %d\n", dentry, 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 2021-02-24 13:33:42.751013936 +0100
++++ linux/include/uapi/linux/aufs_type.h 2021-05-02 20:15:14.676670793 +0200
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+#include <limits.h>
+#endif /* __KERNEL__ */
+
-+#define AUFS_VERSION "5.11-20210222"
++#define AUFS_VERSION "5.12-20210503"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
+
+#endif /* __AUFS_TYPE_H__ */
SPDX-License-Identifier: GPL-2.0
-aufs5.11 loopback patch
+aufs5.12 loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 39d539df0349d..4109efe2f6a3a 100644
+index 01ca256575fb2..f5a76bacf6c85 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -646,6 +646,15 @@ static inline void loop_update_dio(struct loop_device *lo)
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
-@@ -1235,6 +1267,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1238,6 +1270,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock);
lo->lo_backing_file = NULL;
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
-@@ -1317,6 +1350,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1319,6 +1352,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
}
diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index af75a5ee40944..1d847cb194ff6 100644
+index a3c04f310672e..161c3c5d1c22b 100644
--- a/drivers/block/loop.h
+++ b/drivers/block/loop.h
@@ -46,7 +46,7 @@ struct loop_device {
void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 5ef279a59bb14..6447c37f98756 100644
+index 9f58ba0cb769f..1c2267a5a2ae1 100644
--- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c
@@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 589dd01220201..801e0a7faec59 100644
+index d252963a87b53..ecfc5fc96ad8c 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
@@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 91f3fbe5b57ff..ad1b2e44d538b 100644
+index 4fa4b24535fde..2aec4bc9f5aa1 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1965,6 +1965,10 @@ struct super_operations {
+@@ -2041,6 +2041,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
ACRN_GUEST all=y
ARCH_MEMORY_PROBE all=n
COMPAT_32BIT_TIME all=y
+CPA_DEBUG all=n
+DEBUG_BOOT_PARAMS all=y
DEBUG_ENTRY all=n
DEBUG_IMR_SELFTEST all=n
+DEBUG_NMI_SELFTEST all=y
+DEBUG_TLBFLUSH all=n
+EARLY_PRINTK_DBGP all=n
EARLY_PRINTK_USB_XDBC all=n
EFI_MIXED all=y
EFI_PGT_DUMP all=n
GEN_RTC all=n
HAVE_STACK_VALIDATION all=y
+IOMMU_DEBUG all=n
IOSF_MBI all=y
IOSF_MBI_DEBUG all=y
+IO_DELAY_0X80 all=y
+IO_DELAY_0XED all=n
+IO_DELAY_NONE all=n
+IO_DELAY_UDELAY all=n
JAILHOUSE_GUEST all=y
+JUMP_LABEL all=y
KEXEC_FILE all=y
KEXEC_SIG all=n
-KVM_AMD_SEV all=y
LOCK_EVENT_COUNTS all=n
MICROCODE_OLD_INTERFACE all=n
PERF_EVENTS_AMD_POWER all=m
RAS_CEC all=y
RAS_CEC_DEBUG all=n
SCHED_MC_PRIO all=y
+SECCOMP all=y
SECCOMP_CACHE_DEBUG all=n
STACKPROTECTOR all=y
STACKPROTECTOR_STRONG all=y
X86_AMD_PLATFORM_DEVICE all=y
X86_CPA_STATISTICS all=y
X86_DEBUG_FPU all=n
+X86_DECODER_SELFTEST all=n
X86_MCELOG_LEGACY all=y
X86_SGX all=y
X86_SYSFB all=y
+X86_VERBOSE_BOOTUP all=n
XEN_512GB all=y
XEN_DOM0 all=y
XEN_PV all=y
CRYPTO_MD4 all=m
CRYPTO_MD5 all=y
CRYPTO_MICHAEL_MIC all=m
-CRYPTO_RMD128 all=m
CRYPTO_RMD160 all=m
-CRYPTO_RMD256 all=m
-CRYPTO_RMD320 all=m
CRYPTO_SHA1 all=y
CRYPTO_SHA1_SSSE3 all=m
CRYPTO_SHA256_SSSE3 all=m
CRYPTO_SHA3 all=m
CRYPTO_SM3 all=m
CRYPTO_STREEBOG all=m
-CRYPTO_TGR192 all=m
CRYPTO_WP512 all=m
CRYPTO_GHASH_CLMUL_NI_INTEL all=m
#- Ciphers
CRYPTO_DES3_EDE_X86_64 all=m
CRYPTO_FCRYPT all=m
CRYPTO_KHAZAD all=m
-CRYPTO_SALSA20 all=m
CRYPTO_CHACHA20 all=m
CRYPTO_CHACHA20_X86_64 all=m
CRYPTO_SEED all=m
#- Compression
CRYPTO_DEFLATE all=m
CRYPTO_LZO all=y
-CRYPTO_842 all=m
-CRYPTO_LZ4 all=m
+CRYPTO_842 all=y
+CRYPTO_LZ4 all=y
CRYPTO_LZ4HC all=m
-CRYPTO_ZSTD all=m
+CRYPTO_ZSTD all=y
#- Random Number Generation
CRYPTO_ANSI_CPRNG all=m
CRYPTO_DRBG_MENU all=m
X509_CERTIFICATE_PARSER all=y
PKCS8_PRIVATE_KEY_PARSER all=m
TPM_KEY_PARSER all=m
-PKCS7_MESSAGE_PARSER all=m
+PKCS7_MESSAGE_PARSER all=y
PKCS7_TEST_KEY all=m
SIGNED_PE_FILE_VERIFICATION all=y
BLK_DEV_CRYPTOLOOP all=n
#- file drivers/block/drbd/Kconfig goes here
BLK_DEV_NBD all=m
-BLK_DEV_SKD all=m
BLK_DEV_SX8 all=m
BLK_DEV_RAM all=y
BLK_DEV_RAM_COUNT all=16
TCG_TIS all=m x86=y ia64=y
TCG_TIS_SPI all=m
TCG_TIS_SPI_CR50 all=y
+TCG_TIS_I2C_CR50 all=m
TCG_TIS_I2C_ATMEL all=m
TCG_TIS_I2C_INFINEON all=m
TCG_TIS_I2C_NUVOTON all=m
#- file drivers/clk/keystone/Kconfig goes here
#- file drivers/clk/mediatek/Kconfig goes here
#- file drivers/clk/meson/Kconfig goes here
+#- file drivers/clk/mstar/Kconfig goes here
#- file drivers/clk/mvebu/Kconfig goes here
#- file drivers/clk/qcom/Kconfig goes here
#- file drivers/clk/renesas/Kconfig goes here
#- file drivers/clk/ti/Kconfig goes here
#- file drivers/clk/uniphier/Kconfig goes here
#- file drivers/clk/x86/Kconfig goes here
+#- file drivers/clk/xilinx/Kconfig goes here
#- file drivers/clk/zynqmp/Kconfig goes here
#-
SUNXI_CCU all=y
SUN8I_H3_CCU all=y
+#-
+#- *** FILE: drivers/clk/xilinx/Kconfig ***
+#-
+XILINX_VCU all=m
+
#-
#- *** FILE: drivers/connector/Kconfig ***
#-
#-
CRYPTO_DEV_VIRTIO all=m
+#-
+#- *** FILE: drivers/cxl/Kconfig ***
+#-
+CXL_BUS all=m
+CXL_MEM all=m
+CXL_MEM_RAW_COMMANDS all=y
+
#-
#- *** FILE: drivers/dax/Kconfig ***
#-
SW_SYNC all=y
UDMABUF all=y
DMABUF_MOVE_NOTIFY all=n
+DMABUF_DEBUG all=n
DMABUF_SELFTESTS all=m
DMABUF_HEAPS all=y
#- file drivers/dma-buf/heaps/Kconfig goes here
#- file drivers/dma/sh/Kconfig goes here
#- file drivers/dma/ti/Kconfig goes here
#- file drivers/dma/fsl-dpaa2-qdma/Kconfig goes here
+#- file drivers/dma/lgm/Kconfig goes here
#- DMA Clients
ASYNC_TX_DMA all=y
DMATEST all=n
#-
HSU_DMA_PCI all=m
+#-
+#- *** FILE: drivers/dma/lgm/Kconfig ***
+#-
+INTEL_LDMA all=y
+
#-
#- *** FILE: drivers/dma/qcom/Kconfig ***
#-
EDAC_DECODE_MCE all=m
EDAC_GHES all=y
EDAC_AMD64 all=m
-EDAC_AMD64_ERROR_INJECTION all=y
EDAC_AMD76X i386=m
EDAC_E7XXX i386=m
EDAC_E752X i386=m x86_64=m
FPGA_DFL_FME_BRIDGE all=m
FPGA_DFL_FME_REGION all=m
FPGA_DFL_AFU all=m
+FPGA_DFL_NIOS_INTEL_PAC_N3000 all=m
FPGA_DFL_PCI all=m
#-
GPIO_STA2X11 all=y
GPIO_VX855 all=m
GPIO_XILINX all=m
-GPIO_ZX all=y
GPIO_AMD_FCH all=m
GPIO_104_DIO_48E all=m
GPIO_104_IDIO_16 all=m
GPIO_LP3943 all=m
GPIO_LP873X all=m
GPIO_MADERA all=m
-GPIO_MSIC all=y
GPIO_SL28CPLD all=m
GPIO_STMPE all=y
GPIO_TIMBERDALE all=y
GPIO_WM8994 all=m
GPIO_AMD8111 all=m
GPIO_BT8XX all=m
-GPIO_INTEL_MID all=y
GPIO_ML_IOH all=m
GPIO_PCH all=m
GPIO_PCI_IDIO_16 all=m
#- file drivers/gpu/drm/mcde/Kconfig goes here
#- file drivers/gpu/drm/tidss/Kconfig goes here
#- file drivers/gpu/drm/xlnx/Kconfig goes here
-DRM_LEGACY all=n
+DRM_LEGACY all=y
DRM_TDFX all=m
DRM_R128 all=m
DRM_I810 i386=m x86_64=m
#-
DRM_GMA500 all=m
DRM_GMA600 all=y
-DRM_GMA3600 all=y
#-
#- *** FILE: drivers/gpu/drm/hisilicon/hibmc/Kconfig ***
HID_PICOLCD_LCD all=y
HID_PICOLCD_LEDS all=y
HID_PLANTRONICS all=m
+HID_PLAYSTATION all=m
+PLAYSTATION_FF all=y
HID_PRIMAX all=m
HID_RETRODE all=m
HID_ROCCAT all=m
#-
#- *** FILE: drivers/hid/i2c-hid/Kconfig ***
#-
-I2C_HID all=m
+I2C_HID_ACPI all=m
#-
#- *** FILE: drivers/hid/intel-ish-hid/Kconfig ***
SENSORS_ADT7462 all=m
SENSORS_ADT7470 all=m
SENSORS_ADT7475 all=m
+SENSORS_AHT10 all=m
SENSORS_AS370 all=m
SENSORS_ASC7621 all=m
SENSORS_AXI_FAN_CONTROL all=m
SENSORS_MCP3021 all=m
SENSORS_MLXREG_FAN all=m
SENSORS_TC654 all=m
+SENSORS_TPS23861 all=m
SENSORS_MENF21BMC_HWMON all=m
SENSORS_MR75203 all=m
SENSORS_ADCXX all=m
#-
CDNS_I3C_MASTER all=m
DW_I3C_MASTER all=m
+SVC_I3C_MASTER all=m
MIPI_I3C_HCI all=m
#-
IIO_CONSUMERS_PER_TRIGGER all=2
IIO_SW_DEVICE all=m
IIO_SW_TRIGGER all=m
-IIO_BUFFER_DMA all=m
-IIO_BUFFER_DMAENGINE all=m
#- file drivers/iio/accel/Kconfig goes here
#- file drivers/iio/adc/Kconfig goes here
#- file drivers/iio/afe/Kconfig goes here
#- *** FILE: drivers/iio/buffer/Kconfig ***
#-
IIO_BUFFER_CB all=m
+IIO_BUFFER_DMA all=m
+IIO_BUFFER_DMAENGINE all=m
IIO_BUFFER_HW_CONSUMER all=m
IIO_KFIFO_BUF all=m
AD5758 all=m
AD5761 all=m
AD5764 all=m
+AD5766 all=m
AD5770R all=m
AD5791 all=m
AD7303 all=m
SENSORS_HMC5843_SPI all=m
SENSORS_RM3100_I2C all=m
SENSORS_RM3100_SPI all=m
+YAMAHA_YAS530 all=m
#-
#- *** FILE: drivers/iio/orientation/Kconfig ***
#- *** FILE: drivers/iio/position/Kconfig ***
#-
IQS624_POS all=m
+HID_SENSOR_CUSTOM_INTEL_HINGE all=m
#-
#- *** FILE: drivers/iio/potentiometer/Kconfig ***
#- *** FILE: drivers/input/joystick/iforce/Kconfig ***
#-
JOYSTICK_IFORCE all=m
-JOYSTICK_IFORCE_USB all=y
-JOYSTICK_IFORCE_232 all=y
+JOYSTICK_IFORCE_USB all=m
+JOYSTICK_IFORCE_232 all=m
#-
#- *** FILE: drivers/input/keyboard/Kconfig ***
#-
#- *** FILE: drivers/iommu/amd/Kconfig ***
#-
+AMD_IOMMU all=y
AMD_IOMMU_V2 all=m
#-
#- file drivers/leds/flash/Kconfig goes here
#- LED Triggers
#- file drivers/leds/trigger/Kconfig goes here
+#- LED Blink
+#- file drivers/leds/blink/Kconfig goes here
+
+#-
+#- *** FILE: drivers/leds/blink/Kconfig ***
+#-
+LEDS_BLINK all=y
#-
#- *** FILE: drivers/leds/flash/Kconfig ***
LEDS_TRIGGER_NETDEV all=m
LEDS_TRIGGER_PATTERN all=m
LEDS_TRIGGER_AUDIO all=m
+LEDS_TRIGGER_TTY all=m
#-
#- *** FILE: drivers/lightnvm/Kconfig ***
VIDEO_OV2685 all=m
VIDEO_OV2740 all=m
VIDEO_OV5647 all=m
+VIDEO_OV5648 all=m
VIDEO_OV6650 all=m
VIDEO_OV5670 all=m
VIDEO_OV5675 all=m
VIDEO_OV7670 all=m
VIDEO_OV7740 all=m
VIDEO_OV8856 all=m
+VIDEO_OV8865 all=m
VIDEO_OV9640 all=m
VIDEO_OV9650 all=m
VIDEO_OV9734 all=m
VIDEO_NOON010PC30 all=m
#- file drivers/media/i2c/m5mols/Kconfig goes here
VIDEO_RDACM20 all=m
+VIDEO_RDACM21 all=m
VIDEO_RJ54N1 all=m
VIDEO_S5K6AA all=m
VIDEO_S5K6A3 all=m
#- *** FILE: drivers/media/pci/intel/ipu3/Kconfig ***
#-
VIDEO_IPU3_CIO2 all=m
+CIO2_BRIDGE all=y
#-
#- *** FILE: drivers/media/pci/ivtv/Kconfig ***
#-
#- *** FILE: drivers/media/radio/si470x/Kconfig ***
#-
-RADIO_SI470X all=y
+RADIO_SI470X all=m
USB_SI470X all=m
I2C_SI470X all=m
#-
MEMORY all=y
DDR all=y
+FPGA_DFL_EMIF all=m
#- file drivers/memory/samsung/Kconfig goes here
#- file drivers/memory/tegra/Kconfig goes here
INTEL_SOC_PMIC_MRFLD all=m
MFD_INTEL_LPSS_ACPI all=m
MFD_INTEL_LPSS_PCI all=m
-MFD_INTEL_MSIC all=y
MFD_INTEL_PMC_BXT all=m
MFD_INTEL_PMT all=m
MFD_IQS62X all=m
DUMMY_IRQ all=m
IBM_ASM i386=m x86_64=m
PHANTOM all=m
-INTEL_MID_PTI all=m
TIFM_CORE all=m
TIFM_7XX1 all=m
ICS932S401 all=m
#- file drivers/misc/echo/Kconfig goes here
#- file drivers/misc/cxl/Kconfig goes here
#- file drivers/misc/ocxl/Kconfig goes here
+#- file drivers/misc/bcm-vk/Kconfig goes here
#- file drivers/misc/cardreader/Kconfig goes here
#- file drivers/misc/habanalabs/Kconfig goes here
#- file drivers/misc/uacce/Kconfig goes here
#- Altera FPGA firmware download module (requires I2C)
ALTERA_STAPL all=m
+#-
+#- *** FILE: drivers/misc/bcm-vk/Kconfig ***
+#-
+BCM_VK all=m
+BCM_VK_TTY all=y
+
#-
#- *** FILE: drivers/misc/c2port/Kconfig ***
#-
MMC_BLOCK_MINORS all=8
SDIO_UART all=m
MMC_TEST all=n
+MMC_CRYPTO all=y
#-
#- *** FILE: drivers/mmc/host/Kconfig ***
MMC_WBSD all=m
MMC_ALCOR all=m
MMC_TIFM_SD all=m
-MMC_GOLDFISH all=m
MMC_SPI all=m
MMC_SDRICOH_CS all=m
MMC_CB710 all=m
#- file drivers/net/dsa/ocelot/Kconfig goes here
#- file drivers/net/dsa/qca/Kconfig goes here
#- file drivers/net/dsa/sja1105/Kconfig goes here
+#- file drivers/net/dsa/xrs700x/Kconfig goes here
NET_DSA_QCA8K all=m
NET_DSA_REALTEK_SMI all=m
NET_DSA_SMSC_LAN9303_I2C all=m
#- *** FILE: drivers/net/dsa/mv88e6xxx/Kconfig ***
#-
NET_DSA_MV88E6XXX all=m
-NET_DSA_MV88E6XXX_GLOBAL2 all=y
NET_DSA_MV88E6XXX_PTP all=y
#-
NET_DSA_SJA1105_TAS all=y
NET_DSA_SJA1105_VL all=y
+#-
+#- *** FILE: drivers/net/dsa/xrs700x/Kconfig ***
+#-
+NET_DSA_XRS700X_I2C all=m
+NET_DSA_XRS700X_MDIO all=m
+
#-
#- *** FILE: drivers/net/ethernet/3com/Kconfig ***
#-
#- file drivers/net/ethernet/aquantia/Kconfig goes here
#- file drivers/net/ethernet/arc/Kconfig goes here
#- file drivers/net/ethernet/atheros/Kconfig goes here
-#- file drivers/net/ethernet/aurora/Kconfig goes here
#- file drivers/net/ethernet/broadcom/Kconfig goes here
#- file drivers/net/ethernet/brocade/Kconfig goes here
#- file drivers/net/ethernet/cadence/Kconfig goes here
ATL1C all=m
ALX all=m
-#-
-#- *** FILE: drivers/net/ethernet/aurora/Kconfig ***
-#-
-NET_VENDOR_AURORA all=y
-AURORA_NB8800 all=m
-
#-
#- *** FILE: drivers/net/ethernet/broadcom/Kconfig ***
#-
#-
CHELSIO_INLINE_CRYPTO all=y
CRYPTO_DEV_CHELSIO_TLS all=m
-CHELSIO_IPSEC_INLINE all=y
-CHELSIO_TLS_DEVICE all=y
+CHELSIO_IPSEC_INLINE all=m
+CHELSIO_TLS_DEVICE all=m
#-
#- *** FILE: drivers/net/ethernet/cirrus/Kconfig ***
MLX5_TLS all=y
MLX5_EN_TLS all=y
MLX5_SW_STEERING all=y
+MLX5_SF all=y
#-
#- *** FILE: drivers/net/ethernet/mellanox/mlxfw/Kconfig ***
#- *** FILE: drivers/net/ethernet/xilinx/Kconfig ***
#-
NET_VENDOR_XILINX all=y
-XILINX_EMACLITE powerpc=m
+XILINX_EMACLITE all=m
XILINX_AXI_EMAC all=m
XILINX_LL_TEMAC all=m
#-
MT7615E all=m
MT7663U all=m
-MT7663S all=y
+MT7663S all=m
#-
#- *** FILE: drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig ***
#-
MT7915E all=m
+#-
+#- *** FILE: drivers/net/wireless/mediatek/mt76/mt7921/Kconfig ***
+#-
+MT7921E all=m
+
#-
#- *** FILE: drivers/net/wireless/mediatek/mt7601u/Kconfig ***
#-
NFC_MEI_PHY all=m
NFC_SIM all=m
NFC_PORT100 all=m
+NFC_VIRTUAL_NCI all=m
#- file drivers/nfc/fdp/Kconfig goes here
#- file drivers/nfc/pn544/Kconfig goes here
#- file drivers/nfc/pn533/Kconfig goes here
#-
NTB_AMD all=m
+#-
+#- *** FILE: drivers/ntb/hw/epf/Kconfig ***
+#-
+NTB_EPF all=m
+
#-
#- *** FILE: drivers/ntb/hw/idt/Kconfig ***
#-
NVMEM_SYSFS all=y
NVMEM_SPMI_SDAM all=m
RAVE_SP_EEPROM all=m
+NVMEM_RMEM all=m
#-
#- *** FILE: drivers/of/Kconfig ***
#- file drivers/pci/endpoint/Kconfig goes here
#- file drivers/pci/switch/Kconfig goes here
+#-
+#- *** FILE: drivers/pci/controller/Kconfig ***
+#-
+VMD all=m
+#- file drivers/pci/controller/dwc/Kconfig goes here
+#- file drivers/pci/controller/mobiveil/Kconfig goes here
+#- file drivers/pci/controller/cadence/Kconfig goes here
+
#-
#- *** FILE: drivers/pci/controller/dwc/Kconfig ***
#-
#- *** FILE: drivers/pci/endpoint/functions/Kconfig ***
#-
PCI_EPF_TEST all=m
+PCI_EPF_NTB all=m
#-
#- *** FILE: drivers/pci/hotplug/Kconfig ***
PCIEASPM_PERFORMANCE all=n
PCIE_DPC all=y
PCIE_PTM all=y
-PCIE_BW all=y
PCIE_EDR all=y
#-
#- file drivers/pinctrl/uniphier/Kconfig goes here
#- file drivers/pinctrl/vt8500/Kconfig goes here
#- file drivers/pinctrl/mediatek/Kconfig goes here
-#- file drivers/pinctrl/zte/Kconfig goes here
#- file drivers/pinctrl/meson/Kconfig goes here
#- file drivers/pinctrl/cirrus/Kconfig goes here
#- file drivers/pinctrl/visconti/Kconfig goes here
SURFACE3_WMI all=m
SURFACE_3_BUTTON all=m
SURFACE_3_POWER_OPREGION all=m
+SURFACE_ACPI_NOTIFY all=m
+SURFACE_AGGREGATOR_CDEV all=m
SURFACE_GPE all=m
+SURFACE_HOTPLUG all=m
SURFACE_PRO3_BUTTON all=m
+#- file drivers/platform/surface/aggregator/Kconfig goes here
+
+#-
+#- *** FILE: drivers/platform/surface/aggregator/Kconfig ***
+#-
+SURFACE_AGGREGATOR all=m
+SURFACE_AGGREGATOR_BUS all=y
+SURFACE_AGGREGATOR_ERROR_INJECTION all=y
#-
#- *** FILE: drivers/platform/x86/Kconfig ***
X86_PLATFORM_DEVICES i386=y x86_64=y
ACPI_WMI all=m
WMI_BMOF all=m
-ALIENWARE_WMI all=m
HUAWEI_WMI all=m
INTEL_WMI_SBL_FW_UPDATE all=m
INTEL_WMI_THUNDERBOLT all=m
ASUS_NB_WMI all=m
EEEPC_LAPTOP all=m
EEEPC_WMI all=m
-DCDBAS i386=m x86_64=m
-DELL_SMBIOS all=m
-DELL_SMBIOS_WMI all=y
-DELL_SMBIOS_SMM all=y
-DELL_LAPTOP all=m
-DELL_RBTN all=m
-DELL_RBU i386=m x86_64=m
-DELL_SMO8800 all=m
-DELL_WMI all=m
-DELL_WMI_SYSMAN all=m
-DELL_WMI_AIO all=m
-DELL_WMI_LED all=m
+#- file drivers/platform/x86/dell/Kconfig goes here
AMILO_RFKILL all=m
FUJITSU_LAPTOP all=m
FUJITSU_TABLET all=m
INTEL_UNCORE_FREQ_CONTROL all=m
INTEL_BXTWC_PMIC_TMU all=m
INTEL_CHTDC_TI_PWRBTN all=m
-INTEL_MFLD_THERMAL all=m
-INTEL_MID_POWER_BUTTON all=m
INTEL_MRFLD_PWRBTN all=m
INTEL_PMC_CORE all=y
INTEL_PMT_CLASS all=m
INTEL_SCU_IPC_UTIL all=m
INTEL_TELEMETRY all=m
+#-
+#- *** FILE: drivers/platform/x86/dell/Kconfig ***
+#-
+X86_PLATFORM_DRIVERS_DELL all=y
+ALIENWARE_WMI all=m
+DCDBAS i386=m x86_64=m
+DELL_LAPTOP all=m
+DELL_RBU i386=m x86_64=m
+DELL_RBTN all=m
+DELL_SMBIOS all=m
+DELL_SMBIOS_WMI all=y
+DELL_SMBIOS_SMM all=y
+DELL_SMO8800 all=m
+DELL_WMI all=m
+DELL_WMI_AIO all=m
+DELL_WMI_LED all=m
+DELL_WMI_SYSMAN all=m
+
#-
#- *** FILE: drivers/platform/x86/intel_speed_select_if/Kconfig ***
#-
CHARGER_GPIO all=m
CHARGER_MANAGER all=y
CHARGER_LT3651 all=m
+CHARGER_LTC4162L all=m
CHARGER_MAX14577 all=m
CHARGER_MAX77693 all=m
CHARGER_MP2629 all=m
CHARGER_BQ2515X all=m
CHARGER_BQ25890 all=m
CHARGER_BQ25980 all=m
+CHARGER_BQ256XX all=m
CHARGER_SMB347 all=m
CHARGER_TPS65217 all=m
BATTERY_GAUGE_LTC2941 all=m
POWERCAP all=y
INTEL_RAPL all=m
IDLE_INJECT all=y
+DTPM all=y
+DTPM_CPU all=y
#-
#- *** FILE: drivers/pps/Kconfig ***
#-
#- *** FILE: drivers/rapidio/Kconfig ***
#-
+RAPIDIO all=m
#- file drivers/rapidio/devices/Kconfig goes here
RAPIDIO_DISC_TIMEOUT all=30
RAPIDIO_ENABLE_RX_TX_PORTS all=y
#-
#- *** FILE: drivers/rapidio/devices/Kconfig ***
#-
-RAPIDIO_TSI721 all=y
+RAPIDIO_TSI721 all=m
#-
#- *** FILE: drivers/rapidio/switches/Kconfig ***
#-
-RAPIDIO_TSI57X all=y
-RAPIDIO_CPS_XX all=y
-RAPIDIO_TSI568 all=y
-RAPIDIO_CPS_GEN2 all=y
+RAPIDIO_TSI57X all=m
+RAPIDIO_CPS_XX all=m
+RAPIDIO_TSI568 all=m
+RAPIDIO_CPS_GEN2 all=m
RAPIDIO_RXS_GEN3 all=m
#-
REGULATOR_ACT8865 all=m
REGULATOR_AD5398 all=m
REGULATOR_ANATOP all=m
-REGULATOR_AB3100 all=m
REGULATOR_AB8500 all=y
REGULATOR_ARIZONA_LDO1 all=m
REGULATOR_ARIZONA_MICSUPP all=m
REGULATOR_MC13892 all=m
REGULATOR_MP8859 all=m
REGULATOR_MT6311 all=m
+REGULATOR_MT6315 all=m
REGULATOR_MT6323 all=m
REGULATOR_MT6358 all=m
REGULATOR_MT6360 all=m
RTC_DRV_WM831X all=m
RTC_DRV_WM8350 all=m
RTC_DRV_PCF50633 all=m
-RTC_DRV_AB3100 all=m
RTC_DRV_AB8500 all=m
RTC_DRV_CROS_EC all=m
#- on-CPU RTC drivers
SCSI_DMX3191D all=m
SCSI_FDOMAIN_PCI all=m
SCSI_FDOMAIN_ISA all=m
-SCSI_GDTH all=m
SCSI_ISCI all=m
SCSI_GENERIC_NCR5380 alpha=m i386=m
SCSI_IPS all=m sparc=n sparc64=n
SCSI_UFS_BSG all=y
SCSI_UFS_CRYPTO all=y
-#-
-#- *** FILE: drivers/sfi/Kconfig ***
-#-
-SFI all=y
-
#-
#- *** FILE: drivers/siox/Kconfig ***
#-
#-
SOC_TI all=y
-#-
-#- *** FILE: drivers/soc/xilinx/Kconfig ***
-#-
-XILINX_VCU all=m
-
-#-
-#- *** FILE: drivers/soc/zte/Kconfig ***
-#-
-SOC_ZTE all=y
-ZX2967_PM_DOMAINS all=y
-
#-
#- *** FILE: drivers/soundwire/Kconfig ***
#-
COMEDI_TEST all=m
COMEDI_PARPORT all=m
COMEDI_SSV_DNP all=m
+COMEDI_ISA_DRIVERS all=y
COMEDI_PCL711 all=m
COMEDI_PCL724 all=m
COMEDI_PCL726 all=m
COMEDI_PCL816 all=m
COMEDI_PCL818 all=m
COMEDI_PCM3724 all=m
+COMEDI_AMPLC_DIO200_ISA all=m
+COMEDI_AMPLC_PC236_ISA all=m
+COMEDI_AMPLC_PC263_ISA all=m
COMEDI_RTI800 all=m
COMEDI_RTI802 all=m
COMEDI_DAC02 all=m
COMEDI_DAS16M1 all=m
+COMEDI_DAS08_ISA all=m
COMEDI_DAS16 all=m
COMEDI_DAS800 all=m
COMEDI_DAS1800 all=m
#- *** FILE: drivers/staging/media/Kconfig ***
#-
STAGING_MEDIA all=y
-#- file drivers/staging/media/allegro-dvt/Kconfig goes here
#- file drivers/staging/media/atomisp/Kconfig goes here
#- file drivers/staging/media/hantro/Kconfig goes here
#- file drivers/staging/media/imx/Kconfig goes here
SERIAL_ALTERA_UART all=m
SERIAL_ALTERA_UART_MAXPORTS all=4
SERIAL_ALTERA_UART_BAUDRATE all=115200
-SERIAL_IFX6X60 all=m
SERIAL_PCH_UART all=m
SERIAL_XILINX_PS_UART all=m
SERIAL_ARC all=m
#-
#- *** FILE: drivers/usb/cdns3/Kconfig ***
#-
+USB_CDNS_SUPPORT all=m
USB_CDNS3 all=m
USB_CDNS3_GADGET all=y
USB_CDNS3_HOST all=y
USB_CDNS3_PCI_WRAP all=m
+USB_CDNSP_PCI all=m
+USB_CDNSP_GADGET all=y
+USB_CDNSP_HOST all=y
#-
#- *** FILE: drivers/usb/chipidea/Kconfig ***
#- *** FILE: drivers/usb/gadget/udc/bdc/Kconfig ***
#-
USB_BDC_UDC all=m
-#- Platform Support
-USB_BDC_PCI all=m
#-
#- *** FILE: drivers/usb/host/Kconfig ***
USB_SERIAL_SSU100 all=m
USB_SERIAL_QT2 all=m
USB_SERIAL_UPD78F0730 all=m
+USB_SERIAL_XR all=m
USB_SERIAL_DEBUG all=m
#-
FB_HECUBA i386=m x86_64=m
FB_SVGALIB all=m
FB_MACMODES all=n ppc=y ppc64=y
-FB_BACKLIGHT all=y
+FB_BACKLIGHT all=m
FB_MODE_HELPERS all=y
FB_TILEBLITTING all=y
#- Frame buffer hardware drivers
VIRT_DRIVERS all=y
#- file drivers/virt/vboxguest/Kconfig goes here
#- file drivers/virt/nitro_enclaves/Kconfig goes here
+#- file drivers/virt/acrn/Kconfig goes here
+
+#-
+#- *** FILE: drivers/virt/acrn/Kconfig ***
+#-
+ACRN_HSM all=m
#-
#- *** FILE: drivers/virt/nitro_enclaves/Kconfig ***
#-
#- *** FILE: drivers/virtio/Kconfig ***
#-
-VIRTIO all=m
+VIRTIO all=y
VIRTIO_MENU all=y
VIRTIO_PCI all=m
VIRTIO_PCI_LEGACY all=y
#-
XEN_BALLOON all=y
XEN_BALLOON_MEMORY_HOTPLUG all=y
-XEN_BALLOON_MEMORY_HOTPLUG_LIMIT x86_64=512 x86=4
+XEN_MEMORY_HOTPLUG_LIMIT all=512
XEN_SCRUB_PAGES_DEFAULT all=y
XEN_DEV_EVTCHN all=m
XEN_BACKEND all=y
XEN_GNTDEV_DMABUF all=y
XEN_GRANT_DEV_ALLOC all=m
XEN_GRANT_DMA_ALLOC all=y
-XEN_MEMORY_HOTPLUG_LIMIT all=512
XEN_PCIDEV_BACKEND all=m
XEN_PVCALLS_FRONTEND all=m
XEN_PVCALLS_BACKEND all=y
F2FS_FS_POSIX_ACL all=y
F2FS_FS_SECURITY all=y
F2FS_CHECK_FS all=y
-F2FS_IO_TRACE all=y
F2FS_FAULT_INJECTION all=n
F2FS_FS_COMPRESSION all=y
F2FS_FS_LZO all=y
F2FS_FS_LZ4 all=y
+F2FS_FS_LZ4HC all=y
F2FS_FS_ZSTD all=y
F2FS_FS_LZORLE all=y
#- file kernel/Kconfig.preempt goes here
TICK_CPU_ACCOUNTING all=y
VIRT_CPU_ACCOUNTING_GEN all=n
+IRQ_TIME_ACCOUNTING all=n
SCHED_THERMAL_PRESSURE all=y
BSD_PROCESS_ACCT all=y
BSD_PROCESS_ACCT_V3 all=y
MODULE_FORCE_LOAD all=y
MODULE_UNLOAD all=y
MODULE_FORCE_UNLOAD all=y
-MODVERSIONS all=n
+MODVERSIONS all=y
MODULE_SRCVERSION_ALL all=n
MODULE_SIG all=y
MODULE_SIG_FORCE all=n
MODULE_COMPRESS_GZIP all=n
MODULE_COMPRESS_XZ all=y
MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS all=n
-UNUSED_SYMBOLS all=y
#- file tree. goes here
#- file block/Kconfig goes here
#- file kernel/Kconfig.locks goes here
DEBUG_INFO_REDUCED all=n
DEBUG_INFO_COMPRESSED all=y
DEBUG_INFO_SPLIT all=y
+DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT all=n
DEBUG_INFO_DWARF4 all=y
+DEBUG_INFO_DWARF5 all=n
DEBUG_INFO_BTF all=n
GDB_SCRIPTS all=y
FRAME_WARN all=2048
SLUB_DEBUG_ON all=n
SLUB_STATS all=n
DEBUG_KMEMLEAK all=n
+DEBUG_STACK_USAGE all=n
SCHED_STACK_END_CHECK all=y
DEBUG_VM all=n
DEBUG_VM_PGTABLE all=n
DEBUG_VIRTUAL all=n
MEMORY_NOTIFIER_ERROR_INJECT all=m
+DEBUG_PER_CPU_MAPS all=n
DEBUG_KMAP_LOCAL all=n
DEBUG_KMAP_LOCAL_FORCE_MAP all=n
DEBUG_HIGHMEM arm=n i386=n sparc=n
#- file lib/Kconfig.kasan goes here
+#- file lib/Kconfig.kfence goes here
DEBUG_SHIRQ all=n
PANIC_ON_OOPS all=n
PANIC_TIMEOUT all=180
WW_MUTEX_SELFTEST all=m
SCF_TORTURE_TEST all=m
CSD_LOCK_WAIT_DEBUG all=n
+DEBUG_IRQFLAGS all=n
WARN_ALL_UNSEEDED_RANDOM all=y
DEBUG_KOBJECT all=n
DEBUG_KOBJECT_RELEASE all=n
#- file kernel/trace/Kconfig goes here
PROVIDE_OHCI1394_DMA_INIT all=n
#- file samples/Kconfig goes here
+STRICT_DEVMEM all=y
+IO_STRICT_DEVMEM all=y
#- file arch/$(SRCARCH)/Kconfig.debug goes here
#- file lib/kunit/Kconfig goes here
NOTIFIER_ERROR_INJECTION all=m
TEST_HMM all=m
TEST_FREE_PAGES all=m
TEST_FPU all=m
+MEMTEST all=y
HYPERV_TESTING all=y
#- file Documentation/Kconfig goes here
#-
KASAN all=n
+#-
+#- *** FILE: lib/Kconfig.kfence ***
+#-
+KFENCE all=y
+KFENCE_STATIC_KEYS all=y
+KFENCE_SAMPLE_INTERVAL all=100
+KFENCE_NUM_OBJECTS all=255
+
#-
#- *** FILE: lib/Kconfig.kgdb ***
#-
ZSWAP_ZPOOL_DEFAULT_Z3FOLD all=n
ZSWAP_ZPOOL_DEFAULT_ZSMALLOC all=n
ZSWAP_DEFAULT_ON all=y
-ZBUD all=m
+ZBUD all=y
Z3FOLD all=m
ZSMALLOC all=y
ZSMALLOC_STAT all=y
DEFERRED_STRUCT_PAGE_INIT all=n
IDLE_PAGE_TRACKING all=y
ZONE_DEVICE all=y
-HMM_MIRROR all=n
+HMM_MIRROR all=y
DEVICE_PRIVATE all=y
PERCPU_STATS all=n
GUP_TEST all=n
#-
#- *** FILE: net/bridge/netfilter/Kconfig ***
#-
-NF_TABLES_BRIDGE all=y
+NF_TABLES_BRIDGE all=m
NFT_BRIDGE_META all=m
NFT_BRIDGE_REJECT all=m
NF_LOG_BRIDGE all=m
NET_DSA_TAG_KSZ all=m
NET_DSA_TAG_OCELOT all=m
NET_DSA_TAG_SJA1105 all=m
+NET_DSA_TAG_XRS700X all=m
#-
#- *** FILE: net/hsr/Kconfig ***
IP_VS_MH all=m
IP_VS_SED all=m
IP_VS_NQ all=m
+IP_VS_TWOS all=m
IP_VS_SH_TAB_BITS all=8
IP_VS_MH_TAB_INDEX all=12
IP_VS_FTP all=m
SECURITY_DMESG_RESTRICT all=y
SECURITY all=y
SECURITY_NETWORK all=y
+PAGE_TABLE_ISOLATION all=y
SECURITY_INFINIBAND all=y
SECURITY_NETWORK_XFRM all=y
SECURITY_PATH all=y
#- *** FILE: sound/hda/Kconfig ***
#-
SND_HDA_PREALLOC_SIZE all=2048
+SND_INTEL_BYT_PREFER_SOF all=y
#-
#- *** FILE: sound/isa/Kconfig ***
#- file sound/soc/rockchip/Kconfig goes here
#- file sound/soc/samsung/Kconfig goes here
#- file sound/soc/sh/Kconfig goes here
-#- file sound/soc/sirf/Kconfig goes here
#- file sound/soc/sof/Kconfig goes here
#- file sound/soc/spear/Kconfig goes here
#- file sound/soc/sprd/Kconfig goes here
#- file sound/soc/sunxi/Kconfig goes here
#- file sound/soc/tegra/Kconfig goes here
#- file sound/soc/ti/Kconfig goes here
-#- file sound/soc/txx9/Kconfig goes here
#- file sound/soc/uniphier/Kconfig goes here
#- file sound/soc/ux500/Kconfig goes here
#- file sound/soc/xilinx/Kconfig goes here
#- file sound/soc/xtensa/Kconfig goes here
-#- file sound/soc/zte/Kconfig goes here
#- file sound/soc/codecs/Kconfig goes here
#- file sound/soc/generic/Kconfig goes here
SND_SOC_RT1308_SDW all=m
SND_SOC_RT5616 all=m
SND_SOC_RT5631 all=m
+SND_SOC_RT5659 all=m
SND_SOC_RT5670 all=m
SND_SOC_RT5677 all=m
SND_SOC_RT5677_SPI all=m
SND_SOC_SGTL5000 all=m
SND_SOC_SIMPLE_AMPLIFIER all=m
SND_SOC_SIMPLE_MUX all=m
-SND_SOC_SIRF_AUDIO_CODEC all=m
SND_SOC_SPDIF all=m
SND_SOC_SSM2305 all=m
SND_SOC_SSM2602_SPI all=m
SND_SOC_TPA6130A2 all=m
SND_SOC_LPASS_WSA_MACRO all=m
SND_SOC_LPASS_VA_MACRO all=m
+SND_SOC_LPASS_RX_MACRO all=m
+SND_SOC_LPASS_TX_MACRO all=m
#-
#- *** FILE: sound/soc/dwc/Kconfig ***
SND_SOC_INTEL_BROADWELL_MACH all=m
SND_SOC_INTEL_BYTCR_RT5640_MACH all=m
SND_SOC_INTEL_BYTCR_RT5651_MACH all=m
+SND_SOC_INTEL_BYTCR_WM5102_MACH all=m
SND_SOC_INTEL_CHT_BSW_RT5672_MACH all=m
SND_SOC_INTEL_CHT_BSW_RT5645_MACH all=m
SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH all=m
#- *** FILE: sound/soc/sof/intel/Kconfig ***
#-
SND_SOC_SOF_INTEL_TOPLEVEL all=y
-SND_SOC_SOF_BAYTRAIL_SUPPORT all=y
-SND_SOC_SOF_BROADWELL_SUPPORT all=y
-SND_SOC_SOF_MERRIFIELD_SUPPORT all=y
-SND_SOC_SOF_APOLLOLAKE_SUPPORT all=y
-SND_SOC_SOF_GEMINILAKE_SUPPORT all=y
-SND_SOC_SOF_CANNONLAKE_SUPPORT all=y
-SND_SOC_SOF_COFFEELAKE_SUPPORT all=y
-SND_SOC_SOF_ICELAKE_SUPPORT all=y
-SND_SOC_SOF_COMETLAKE_LP_SUPPORT all=y
-SND_SOC_SOF_TIGERLAKE_SUPPORT all=y
-SND_SOC_SOF_ELKHARTLAKE_SUPPORT all=y
-SND_SOC_SOF_JASPERLAKE_SUPPORT all=y
-SND_SOC_SOF_ALDERLAKE_SUPPORT all=y
+SND_SOC_SOF_BAYTRAIL all=m
+SND_SOC_SOF_BROADWELL all=m
+SND_SOC_SOF_MERRIFIELD all=m
+SND_SOC_SOF_APOLLOLAKE all=m
+SND_SOC_SOF_GEMINILAKE all=m
+SND_SOC_SOF_CANNONLAKE all=m
+SND_SOC_SOF_COFFEELAKE all=m
+SND_SOC_SOF_COMETLAKE all=m
+SND_SOC_SOF_ICELAKE all=m
+SND_SOC_SOF_JASPERLAKE all=m
+SND_SOC_SOF_TIGERLAKE all=m
+SND_SOC_SOF_ELKHARTLAKE all=m
+SND_SOC_SOF_ALDERLAKE all=m
SND_SOC_SOF_HDA_LINK all=y
SND_SOC_SOF_HDA_AUDIO_CODEC all=y
SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 all=y
-SND_SOC_SOF_INTEL_SOUNDWIRE_LINK all=y
+SND_SOC_SOF_INTEL_SOUNDWIRE all=m
#-
#- *** FILE: sound/soc/sunxi/Kconfig ***
#-
SND_SOC_XTFPGA_I2S all=m
-#-
-#- *** FILE: sound/soc/zte/Kconfig ***
-#-
-ZX_TDM all=m
-
#-
#- *** FILE: sound/sparc/Kconfig ***
#-
#-
#- *** PROBABLY REMOVED OPTIONS ***
#-
-ACPI_PROCFS_POWER ia64=y x86=y
-AD7152 all=m
-AGP_SGI_TIOCA ia64=m
-ANON_INODES all=y
-ASIX_PHY all=m
-BACKLIGHT_GENERIC all=m
-BACKLIGHT_LCD_SUPPORT all=y
-BACKLIGHT_OT200 all=m
-BACKLIGHT_PM8941_WLED all=m
-BATMAN_ADV_DEBUGFS all=y
-BATMAN_ADV_SYSFS all=y
-BCACHE_ASYNC_REGISTRAION all=y
-BLK_DEV_SGIIOC4 ia64=m
-BLK_DEV_SR_VENDOR all=y
-BLK_WBT_SQ all=y
-BT_WILINK all=m
-CAIF_SPI_SLAVE all=m
-CAIF_SPI_SYNC all=y
-CAPI_AVM all=y
-CAPI_EICON all=y
-CEC_PLATFORM_DRIVERS all=y
-CFQ_GROUP_IOSCHED all=y
-CHARGER_LTC3651 all=m
-CHASH_SELFTEST all=n
-CHASH_STATS all=n
-CHR_DEV_OSST all=m
-CIFS_ACL all=y
-CLOCK_THERMAL all=y
-CROS_EC_LPC_MEC all=y
-CRYPTO_AEGIS128L all=m
-CRYPTO_AEGIS128L_AESNI_SSE2 all=m
-CRYPTO_AEGIS256 all=m
-CRYPTO_AEGIS256_AESNI_SSE2 all=m
-CRYPTO_AES_586 i386=m
-CRYPTO_AES_X86_64 x86_64=m
-CRYPTO_BLKCIPHER all=y
-CRYPTO_MORUS1280 all=m
-CRYPTO_MORUS1280_AVX2 all=m
-CRYPTO_MORUS1280_SSE2 all=m
-CRYPTO_MORUS640 all=m
-CRYPTO_MORUS640_SSE2 all=m
-DEBUG_BLK_CGROUP all=n
-DEBUG_PI_LIST all=n
-DEFAULT_CFQ all=y
-DEFAULT_DEADLINE all=n
-DEFAULT_IOSCHED all="cfq"
-DEFAULT_NOOP all=n
-DEFAULT_SECURITY all=""
-DEVICE_PUBLIC all=y
-DLCI all=m
-DLCI_MAX all=8
-DRM_AMD_DC_DCN1_0 all=y
-DRM_AMD_DC_DCN2_0 all=y
-DRM_AMD_DC_DCN2_1 all=y
-DRM_AMD_DC_DCN3_0 all=y
-DRM_AMD_DC_DSC_SUPPORT all=y
-DRM_I915_ALPHA_SUPPORT all=n
-DRM_TINYDRM all=m
-DSCC4 all=m sparc=n
-EARLY_PRINTK_EFI all=n
-EFI_RTC ia64=y
-ENABLE_MUST_CHECK all=y
-EROFS_FAULT_INJECTION all=n
-EROFS_FS_IO_MAX_RETRIES all=5
-EROFS_FS_USE_VM_MAP_RAM all=y
-EROFS_FS_ZIP_CACHE_BIPOLAR all=y
-EROFS_FS_ZIP_CACHE_UNIPOLAR all=n
-EROFS_FS_ZIP_NO_CACHE all=n
-EXFAT_DEBUG_MSG all=n
-EXFAT_DEFAULT_CODEPAGE all=437
-EXFAT_DELAYED_SYNC all=n
-EXFAT_DISCARD all=y
-EXFAT_DONT_MOUNT_VFAT all=y
-EXFAT_KERNEL_DEBUG all=n
-EXOFS_DEBUG all=n
-EXOFS_FS all=m
-EXT4_ENCRYPTION all=y
-F2FS_FS_ENCRYPTION all=y
-FB_FLEX all=m
-FB_TFT_FBTFT_DEVICE all=m
-FB_XGI all=m
-FMC all=m
-FMC_CHARDEV all=m
-FMC_FAKEDEV all=m
-FMC_TRIVIAL all=m
-FMC_WRITE_EEPROM all=m
-GIGASET_BASE all=m
-GIGASET_CAPI all=y
-GIGASET_DEBUG all=n
-GIGASET_M101 all=m
-GIGASET_M105 all=m
-GOLDFISH_AUDIO all=m
-GPIO_LYNXPOINT all=y
-GUP_BENCHMARK all=n
-HEADERS_CHECK all=y
-HEADER_TEST all=n
-HOTPLUG_PCI_SGI ia64=m
-HP100 all=m
-HYSDN all=m
-HYSDN_CAPI all=y
-I2C_BCM2048 all=m
-I2C_PARPORT_LIGHT all=m
-INET6_XFRM_MODE_BEET all=m
-INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m
-INET6_XFRM_MODE_TRANSPORT all=m
-INET6_XFRM_MODE_TUNNEL all=m
-INET_XFRM_MODE_BEET all=m
-INET_XFRM_MODE_TRANSPORT all=m
-INET_XFRM_MODE_TUNNEL all=m
-INFINIBAND_CXGB3 all=m sparc=
-INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI all=y
-INFINIBAND_NES all=m sparc=
-INFINIBAND_NES_DEBUG all=n
-INPUT_GP2A all=m
-INPUT_KXTJ9_POLLED_MODE all=y
-INPUT_MSM_VIBRATOR all=m
-INPUT_POLLDEV all=m
-INTEL_MIC_BUS all=m
-INTEL_MIC_CARD all=m
-INTEL_MIC_HOST all=m
-INTEL_MIC_X100_DMA all=m
-INTEL_PMC_IPC all=m
-INTEL_RDT all=y
-IOSCHED_CFQ all=y
-IOSCHED_DEADLINE all=y
-IOSCHED_NOOP all=y
-IPPP_FILTER all=y
-ISDN_AUDIO all=y
-ISDN_CAPI_CAPI20 all=m
-ISDN_CAPI_CAPIDRV all=m
-ISDN_CAPI_CAPIDRV_VERBOSE all=y
-ISDN_DIVAS all=m sparc=n
-ISDN_DIVAS_BRIPCI all=y
-ISDN_DIVAS_DIVACAPI all=m
-ISDN_DIVAS_MAINT all=m
-ISDN_DIVAS_PRIPCI all=y
-ISDN_DIVAS_USERIDI all=m
-ISDN_DIVERSION all=m
-ISDN_DRV_AVMB1_AVM_CS all=m
-ISDN_DRV_AVMB1_B1ISA alpha=m i386=m
-ISDN_DRV_AVMB1_B1PCI all=m sparc=n
-ISDN_DRV_AVMB1_B1PCIV4 all=y
-ISDN_DRV_AVMB1_B1PCMCIA all=m
-ISDN_DRV_AVMB1_C4 all=m sparc=n
-ISDN_DRV_AVMB1_T1ISA alpha=m i386=m
-ISDN_DRV_AVMB1_T1PCI all=m sparc=n
-ISDN_DRV_GIGASET all=m
-ISDN_DRV_HISAX all=n
-ISDN_DRV_LOOP all=m
-ISDN_I4L all=m
-ISDN_MPP all=y
-ISDN_PPP all=y
-ISDN_PPP_BSDCOMP all=m
-ISDN_PPP_VJ all=y
-ISDN_TTY_FAX all=y
-ISDN_X25 all=y
-IWLWIFI_PCIE_RTPM all=y
-JS_RTC sparc=n
-KERNEL_HEADER_TEST all=n
-KEXEC_VERIFY_SIG all=n
-KVM_DEBUG_FS all=n
-LBDAF i386=y ppc=y sparc=y sparc64=
LCD_OTM3225A all=m
-MAY_USE_DEVLINK all=m
-MDIO_XPCS all=m
-MEMCG_SWAP_ENABLED all=y
-MFD_CROS_EC all=m
-MFD_CROS_EC_CHARDEV all=m
-MICROCHIP_KSZ all=m
-MICROCHIP_KSZ_SPI_DRIVER all=m
-MIC_COSM all=m
-MOST_USB all=m
-MPTCP_HMAC_TEST all=n
-MSCC_OCELOT_SWITCH_OCELOT all=m
-MTD_GPIO_ADDR all=m
-MTD_LATCH_ADDR all=m
-MTD_M25P80 all=m ppc=n ppc64=n sparc=n
-MTD_MT81xx_NOR all=m
-MTD_NAND all=m
-MTD_NAND_BCH all=m
-MTD_NAND_ECC_BCH all=y
-MTD_NAND_ECC_SMC all=y
-MTD_SPINAND_MT29F all=m
-MTD_SPINAND_ONDIEECC all=y
-MTK_AEE_KDUMP all=y
-MTK_MMC all=m
-MTK_MMC_CD_POLL all=y
-NET_CLS_IND all=y
-NET_DSA_LEGACY all=y
-NET_VENDOR_HP all=y
-NFSD_FAULT_INJECTION all=n
-NFT_CHAIN_NAT_IPV4 all=m
-NFT_CHAIN_NAT_IPV6 all=m
-NFT_CHAIN_ROUTE_IPV4 all=m
-NFT_CHAIN_ROUTE_IPV6 all=m
-NFT_MASQ_IPV4 all=m
-NFT_MASQ_IPV6 all=m
-NFT_REDIR_IPV4 all=m
-NFT_REDIR_IPV6 all=m
-NF_NAT_IPV4 all=m
-NF_NAT_IPV6 all=m
-NF_TABLES_SET all=m
-NR_QUICK sparc64=1
-PCIEASPM_DEBUG all=n
-PGTABLE_MAPPING all=n
-PHY_INTEL_EMMC all=m
-POWER_AVS all=y
-PREEMPTIRQ_EVENTS all=n
-PSW_PHY_SEL all=n
-QTNFMAC_PEARL_PCIE all=m
-R8822BE all=m
-RCU_PERF_TEST all=m
-REFCOUNT_FULL all=n
-RTC all=m sparc=n
-SCIF all=m
-SCIF_BUS all=m
-SCSI_MQ_DEFAULT all=y
-SCSI_OSD_DEBUG all=n
-SCSI_OSD_DPRINT_SENSE all=1
-SCSI_OSD_INITIATOR all=m
-SCSI_OSD_ULD all=m
-SDLA alpha=m i386=m
-SECURITY_APPARMOR_BOOTPARAM_VALUE=1
-SECURITY_SELINUX_BOOTPARAM_VALUE all=0
-SENSORS_ADS1015 all=m
-SERIAL_8250_MOXA all=m
-SERIAL_SGI_IOC3 ia64=m
-SERIAL_SGI_IOC4 ia64=m
-SERIAL_SGI_L1_CONSOLE ia64=y
-SGI_IOC3 ia64=m
-SGI_IOC4 all=m ppc=n ppc64=n
-SGI_MBCS ia64=m
-SGI_SNSC ia64=y
-SGI_TIOCX ia64=y
-SND_HDA_INTEL_DETECT_DMIC all=y
-SND_SOC_INTEL_BAYTRAIL all=m
-SND_SOC_INTEL_BYT_MAX98090_MACH all=m
-SND_SOC_INTEL_BYT_RT5640_MACH all=m
-SND_SOC_SOF_COMETLAKE_H_SUPPORT all=y
-SND_SOC_SOF_HDA_COMMON_HDMI_CODEC all=y
-SND_SST_IPC all=m
-SND_SST_IPC_ACPI all=m
-SOC_CAMERA all=m
-SOC_CAMERA_IMX074 all=m
-SOC_CAMERA_MT9M001 all=m
-SOC_CAMERA_MT9M111 all=m
-SOC_CAMERA_MT9T031 all=m
-SOC_CAMERA_MT9T112 all=m
-SOC_CAMERA_MT9V022 all=m
-SOC_CAMERA_OV5642 all=m
-SOC_CAMERA_OV772X all=m
-SOC_CAMERA_OV9640 all=m
-SOC_CAMERA_OV9740 all=m
-SOC_CAMERA_PLATFORM all=m
-SOC_CAMERA_RJ54N1 all=m
-SOC_CAMERA_TW9910 all=m
-SPI_DW_MID_DMA all=y
-SPI_MTK_QUADSPI all=m
-STAGING_EXFAT_DEBUG_MSG all=n
-STAGING_EXFAT_DEFAULT_CODEPAGE all=437
-STAGING_EXFAT_DEFAULT_IOCHARSET all="utf8"
-STAGING_EXFAT_DELAYED_SYNC all=y
-STAGING_EXFAT_DISCARD all=y
-STAGING_EXFAT_FS all=m
-STAGING_EXFAT_KERNEL_DEBUG all=n
-SYNCLINK all=m
-SYNCLINKMP all=m
-TABLET_USB_GTCO all=m
-TEST_BITFIELD all=m
-THUNDERBOLT all=m
-THUNDERBOLT_NET all=m
-TI_CPSW_ALE all=m
-TOUCHSCREEN_W90X900 all=m
-TRACING_EVENTS_GPIO all=y
-UBIFS_FS_ENCRYPTION all=y
-USB_HWA_HCD all=m
-USB_OTG_BLACKLIST_HUB all=n
-USB_OTG_WHITELIST all=y
-USB_RIO500 all=m
-USB_SERIAL_XIRCOM all=m
-USB_SWITCH_FSA9480 all=m
-USB_WHCI_HCD all=m
-USB_WUSB all=m
-USB_WUSB_CBAF all=m
-USB_WUSB_CBAF_DEBUG all=n
-UWB all=m
-UWB_I1480U all=m
-UWB_WHCI sparc=m
-VGACON_SOFT_SCROLLBACK all=n ia64=y
-VGACON_SOFT_SCROLLBACK_SIZE ia64=64
-VIDEO_CROS_EC_CEC all=m
-VIDEO_SECO_CEC all=m
-VIDEO_SECO_RC all=y
-VIDEO_SH_MOBILE_CEU all=m
-VIDEO_SH_VEU all=m
-VIDEO_SMIAPP all=m
-VIDEO_USBVISION all=m
-VIRTIO_BLK_SCSI all=y
-VOP all=m
-VOP_BUS all=m
-X25_ASY all=m
-XEN_SELFBALLOONING all=y
-ZSMALLOC_PGTABLE_MAPPING all=n
projects / packages / kernel.git / commitdiff