SPDX-License-Identifier: GPL-2.0
-aufs5.15.5 kbuild patch
+aufs5.15.41 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index a6313a969bc5f..aca4b89d41a14 100644
+index a6313a969bc5..aca4b89d41a1 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -312,6 +312,7 @@ source "fs/sysv/Kconfig"
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index 84c5e4cdfee5a..b4fcdad8412ed 100644
+index 84c5e4cdfee5..b4fcdad8412e 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -138,3 +138,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_ZONEFS_FS) += zonefs/
+obj-$(CONFIG_AUFS_FS) += aufs/
SPDX-License-Identifier: GPL-2.0
-aufs5.15.5 base patch
+aufs5.15.41 base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index 3b79fd441dde8..3fb0a57f61b05 100644
+index c8103e57a70b..e1b9eaca78fd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3122,6 +3122,19 @@ F: include/uapi/linux/audit.h
M: Miguel Ojeda <ojeda@kernel.org>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index dfc72a1f6500d..c9d1ef703673c 100644
+index 8cba10aafadb..7a9e40b97831 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -798,6 +798,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -799,6 +799,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
-index cf871a81f4fdc..bc5095b734f58 100644
+index cf871a81f4fd..bc5095b734f5 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1320,7 +1320,7 @@ enum d_walk_ret {
{
struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 9c6c6a3e2de51..02382fa9bd341 100644
+index 9c6c6a3e2de5..02382fa9bd34 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -33,7 +33,7 @@
return error;
diff --git a/fs/namespace.c b/fs/namespace.c
-index 659a8f39c61af..1283670737826 100644
+index b696543adab8..c45740054bc7 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -808,6 +808,12 @@ static inline int check_mnt(struct mount *mnt)
* vfsmount lock must be held for write
*/
diff --git a/fs/splice.c b/fs/splice.c
-index 5dbce4dcc1a7d..3e6ba363b7775 100644
+index 5dbce4dcc1a7..3e6ba363b777 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -759,8 +759,8 @@ static int warn_unsupported(struct file *file, const char *op)
unsigned int p_space;
int ret;
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 56eba723477e3..e60d8ad854004 100644
+index 56eba723477e..e60d8ad85400 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1381,6 +1381,7 @@ extern void fasync_free(struct fasync_struct *);
/* /sys/fs */
extern struct kobject *fs_kobj;
+@@ -2778,6 +2781,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+ }
+
+ void emergency_thaw_all(void);
++extern int __sync_filesystem(struct super_block *, int);
+ extern int sync_filesystem(struct super_block *);
+ extern const struct file_operations def_blk_fops;
+ extern const struct file_operations def_chr_fops;
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index 9fe165beb0f9e..e47f7e15eeaf7 100644
+index 9fe165beb0f9..e47f7e15eeaf 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -248,6 +248,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
* Acquire a lock.
*
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
-index 8f882f5881e87..6b9808f098435 100644
+index 8f882f5881e8..6b9808f09843 100644
--- a/include/linux/mnt_namespace.h
+++ b/include/linux/mnt_namespace.h
@@ -7,12 +7,15 @@ struct mnt_namespace;
extern const struct file_operations proc_mountinfo_operations;
extern const struct file_operations proc_mountstats_operations;
diff --git a/include/linux/splice.h b/include/linux/splice.h
-index a55179fd60fc3..8e21c53cf8831 100644
+index a55179fd60fc..8e21c53cf883 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -93,4 +93,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index d624231eab2bb..eff2ca26e6c58 100644
+index a30702b847ba..ce380d0abdf0 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -189,7 +189,7 @@ static
+@@ -187,7 +187,7 @@ unsigned long max_lock_class_idx;
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
{
unsigned int class_idx = hlock->class_idx;
-@@ -210,6 +210,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
+@@ -208,6 +208,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
#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.15.5 mmap patch
+aufs5.15.41 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 1f394095eb880..93f2479ef319e 100644
+index 1f394095eb88..93f2479ef319 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2189,7 +2189,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
rc = 0;
}
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index 13452b32e2bd5..38acccfef9d49 100644
+index 13452b32e2bd..38acccfef9d4 100644
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -40,7 +40,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index cf25be3e03212..70af1c25ffa22 100644
+index 79ca4d69dfd6..3d3067c8d868 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;
-@@ -1865,7 +1868,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1888,7 +1891,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;
struct mempolicy *pol;
char buffer[64];
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index a6d21fc0033c6..02c2de31196e0 100644
+index a6d21fc0033c..02c2de31196e 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
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 73a52aba448f9..5dd42acf0707b 100644
+index 04345ff97f8c..4ab9bb75c894 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1806,6 +1806,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1813,6 +1813,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
++#if IS_ENABLED(CONFIG_AUFS_FS)
+extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int);
+extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[],
+ int);
+ __LINE__)
+#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__)
+#endif /* !CONFIG_MMU */
++
++#else
++
++#define vma_file_update_time(vma) file_update_time((vma)->vm_file)
++#define vma_pr_or_file(vma) (vma)->vm_file
++#define vma_get_file(vma) get_file((vma)->vm_file)
++#define vma_fput(vma) fput((vma)->vm_file)
++
++#ifndef CONFIG_MMU
++#define vmr_pr_or_file(region) (region)->vm_file
++#define vmr_fput(region) fput((region)->vm_file)
++#endif /* !CONFIG_MMU */
++
++#endif /* CONFIG_AUFS_FS */
+
extern int access_process_vm(struct task_struct *tsk, unsigned long addr,
void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 7f8ee09c711f4..3a9a798a4ae1f 100644
+index 7f8ee09c711f..8fea872e08f7 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -294,6 +294,7 @@ struct vm_region {
+@@ -294,6 +294,9 @@ 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 */
++#if IS_ENABLED(CONFIG_AUFS_FS)
+ struct file *vm_prfile; /* the virtual backing file or NULL */
++#endif
int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -373,6 +374,7 @@ struct vm_area_struct {
+@@ -373,6 +376,9 @@ 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). */
++#if IS_ENABLED(CONFIG_AUFS_FS)
+ struct file *vm_prfile; /* shadow of vm_file */
++#endif
void * vm_private_data; /* was vm_pte (shared mem) */
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
-index 10885c649ca42..f3a9cd12011b3 100644
+index 89475c994ca9..82f46f8f4090 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -573,7 +573,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
if (tmp->vm_flags & VM_SHARED)
mapping_allow_writable(mapping);
diff --git a/mm/Makefile b/mm/Makefile
-index fc60a40ce954b..c715b0138237b 100644
+index fc60a40ce954..d45773672730 100644
--- a/mm/Makefile
+++ b/mm/Makefile
-@@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
- mm_init.o percpu.o slab_common.o \
- compaction.o vmacache.o \
- interval_tree.o list_lru.o workingset.o \
-- debug.o gup.o mmap_lock.o $(mmu-y)
-+ prfile.o debug.o gup.o mmap_lock.o $(mmu-y)
-
- # Give 'page_alloc' its own module-parameter namespace
- page-alloc-y := page_alloc.o
+@@ -130,3 +130,4 @@ obj-$(CONFIG_PAGE_REPORTING) += page_reporting.o
+ obj-$(CONFIG_IO_MAPPING) += io-mapping.o
+ obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o
+ obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o
++obj-$(CONFIG_AUFS_FS:m=y) += prfile.o
diff --git a/mm/filemap.c b/mm/filemap.c
-index 82a17c35eb96b..348e22067abdc 100644
+index 00e391e75880..d8b52d814319 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -3349,7 +3349,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -3353,7 +3353,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 88dcc5c252255..6c276614ca962 100644
+index 6bb553ed5c55..3f9d6d155171 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -183,7 +183,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
}
if (next->anon_vma)
anon_vma_merge(vma, next);
-@@ -1873,7 +1873,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
- return addr;
-
+@@ -1880,7 +1880,7 @@ close_and_free_vma:
+ if (vma->vm_ops && vma->vm_ops->close)
+ vma->vm_ops->close(vma);
unmap_and_free_vma:
- fput(vma->vm_file);
-+ vma_fput(vma);
++ vma_fput(vma);
vma->vm_file = NULL;
/* Undo any partial mapping done by a device driver. */
-@@ -2731,7 +2731,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2723,7 +2723,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);
-@@ -2750,7 +2750,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2742,7 +2742,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));
-@@ -2945,7 +2945,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
- struct vm_area_struct *vma;
+@@ -2938,6 +2938,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
unsigned long populate = 0;
unsigned long ret = -EINVAL;
-- struct file *file;
-+ struct file *file, *prfile;
+ struct file *file;
++#if IS_ENABLED(CONFIG_AUFS_FS)
++ struct file *prfile;
++#endif
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid);
-@@ -3001,10 +3001,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2993,10 +2996,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
if (vma->vm_flags & VM_LOCKED)
flags |= MAP_LOCKED;
-- file = get_file(vma->vm_file);
++#if IS_ENABLED(CONFIG_AUFS_FS)
+ vma_get_file(vma);
+ file = vma->vm_file;
+ prfile = vma->vm_prfile;
- ret = do_mmap(vma->vm_file, start, size,
- prot, flags, pgoff, &populate, NULL);
++ ret = do_mmap(vma->vm_file, start, size,
++ prot, flags, pgoff, &populate, NULL);
+ if (!IS_ERR_VALUE(ret) && file && prfile) {
+ struct vm_area_struct *new_vma;
+
+ * two fput()s instead of vma_fput(vma),
+ * coz vma may not be available anymore.
+ */
- fput(file);
++ fput(file);
+ if (prfile)
+ fput(prfile);
++#else
+ file = get_file(vma->vm_file);
+ ret = do_mmap(vma->vm_file, start, size,
+ prot, flags, pgoff, &populate, NULL);
+ fput(file);
++#endif /* CONFIG_AUFS_FS */
out:
mmap_write_unlock(mm);
if (populate)
-@@ -3285,7 +3302,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3277,7 +3304,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 02d2427b8f9e8..a7419302ab4ed 100644
+index 02d2427b8f9e..a7419302ab4e 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -523,7 +523,7 @@ static void __put_nommu_region(struct vm_region *region)
diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644
-index 0000000000000..511543ab1b418
+index 000000000000..511543ab1b41
--- /dev/null
+++ b/mm/prfile.c
@@ -0,0 +1,86 @@
+}
+#endif /* !CONFIG_MMU */
SPDX-License-Identifier: GPL-2.0
-aufs5.15.5 standalone patch
+aufs5.15.41 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
-index bc5095b734f58..9508bd57a3bc0 100644
+index bc5095b734f5..9508bd57a3bc 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1425,6 +1425,7 @@ void d_walk(struct dentry *parent, void *data,
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
-index ac7b51b51f38a..52a8be4ebc1e1 100644
+index 29e865c59854..3ea36fa14622 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -111,6 +111,7 @@ bool path_noexec(const struct path *path)
#ifdef CONFIG_USELIB
/*
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 02382fa9bd341..3418c60b90146 100644
+index 02382fa9bd34..3418c60b9014 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force)
diff --git a/fs/file_table.c b/fs/file_table.c
-index 45437f8e1003e..786af52904fcf 100644
+index e8c9016703ad..5e7a880830fb 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
/*
* Variant of alloc_empty_file() that doesn't check and modify nr_files.
diff --git a/fs/namespace.c b/fs/namespace.c
-index 1283670737826..db99365620118 100644
+index c45740054bc7..d3d750635610 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -439,6 +439,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
static void lock_mnt_tree(struct mount *mnt)
{
diff --git a/fs/notify/group.c b/fs/notify/group.c
-index fb89c351295d6..460ad19c2570a 100644
+index fb89c351295d..460ad19c2570 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 e0df1536eb69f..81b2d7c83addb 100644
+index e0df1536eb69..81b2d7c83add 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -65,6 +65,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,
long vfs_truncate(const struct path *path, loff_t length)
{
diff --git a/fs/read_write.c b/fs/read_write.c
-index af057c57bdc64..76017f8331fbf 100644
+index af057c57bdc6..76017f8331fb 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -492,6 +492,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 3e6ba363b7775..7c1be373eb7cd 100644
+index 3e6ba363b777..7c1be373eb7c 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/fs/xattr.c b/fs/xattr.c
-index 5c8c5175b385c..ff7e9ff774b73 100644
+index 5c8c5175b385..ff7e9ff774b7 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -384,6 +384,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
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 eff2ca26e6c58..0627584f7872a 100644
+index ce380d0abdf0..409c7d1a6803 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -210,6 +210,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+@@ -208,6 +208,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
#ifdef CONFIG_LOCK_STAT
diff --git a/kernel/task_work.c b/kernel/task_work.c
-index 1698fbe6f0e13..081b05acadf82 100644
+index 1698fbe6f0e1..081b05acadf8 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
@@ -167,3 +167,4 @@ void task_work_run(void)
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c
-index 67264cb08fb31..0d78065d71fe1 100644
+index da631339e969..894203de3bcb 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -1147,6 +1147,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -1160,6 +1160,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)
{
-@@ -1163,6 +1164,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1176,6 +1177,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)
-@@ -1171,6 +1173,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1184,6 +1186,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,
-@@ -1198,6 +1201,7 @@ int security_path_truncate(const struct path *path)
+@@ -1211,6 +1214,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)
{
-@@ -1205,6 +1209,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1218,6 +1222,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)
{
-@@ -1212,6 +1217,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1225,6 +1230,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)
{
-@@ -1312,6 +1318,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -1325,6 +1331,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)
{
-@@ -1509,6 +1516,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -1522,6 +1529,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-12-03 15:38:59.926647310 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs 2022-10-26 22:30:38.455982192 +0200
@@ -0,0 +1,55 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs 2021-12-03 15:38:59.926647310 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs 2022-10-26 22:30:38.455982192 +0200
@@ -0,0 +1,31 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt 2021-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,171 @@
+
+# Copyright (C) 2005-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,258 @@
+
+# Copyright (C) 2005-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,85 @@
+
+# Copyright (C) 2015-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,113 @@
+
+# Copyright (C) 2005-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,74 @@
+
+# Copyright (C) 2005-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,64 @@
+
+# Copyright (C) 2005-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2022-10-26 22:30:38.459315526 +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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,102 @@
+
+# Copyright (C) 2017-2021 Junjiro R. Okajima
+simply the inode-numbers on the branch. The file is created or updated
+in removing the branch, and loaded in adding the branch. Its lifetime is
+equal to the branch.
-+The list is refered in lookup, and when the current target inode is
++The list is referred in lookup, and when the current target inode is
+found in the list, the aufs tries loading the "detailed info per
+directory" and get the changed and valid name of the dir.
+
+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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,120 @@
+
+# Copyright (C) 2011-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,72 @@
+
+# Copyright (C) 2005-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,96 @@
+
+# Copyright (C) 2014-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,58 @@
+
+# Copyright (C) 2005-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,52 @@
+
+# Copyright (C) 2005-2021 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-12-03 15:38:59.929980643 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2010-2021 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-12-03 15:40:58.233313963 +0100
-@@ -0,0 +1,396 @@
++++ linux/Documentation/filesystems/aufs/README 2022-10-26 22:30:38.455982192 +0200
+@@ -0,0 +1,397 @@
+
+Aufs5 -- advanced multi layered unification filesystem version 5.x
+http://aufs.sf.net
+The Parted Magic Project made a donation (2013/9 and 11).
+Pavel Barta made a donation (2013/10).
+Nikolay Pertsev made a donation (2014/5).
-+James B made a donation (2014/7 and 2015/7).
++James B made a donation (2014/7, 2015/7, and 2021/12).
+Stefano Di Biase made a donation (2014/8).
+Daniel Epellei made a donation (2015/1).
+OmegaPhil made a donation (2016/1, 2018/4).
+James Burry made a donation (2016/12).
+Carsten Rose made a donation (2018/9).
+Porteus Kiosk made a donation (2018/10).
++Enya Quetzalli Gomez Rodriguez made a donation (2022/5).
+
+Thank you very much.
+Donations are always, including future donations, very important and
+# End: ;
diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
--- /usr/share/empty/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h 2021-12-03 15:38:59.929980643 +0100
++++ linux/fs/aufs/aufs.h 2022-10-26 22:30:38.459315526 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/branch.c 2022-10-26 22:30:38.462648858 +0200
@@ -0,0 +1,1427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * file_release_write() for each file, because the branch
+ * attribute in aufs world is totally different from the native
+ * fs rw/ro mode.
-+ */
++ */
+ /* fi_read_lock(file); */
+ hfile = &au_fi(file)->fi_htop;
+ hf = hfile->hf_file;
+}
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-12-03 15:40:58.233313963 +0100
++++ linux/fs/aufs/branch.h 2022-10-26 22:30:38.462648858 +0200
@@ -0,0 +1,375 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/conf.mk 2022-10-26 22:30:38.462648858 +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-12-03 15:40:58.233313963 +0100
++++ linux/fs/aufs/cpup.c 2022-10-26 22:30:38.462648858 +0200
@@ -0,0 +1,1459 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/cpup.h 2022-10-26 22:30:38.462648858 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dbgaufs.c 2022-10-26 22:30:38.462648858 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dbgaufs.h 2022-10-26 22:30:38.462648858 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dcsub.c 2022-10-26 22:30:38.462648858 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dcsub.h 2022-10-26 22:30:38.462648858 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/debug.c 2022-10-26 22:30:38.462648858 +0200
@@ -0,0 +1,444 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ return sprintf(buffer, "%d", atomic_read(a));
+}
+
-+static struct kernel_param_ops param_ops_atomic_t = {
++static const struct kernel_param_ops param_ops_atomic_t = {
+ .set = param_atomic_t_set,
+ .get = param_atomic_t_get
+ /* void (*free)(void *arg) */
+}
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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/debug.h 2022-10-26 22:30:38.462648858 +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-12-03 15:40:58.233313963 +0100
-@@ -0,0 +1,1169 @@
++++ linux/fs/aufs/dentry.c 2022-10-26 22:30:38.462648858 +0200
+@@ -0,0 +1,1168 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ */
+
+#include <linux/iversion.h>
-+#include <linux/namei.h>
+#include "aufs.h"
+
+/*
+};
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-12-03 15:40:58.233313963 +0100
++++ linux/fs/aufs/dentry.h 2022-10-26 22:30:38.462648858 +0200
@@ -0,0 +1,269 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dinfo.c 2022-10-26 22:30:38.462648858 +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-12-03 15:40:58.233313963 +0100
++++ linux/fs/aufs/dir.c 2022-10-26 22:30:38.462648858 +0200
@@ -0,0 +1,765 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+};
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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dir.h 2022-10-26 22:30:38.462648858 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dirren.c 2022-10-26 22:30:38.462648858 +0200
@@ -0,0 +1,1315 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dirren.h 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dynop.c 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/dynop.h 2022-10-26 22:30:38.465982192 +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-12-03 15:40:58.233313963 +0100
-@@ -0,0 +1,831 @@
++++ linux/fs/aufs/export.c 2022-10-26 22:30:38.465982192 +0200
+@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
+
+#include <linux/exportfs.h>
+#include <linux/fs_struct.h>
-+#include <linux/namei.h>
+#include <linux/nsproxy.h>
+#include <linux/random.h>
+#include <linux/writeback.h>
+}
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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/fhsm.c 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/file.c 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/file.h 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/finfo.c 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.933313976 +0100
++++ linux/fs/aufs/f_op.c 2022-10-26 22:30:38.465982192 +0200
@@ -0,0 +1,771 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ .fallocate = aufs_fallocate,
+ .copy_file_range = aufs_copy_file_range
+};
-diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
---- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h 2021-12-03 15:38:59.936647310 +0100
-@@ -0,0 +1,401 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
+diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.c
+--- /usr/share/empty/fs/aufs/fsctx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/fsctx.c 2022-10-26 22:30:38.465982192 +0200
+@@ -0,0 +1,1242 @@
++// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2021 Junjiro R. Okajima
++ * Copyright (C) 2022 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ */
+
+/*
-+ * judging filesystem type
++ * fs context, aka new mount api
+ */
+
-+#ifndef __AUFS_FSTYPE_H__
-+#define __AUFS_FSTYPE_H__
-+
-+#ifdef __KERNEL__
++#include <linux/fs_context.h>
++#include "aufs.h"
+
-+#include <linux/fs.h>
-+#include <linux/magic.h>
-+#include <linux/nfs_fs.h>
-+#include <linux/romfs_fs.h>
++struct au_fsctx_opts {
++ aufs_bindex_t bindex;
++ unsigned char skipped;
++ struct au_opt *opt, *opt_tail;
++ struct super_block *sb;
++ struct au_sbinfo *sbinfo;
++ struct au_opts opts;
++};
+
-+static inline int au_test_aufs(struct super_block *sb)
++/* stop extra interpretation of errno in mount(8), and strange error messages */
++static int cvt_err(int err)
+{
-+ return sb->s_magic == AUFS_SUPER_MAGIC;
-+}
++ AuTraceErr(err);
+
-+static inline const char *au_sbtype(struct super_block *sb)
-+{
-+ return sb->s_type->name;
++ switch (err) {
++ case -ENOENT:
++ case -ENOTDIR:
++ case -EEXIST:
++ case -EIO:
++ err = -EINVAL;
++ }
++ return err;
+}
+
-+static inline int au_test_iso9660(struct super_block *sb __maybe_unused)
++static int au_fsctx_reconfigure(struct fs_context *fc)
+{
-+#if IS_ENABLED(CONFIG_ISO9660_FS)
-+ return sb->s_magic == ISOFS_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
++ int err, do_dx;
++ unsigned int mntflags;
++ struct dentry *root;
++ struct super_block *sb;
++ struct inode *inode;
++ struct au_fsctx_opts *a = fc->fs_private;
+
-+static inline int au_test_romfs(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_ROMFS_FS)
-+ return sb->s_magic == ROMFS_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
++ AuDbg("fc %p\n", fc);
+
-+static inline int au_test_cramfs(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_CRAMFS)
-+ return sb->s_magic == CRAMFS_MAGIC;
-+#endif
-+ return 0;
-+}
++ root = fc->root;
++ sb = root->d_sb;
++ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
++ if (!err) {
++ di_write_lock_child(root);
++ err = au_opts_verify(sb, fc->sb_flags, /*pending*/0);
++ aufs_write_unlock(root);
++ }
+
-+static inline int au_test_nfs(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_NFS_FS)
-+ return sb->s_magic == NFS_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
++ inode = d_inode(root);
++ inode_lock(inode);
++ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
++ if (unlikely(err))
++ goto out;
++ di_write_lock_child(root);
+
-+static inline int au_test_fuse(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_FUSE_FS)
-+ return sb->s_magic == FUSE_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
++ /* au_opts_remount() may return an error */
++ err = au_opts_remount(sb, &a->opts);
+
-+static inline int au_test_xfs(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_XFS_FS)
-+ return sb->s_magic == XFS_SB_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
++ if (au_ftest_opts(a->opts.flags, REFRESH))
++ au_remount_refresh(sb, au_ftest_opts(a->opts.flags,
++ REFRESH_IDOP));
+
-+static inline int au_test_tmpfs(struct super_block *sb __maybe_unused)
-+{
-+#ifdef CONFIG_TMPFS
-+ return sb->s_magic == TMPFS_MAGIC;
-+#else
-+ return 0;
-+#endif
++ if (au_ftest_opts(a->opts.flags, REFRESH_DYAOP)) {
++ mntflags = au_mntflags(sb);
++ do_dx = !!au_opt_test(mntflags, DIO);
++ au_dy_arefresh(do_dx);
++ }
++
++ au_fhsm_wrote_all(sb, /*force*/1); /* ?? */
++ aufs_write_unlock(root);
++
++out:
++ inode_unlock(inode);
++ err = cvt_err(err);
++ AuTraceErr(err);
++
++ return err;
+}
+
-+static inline int au_test_ecryptfs(struct super_block *sb __maybe_unused)
++/* ---------------------------------------------------------------------- */
++
++static int au_fsctx_fill_super(struct super_block *sb, struct fs_context *fc)
+{
-+#if IS_ENABLED(CONFIG_ECRYPT_FS)
-+ return !strcmp(au_sbtype(sb), "ecryptfs");
-+#else
-+ return 0;
-+#endif
++ int err;
++ struct au_fsctx_opts *a = fc->fs_private;
++ struct au_sbinfo *sbinfo = a->sbinfo;
++ struct dentry *root;
++ struct inode *inode;
++
++ sbinfo->si_sb = sb;
++ sb->s_fs_info = sbinfo;
++ kobject_get(&sbinfo->si_kobj);
++
++ __si_write_lock(sb);
++ si_pid_set(sb);
++ au_sbilist_add(sb);
++
++ /* all timestamps always follow the ones on the branch */
++ sb->s_flags |= SB_NOATIME | SB_NODIRATIME;
++ sb->s_flags |= SB_I_VERSION; /* do we really need this? */
++ sb->s_op = &aufs_sop;
++ sb->s_d_op = &aufs_dop;
++ sb->s_magic = AUFS_SUPER_MAGIC;
++ sb->s_maxbytes = 0;
++ sb->s_stack_depth = 1;
++ au_export_init(sb);
++ au_xattr_init(sb);
++
++ err = au_alloc_root(sb);
++ if (unlikely(err)) {
++ si_write_unlock(sb);
++ goto out;
++ }
++ root = sb->s_root;
++ inode = d_inode(root);
++ ii_write_lock_parent(inode);
++ aufs_write_unlock(root);
++
++ /* lock vfs_inode first, then aufs. */
++ inode_lock(inode);
++ aufs_write_lock(root);
++ err = au_opts_mount(sb, &a->opts);
++ AuTraceErr(err);
++ if (!err && au_ftest_si(sbinfo, NO_DREVAL)) {
++ sb->s_d_op = &aufs_dop_noreval;
++ /* infofc(fc, "%ps", sb->s_d_op); */
++ pr_info("%ps\n", sb->s_d_op);
++ au_refresh_dop(root, /*force_reval*/0);
++ sbinfo->si_iop_array = aufs_iop_nogetattr;
++ au_refresh_iop(inode, /*force_getattr*/0);
++ }
++ aufs_write_unlock(root);
++ inode_unlock(inode);
++ if (!err)
++ goto out; /* success */
++
++ dput(root);
++ sb->s_root = NULL;
++
++out:
++ if (unlikely(err))
++ kobject_put(&sbinfo->si_kobj);
++ AuTraceErr(err);
++ err = cvt_err(err);
++ AuTraceErr(err);
++ return err;
+}
+
-+static inline int au_test_ramfs(struct super_block *sb)
++static int au_fsctx_get_tree(struct fs_context *fc)
+{
-+ return sb->s_magic == RAMFS_MAGIC;
++ int err;
++
++ AuDbg("fc %p\n", fc);
++ err = get_tree_nodev(fc, au_fsctx_fill_super);
++
++ AuTraceErr(err);
++ return err;
+}
+
-+static inline int au_test_ubifs(struct super_block *sb __maybe_unused)
++/* ---------------------------------------------------------------------- */
++
++static void au_fsctx_dump(struct au_opts *opts)
+{
-+#if IS_ENABLED(CONFIG_UBIFS_FS)
-+ return sb->s_magic == UBIFS_SUPER_MAGIC;
-+#else
-+ return 0;
++#ifdef CONFIG_AUFS_DEBUG
++ /* reduce stack space */
++ union {
++ struct au_opt_add *add;
++ struct au_opt_del *del;
++ struct au_opt_mod *mod;
++ struct au_opt_xino *xino;
++ struct au_opt_xino_itrunc *xino_itrunc;
++ struct au_opt_wbr_create *create;
++ } u;
++ struct au_opt *opt;
++
++ opt = opts->opt;
++ while (opt->type != Opt_tail) {
++ switch (opt->type) {
++ case Opt_add:
++ u.add = &opt->add;
++ AuDbg("add {b%d, %s, 0x%x, %p}\n",
++ u.add->bindex, u.add->pathname, u.add->perm,
++ u.add->path.dentry);
++ break;
++ case Opt_del:
++ fallthrough;
++ case Opt_idel:
++ u.del = &opt->del;
++ AuDbg("del {%s, %p}\n",
++ u.del->pathname, u.del->h_path.dentry);
++ break;
++ case Opt_mod:
++ fallthrough;
++ case Opt_imod:
++ u.mod = &opt->mod;
++ AuDbg("mod {%s, 0x%x, %p}\n",
++ u.mod->path, u.mod->perm, u.mod->h_root);
++ break;
++ case Opt_append:
++ u.add = &opt->add;
++ AuDbg("append {b%d, %s, 0x%x, %p}\n",
++ u.add->bindex, u.add->pathname, u.add->perm,
++ u.add->path.dentry);
++ break;
++ case Opt_prepend:
++ u.add = &opt->add;
++ AuDbg("prepend {b%d, %s, 0x%x, %p}\n",
++ u.add->bindex, u.add->pathname, u.add->perm,
++ u.add->path.dentry);
++ break;
++
++ case Opt_dirwh:
++ AuDbg("dirwh %d\n", opt->dirwh);
++ break;
++ case Opt_rdcache:
++ AuDbg("rdcache %d\n", opt->rdcache);
++ break;
++ case Opt_rdblk:
++ AuDbg("rdblk %d\n", opt->rdblk);
++ break;
++ case Opt_rdhash:
++ AuDbg("rdhash %u\n", opt->rdhash);
++ break;
++
++ case Opt_xino:
++ u.xino = &opt->xino;
++ AuDbg("xino {%s %pD}\n", u.xino->path, u.xino->file);
++ break;
++
++#define au_fsctx_TF(name) \
++ case Opt_##name: \
++ if (opt->tf) \
++ AuLabel(name); \
++ else \
++ AuLabel(no##name); \
++ break;
++
++ /* simple true/false flag */
++ au_fsctx_TF(trunc_xino);
++ au_fsctx_TF(trunc_xib);
++ au_fsctx_TF(dirperm1);
++ au_fsctx_TF(plink);
++ au_fsctx_TF(shwh);
++ au_fsctx_TF(dio);
++ au_fsctx_TF(warn_perm);
++ au_fsctx_TF(verbose);
++ au_fsctx_TF(sum);
++ au_fsctx_TF(dirren);
++ au_fsctx_TF(acl);
++#undef au_fsctx_TF
++
++ case Opt_trunc_xino_path:
++ fallthrough;
++ case Opt_itrunc_xino:
++ u.xino_itrunc = &opt->xino_itrunc;
++ AuDbg("trunc_xino %d\n", u.xino_itrunc->bindex);
++ break;
++ case Opt_noxino:
++ AuLabel(noxino);
++ break;
++
++ case Opt_list_plink:
++ AuLabel(list_plink);
++ break;
++ case Opt_udba:
++ AuDbg("udba %d, %s\n",
++ opt->udba, au_optstr_udba(opt->udba));
++ break;
++ case Opt_diropq_a:
++ AuLabel(diropq_a);
++ break;
++ case Opt_diropq_w:
++ AuLabel(diropq_w);
++ break;
++ case Opt_wsum:
++ AuLabel(wsum);
++ break;
++ case Opt_wbr_create:
++ u.create = &opt->wbr_create;
++ AuDbg("create %d, %s\n", u.create->wbr_create,
++ au_optstr_wbr_create(u.create->wbr_create));
++ switch (u.create->wbr_create) {
++ case AuWbrCreate_MFSV:
++ fallthrough;
++ case AuWbrCreate_PMFSV:
++ AuDbg("%d sec\n", u.create->mfs_second);
++ break;
++ case AuWbrCreate_MFSRR:
++ fallthrough;
++ case AuWbrCreate_TDMFS:
++ AuDbg("%llu watermark\n",
++ u.create->mfsrr_watermark);
++ break;
++ case AuWbrCreate_MFSRRV:
++ fallthrough;
++ case AuWbrCreate_TDMFSV:
++ fallthrough;
++ case AuWbrCreate_PMFSRRV:
++ AuDbg("%llu watermark, %d sec\n",
++ u.create->mfsrr_watermark,
++ u.create->mfs_second);
++ break;
++ }
++ break;
++ case Opt_wbr_copyup:
++ AuDbg("copyup %d, %s\n", opt->wbr_copyup,
++ au_optstr_wbr_copyup(opt->wbr_copyup));
++ break;
++ case Opt_fhsm_sec:
++ AuDbg("fhsm_sec %u\n", opt->fhsm_second);
++ break;
++
++ default:
++ AuDbg("type %d\n", opt->type);
++ BUG();
++ }
++ opt++;
++ }
+#endif
+}
+
-+static inline int au_test_procfs(struct super_block *sb __maybe_unused)
-+{
++/* ---------------------------------------------------------------------- */
++
++/*
++ * For conditionally compiled mount options.
++ * Instead of fsparam_flag_no(), use this macro to distinguish ignore_silent.
++ */
++#define au_ignore_flag(name, action) \
++ fsparam_flag(name, action), \
++ fsparam_flag("no" name, Opt_ignore_silent)
++
++const struct fs_parameter_spec aufs_fsctx_paramspec[] = {
++ fsparam_string("br", Opt_br),
++
++ /* "add=%d:%s" or "ins=%d:%s" */
++ fsparam_string("add", Opt_add),
++ fsparam_string("ins", Opt_add),
++ fsparam_path("append", Opt_append),
++ fsparam_path("prepend", Opt_prepend),
++
++ fsparam_path("del", Opt_del),
++ /* fsparam_s32("idel", Opt_idel), */
++ fsparam_path("mod", Opt_mod),
++ /* fsparam_string("imod", Opt_imod), */
++
++ fsparam_s32("dirwh", Opt_dirwh),
++
++ fsparam_path("xino", Opt_xino),
++ fsparam_flag("noxino", Opt_noxino),
++ fsparam_flag_no("trunc_xino", Opt_trunc_xino),
++ /* "trunc_xino_v=%d:%d" */
++ /* fsparam_string("trunc_xino_v", Opt_trunc_xino_v), */
++ fsparam_path("trunc_xino", Opt_trunc_xino_path),
++ fsparam_s32("itrunc_xino", Opt_itrunc_xino),
++ /* fsparam_path("zxino", Opt_zxino), */
++ fsparam_flag_no("trunc_xib", Opt_trunc_xib),
++
+#ifdef CONFIG_PROC_FS
-+ return sb->s_magic == PROC_SUPER_MAGIC;
++ fsparam_flag_no("plink", Opt_plink),
+#else
-+ return 0;
++ au_ignore_flag("plink", Opt_ignore),
+#endif
-+}
+
-+static inline int au_test_sysfs(struct super_block *sb __maybe_unused)
-+{
-+#ifdef CONFIG_SYSFS
-+ return sb->s_magic == SYSFS_MAGIC;
-+#else
-+ return 0;
++#ifdef CONFIG_AUFS_DEBUG
++ fsparam_flag("list_plink", Opt_list_plink),
+#endif
-+}
+
-+static inline int au_test_configfs(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_CONFIGFS_FS)
-+ return sb->s_magic == CONFIGFS_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
++ fsparam_string("udba", Opt_udba),
+
-+static inline int au_test_minix(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_MINIX_FS)
-+ return sb->s_magic == MINIX3_SUPER_MAGIC
-+ || sb->s_magic == MINIX2_SUPER_MAGIC
-+ || sb->s_magic == MINIX2_SUPER_MAGIC2
-+ || sb->s_magic == MINIX_SUPER_MAGIC
-+ || sb->s_magic == MINIX_SUPER_MAGIC2;
++ fsparam_flag_no("dio", Opt_dio),
++
++#ifdef CONFIG_AUFS_DIRREN
++ fsparam_flag_no("dirren", Opt_dirren),
+#else
-+ return 0;
++ au_ignore_flag("dirren", Opt_ignore),
+#endif
-+}
+
-+static inline int au_test_fat(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_FAT_FS)
-+ return sb->s_magic == MSDOS_SUPER_MAGIC;
++#ifdef CONFIG_AUFS_FHSM
++ fsparam_s32("fhsm_sec", Opt_fhsm_sec),
+#else
-+ return 0;
++ fsparam_s32("fhsm_sec", Opt_ignore),
+#endif
-+}
+
-+static inline int au_test_msdos(struct super_block *sb)
-+{
-+ return au_test_fat(sb);
-+}
++ /* always | a | whiteouted | w */
++ fsparam_string("diropq", Opt_diropq),
+
-+static inline int au_test_vfat(struct super_block *sb)
-+{
-+ return au_test_fat(sb);
-+}
++ fsparam_flag_no("warn_perm", Opt_warn_perm),
+
-+static inline int au_test_securityfs(struct super_block *sb __maybe_unused)
-+{
-+#ifdef CONFIG_SECURITYFS
-+ return sb->s_magic == SECURITYFS_MAGIC;
++#ifdef CONFIG_AUFS_SHWH
++ fsparam_flag_no("shwh", Opt_shwh),
+#else
-+ return 0;
++ au_ignore_flag("shwh", Opt_err),
+#endif
-+}
+
-+static inline int au_test_squashfs(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_SQUASHFS)
-+ return sb->s_magic == SQUASHFS_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
++ fsparam_flag_no("dirperm1", Opt_dirperm1),
+
-+static inline int au_test_btrfs(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_BTRFS_FS)
-+ return sb->s_magic == BTRFS_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
++ fsparam_flag_no("verbose", Opt_verbose),
++ fsparam_flag("v", Opt_verbose),
++ fsparam_flag("quiet", Opt_noverbose),
++ fsparam_flag("q", Opt_noverbose),
++ /* user-space may handle this */
++ fsparam_flag("silent", Opt_noverbose),
+
-+static inline int au_test_xenfs(struct super_block *sb __maybe_unused)
-+{
-+#if IS_ENABLED(CONFIG_XENFS)
-+ return sb->s_magic == XENFS_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
-+}
++ fsparam_flag_no("sum", Opt_sum),
++ fsparam_flag("wsum", Opt_wsum),
+
-+static inline int au_test_debugfs(struct super_block *sb __maybe_unused)
-+{
-+#ifdef CONFIG_DEBUG_FS
-+ return sb->s_magic == DEBUGFS_MAGIC;
++ fsparam_s32("rdcache", Opt_rdcache),
++ /* "def" or s32 */
++ fsparam_string("rdblk", Opt_rdblk),
++ /* "def" or s32 */
++ fsparam_string("rdhash", Opt_rdhash),
++
++ fsparam_string("create", Opt_wbr_create),
++ fsparam_string("create_policy", Opt_wbr_create),
++ fsparam_string("cpup", Opt_wbr_copyup),
++ fsparam_string("copyup", Opt_wbr_copyup),
++ fsparam_string("copyup_policy", Opt_wbr_copyup),
++
++ /* generic VFS flag */
++#ifdef CONFIG_FS_POSIX_ACL
++ fsparam_flag_no("acl", Opt_acl),
+#else
-+ return 0;
++ au_ignore_flag("acl", Opt_ignore),
+#endif
-+}
+
-+static inline int au_test_nilfs(struct super_block *sb __maybe_unused)
++ /* internal use for the scripts */
++ fsparam_string("si", Opt_ignore_silent),
++
++ /* obsoleted, keep them temporary */
++ fsparam_flag("nodlgt", Opt_ignore_silent),
++ fsparam_flag("clean_plink", Opt_ignore),
++ fsparam_string("dirs", Opt_br),
++ fsparam_u32("debug", Opt_ignore),
++ /* "whiteout" or "all" */
++ fsparam_string("delete", Opt_ignore),
++ fsparam_string("imap", Opt_ignore),
++
++ /* temporary workaround, due to old mount(8)? */
++ fsparam_flag("relatime", Opt_ignore_silent),
++
++ {}
++};
++
++static int au_fsctx_parse_do_add(struct fs_context *fc, struct au_opt *opt,
++ char *brspec, size_t speclen,
++ aufs_bindex_t bindex)
+{
-+#if IS_ENABLED(CONFIG_NILFS)
-+ return sb->s_magic == NILFS_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
++ int err;
++ char *p;
++
++ AuDbg("brspec %s\n", brspec);
++
++ err = -ENOMEM;
++ if (!speclen)
++ speclen = strlen(brspec);
++ /* will be freed by au_fsctx_free() */
++ p = kmemdup_nul(brspec, speclen, GFP_NOFS);
++ if (unlikely(!p)) {
++ errorfc(fc, "failed in %s", brspec);
++ goto out;
++ }
++ err = au_opt_add(opt, p, fc->sb_flags, bindex);
++
++out:
++ AuTraceErr(err);
++ return err;
+}
+
-+static inline int au_test_hfsplus(struct super_block *sb __maybe_unused)
++static int au_fsctx_parse_br(struct fs_context *fc, char *brspec)
+{
-+#if IS_ENABLED(CONFIG_HFSPLUS_FS)
-+ return sb->s_magic == HFSPLUS_SUPER_MAGIC;
-+#else
-+ return 0;
-+#endif
++ int err;
++ char *p;
++ struct au_fsctx_opts *a = fc->fs_private;
++ struct au_opt *opt = a->opt;
++ aufs_bindex_t bindex = a->bindex;
++
++ AuDbg("brspec %s\n", brspec);
++
++ err = -EINVAL;
++ while ((p = strsep(&brspec, ":")) && *p) {
++ err = au_fsctx_parse_do_add(fc, opt, p, /*len*/0, bindex);
++ AuTraceErr(err);
++ if (unlikely(err))
++ break;
++ bindex++;
++ opt++;
++ if (unlikely(opt > a->opt_tail)) {
++ err = -E2BIG;
++ bindex--;
++ opt--;
++ break;
++ }
++ opt->type = Opt_tail;
++ a->skipped = 1;
++ }
++ a->bindex = bindex;
++ a->opt = opt;
++
++ AuTraceErr(err);
++ return err;
+}
+
-+/* ---------------------------------------------------------------------- */
-+/*
-+ * they can't be an aufs branch.
-+ */
-+static inline int au_test_fs_unsuppoted(struct super_block *sb)
++static int au_fsctx_parse_add(struct fs_context *fc, char *addspec)
+{
-+ return
++ int err, n;
++ char *p;
++ struct au_fsctx_opts *a = fc->fs_private;
++ struct au_opt *opt = a->opt;
++
++ err = -EINVAL;
++ p = strchr(addspec, ':');
++ if (unlikely(!p)) {
++ errorfc(fc, "bad arg in %s", addspec);
++ goto out;
++ }
++ *p++ = '\0';
++ err = kstrtoint(addspec, 0, &n);
++ if (unlikely(err)) {
++ errorfc(fc, "bad integer in %s", addspec);
++ goto out;
++ }
++ AuDbg("n %d\n", n);
++ err = au_fsctx_parse_do_add(fc, opt, p, /*len*/0, n);
++
++out:
++ AuTraceErr(err);
++ return err;
++}
++
++static int au_fsctx_parse_del(struct fs_context *fc, struct au_opt_del *del,
++ struct fs_parameter *param)
++{
++ int err;
++
++ err = -ENOMEM;
++ /* will be freed by au_fsctx_free() */
++ del->pathname = kmemdup_nul(param->string, param->size, GFP_NOFS);
++ if (unlikely(!del->pathname))
++ goto out;
++ AuDbg("del %s\n", del->pathname);
++ err = vfsub_kern_path(del->pathname, AuOpt_LkupDirFlags, &del->h_path);
++ if (unlikely(err))
++ errorfc(fc, "lookup failed %s (%d)", del->pathname, err);
++
++out:
++ AuTraceErr(err);
++ return err;
++}
++
++#if 0 /* reserved for future use */
++static int au_fsctx_parse_idel(struct fs_context *fc, struct au_opt_del *del,
++ aufs_bindex_t bindex)
++{
++ int err;
++ struct super_block *sb;
++ struct dentry *root;
++ struct au_fsctx_opts *a = fc->fs_private;
++
++ sb = a->sb;
++ AuDebugOn(!sb);
++
++ err = -EINVAL;
++ root = sb->s_root;
++ aufs_read_lock(root, AuLock_FLUSH);
++ if (bindex < 0 || au_sbbot(sb) < bindex) {
++ errorfc(fc, "out of bounds, %d", bindex);
++ goto out;
++ }
++
++ err = 0;
++ del->h_path.dentry = dget(au_h_dptr(root, bindex));
++ del->h_path.mnt = mntget(au_sbr_mnt(sb, bindex));
++
++out:
++ aufs_read_unlock(root, !AuLock_IR);
++ AuTraceErr(err);
++ return err;
++}
++#endif
++
++static int au_fsctx_parse_mod(struct fs_context *fc, struct au_opt_mod *mod,
++ struct fs_parameter *param)
++{
++ int err;
++ struct path path;
++ char *p;
++
++ err = -ENOMEM;
++ /* will be freed by au_fsctx_free() */
++ mod->path = kmemdup_nul(param->string, param->size, GFP_NOFS);
++ if (unlikely(!mod->path))
++ goto out;
++
++ err = -EINVAL;
++ p = strchr(mod->path, '=');
++ if (unlikely(!p)) {
++ errorfc(fc, "no permission %s", mod->path);
++ goto out;
++ }
++
++ *p++ = 0;
++ err = vfsub_kern_path(mod->path, AuOpt_LkupDirFlags, &path);
++ if (unlikely(err)) {
++ errorfc(fc, "lookup failed %s (%d)", mod->path, err);
++ goto out;
++ }
++
++ mod->perm = au_br_perm_val(p);
++ AuDbg("mod path %s, perm 0x%x, %s", mod->path, mod->perm, p);
++ mod->h_root = dget(path.dentry);
++ path_put(&path);
++
++out:
++ AuTraceErr(err);
++ return err;
++}
++
++#if 0 /* reserved for future use */
++static int au_fsctx_parse_imod(struct fs_context *fc, struct au_opt_mod *mod,
++ char *ibrspec)
++{
++ int err, n;
++ char *p;
++ struct super_block *sb;
++ struct dentry *root;
++ struct au_fsctx_opts *a = fc->fs_private;
++
++ sb = a->sb;
++ AuDebugOn(!sb);
++
++ err = -EINVAL;
++ p = strchr(ibrspec, ':');
++ if (unlikely(!p)) {
++ errorfc(fc, "no index, %s", ibrspec);
++ goto out;
++ }
++ *p++ = '\0';
++ err = kstrtoint(ibrspec, 0, &n);
++ if (unlikely(err)) {
++ errorfc(fc, "bad integer in %s", ibrspec);
++ goto out;
++ }
++ AuDbg("n %d\n", n);
++
++ root = sb->s_root;
++ aufs_read_lock(root, AuLock_FLUSH);
++ if (n < 0 || au_sbbot(sb) < n) {
++ errorfc(fc, "out of bounds, %d", bindex);
++ goto out_root;
++ }
++
++ err = 0;
++ mod->perm = au_br_perm_val(p);
++ AuDbg("mod path %s, perm 0x%x, %s\n",
++ mod->path, mod->perm, p);
++ mod->h_root = dget(au_h_dptr(root, bindex));
++
++out_root:
++ aufs_read_unlock(root, !AuLock_IR);
++out:
++ AuTraceErr(err);
++ return err;
++}
++#endif
++
++static int au_fsctx_parse_xino(struct fs_context *fc,
++ struct au_opt_xino *xino,
++ struct fs_parameter *param)
++{
++ int err;
++ struct au_fsctx_opts *a = fc->fs_private;
++
++ err = -ENOMEM;
++ /* will be freed by au_opts_free() */
++ xino->path = kmemdup_nul(param->string, param->size, GFP_NOFS);
++ if (unlikely(!xino->path))
++ goto out;
++ AuDbg("path %s\n", xino->path);
++
++ xino->file = au_xino_create(a->sb, xino->path, /*silent*/0,
++ /*wbrtop*/0);
++ err = PTR_ERR(xino->file);
++ if (IS_ERR(xino->file)) {
++ xino->file = NULL;
++ goto out;
++ }
++
++ err = 0;
++ if (unlikely(a->sb && xino->file->f_path.dentry->d_sb == a->sb)) {
++ err = -EINVAL;
++ errorfc(fc, "%s must be outside", xino->path);
++ }
++
++out:
++ AuTraceErr(err);
++ return err;
++}
++
++static
++int au_fsctx_parse_xino_itrunc_path(struct fs_context *fc,
++ struct au_opt_xino_itrunc *xino_itrunc,
++ char *pathname)
++{
++ int err;
++ aufs_bindex_t bbot, bindex;
++ struct path path;
++ struct dentry *root;
++ struct au_fsctx_opts *a = fc->fs_private;
++
++ AuDebugOn(!a->sb);
++
++ err = vfsub_kern_path(pathname, AuOpt_LkupDirFlags, &path);
++ if (unlikely(err)) {
++ errorfc(fc, "lookup failed %s (%d)", pathname, err);
++ goto out;
++ }
++
++ xino_itrunc->bindex = -1;
++ root = a->sb->s_root;
++ aufs_read_lock(root, AuLock_FLUSH);
++ bbot = au_sbbot(a->sb);
++ for (bindex = 0; bindex <= bbot; bindex++) {
++ if (au_h_dptr(root, bindex) == path.dentry) {
++ xino_itrunc->bindex = bindex;
++ break;
++ }
++ }
++ aufs_read_unlock(root, !AuLock_IR);
++ path_put(&path);
++
++ if (unlikely(xino_itrunc->bindex < 0)) {
++ err = -EINVAL;
++ errorfc(fc, "no such branch %s", pathname);
++ }
++
++out:
++ AuTraceErr(err);
++ return err;
++}
++
++static int au_fsctx_parse_xino_itrunc(struct fs_context *fc,
++ struct au_opt_xino_itrunc *xino_itrunc,
++ unsigned int bindex)
++{
++ int err;
++ aufs_bindex_t bbot;
++ struct super_block *sb;
++ struct au_fsctx_opts *a = fc->fs_private;
++
++ sb = a->sb;
++ AuDebugOn(!sb);
++
++ err = 0;
++ si_noflush_read_lock(sb);
++ bbot = au_sbbot(sb);
++ si_read_unlock(sb);
++ if (bindex <= bbot)
++ xino_itrunc->bindex = bindex;
++ else {
++ err = -EINVAL;
++ errorfc(fc, "out of bounds, %u", bindex);
++ }
++
++ AuTraceErr(err);
++ return err;
++}
++
++static int au_fsctx_parse_param(struct fs_context *fc, struct fs_parameter *param)
++{
++ int err, token;
++ struct fs_parse_result result;
++ struct au_fsctx_opts *a = fc->fs_private;
++ struct au_opt *opt = a->opt;
++
++ AuDbg("fc %p, param {key %s, string %s}\n",
++ fc, param->key, param->string);
++ err = fs_parse(fc, aufs_fsctx_paramspec, param, &result);
++ if (unlikely(err < 0))
++ goto out;
++ token = err;
++ AuDbg("token %d, res{negated %d, uint64 %llu}\n",
++ token, result.negated, result.uint_64);
++
++ err = -EINVAL;
++ a->skipped = 0;
++ switch (token) {
++ case Opt_br:
++ err = au_fsctx_parse_br(fc, param->string);
++ break;
++ case Opt_add:
++ err = au_fsctx_parse_add(fc, param->string);
++ break;
++ case Opt_append:
++ err = au_fsctx_parse_do_add(fc, opt, param->string, param->size,
++ /*dummy bindex*/1);
++ break;
++ case Opt_prepend:
++ err = au_fsctx_parse_do_add(fc, opt, param->string, param->size,
++ /*bindex*/0);
++ break;
++
++ case Opt_del:
++ err = au_fsctx_parse_del(fc, &opt->del, param);
++ break;
++#if 0 /* reserved for future use */
++ case Opt_idel:
++ if (!a->sb) {
++ err = 0;
++ a->skipped = 1;
++ break;
++ }
++ del->pathname = "(indexed)";
++ err = au_opts_parse_idel(fc, &opt->del, result.uint_32);
++ break;
++#endif
++
++ case Opt_mod:
++ err = au_fsctx_parse_mod(fc, &opt->mod, param);
++ break;
++#ifdef IMOD /* reserved for future use */
++ case Opt_imod:
++ if (!a->sb) {
++ err = 0;
++ a->skipped = 1;
++ break;
++ }
++ u.mod->path = "(indexed)";
++ err = au_opts_parse_imod(fc, &opt->mod, param->string);
++ break;
++#endif
++
++ case Opt_xino:
++ err = au_fsctx_parse_xino(fc, &opt->xino, param);
++ break;
++ case Opt_trunc_xino_path:
++ if (!a->sb) {
++ errorfc(fc, "no such branch %s", param->string);
++ break;
++ }
++ err = au_fsctx_parse_xino_itrunc_path(fc, &opt->xino_itrunc,
++ param->string);
++ break;
++#if 0
++ case Opt_trunc_xino_v:
++ if (!a->sb) {
++ err = 0;
++ a->skipped = 1;
++ break;
++ }
++ err = au_fsctx_parse_xino_itrunc_path(fc, &opt->xino_itrunc,
++ param->string);
++ break;
++#endif
++ case Opt_itrunc_xino:
++ if (!a->sb) {
++ errorfc(fc, "out of bounds %s", param->string);
++ break;
++ }
++ err = au_fsctx_parse_xino_itrunc(fc, &opt->xino_itrunc,
++ result.int_32);
++ break;
++
++ case Opt_dirwh:
++ err = 0;
++ opt->dirwh = result.int_32;
++ break;
++
++ case Opt_rdcache:
++ if (unlikely(result.int_32 > AUFS_RDCACHE_MAX)) {
++ errorfc(fc, "rdcache must be smaller than %d",
++ AUFS_RDCACHE_MAX);
++ break;
++ }
++ err = 0;
++ opt->rdcache = result.int_32;
++ break;
++
++ case Opt_rdblk:
++ err = 0;
++ opt->rdblk = AUFS_RDBLK_DEF;
++ if (!strcmp(param->string, "def"))
++ break;
++
++ err = kstrtoint(param->string, 0, &result.int_32);
++ if (unlikely(err)) {
++ errorfc(fc, "bad value in %s", param->key);
++ break;
++ }
++ err = -EINVAL;
++ if (unlikely(result.int_32 < 0
++ || result.int_32 > KMALLOC_MAX_SIZE)) {
++ errorfc(fc, "bad value in %s", param->key);
++ break;
++ }
++ if (unlikely(result.int_32 && result.int_32 < NAME_MAX)) {
++ errorfc(fc, "rdblk must be larger than %d", NAME_MAX);
++ break;
++ }
++ err = 0;
++ opt->rdblk = result.int_32;
++ break;
++
++ case Opt_rdhash:
++ err = 0;
++ opt->rdhash = AUFS_RDHASH_DEF;
++ if (!strcmp(param->string, "def"))
++ break;
++
++ err = kstrtoint(param->string, 0, &result.int_32);
++ if (unlikely(err)) {
++ errorfc(fc, "bad value in %s", param->key);
++ break;
++ }
++ /* how about zero? */
++ if (result.int_32 < 0
++ || result.int_32 * sizeof(struct hlist_head)
++ > KMALLOC_MAX_SIZE) {
++ err = -EINVAL;
++ errorfc(fc, "bad integer in %s", param->key);
++ break;
++ }
++ opt->rdhash = result.int_32;
++ break;
++
++ case Opt_diropq:
++ /*
++ * As other options, fs/aufs/opts.c can handle these strings by
++ * match_token(). But "diropq=" is deprecated now and will
++ * never have other value. So simple strcmp() is enough here.
++ */
++ if (!strcmp(param->string, "a") ||
++ !strcmp(param->string, "always")) {
++ err = 0;
++ opt->type = Opt_diropq_a;
++ } else if (!strcmp(param->string, "w") ||
++ !strcmp(param->string, "whiteouted")) {
++ err = 0;
++ opt->type = Opt_diropq_w;
++ } else
++ errorfc(fc, "unknown value %s", param->string);
++ break;
++
++ case Opt_udba:
++ opt->udba = au_udba_val(param->string);
++ if (opt->udba >= 0)
++ err = 0;
++ else
++ errorf(fc, "wrong value, %s", param->string);
++ break;
++
++ case Opt_wbr_create:
++ opt->wbr_create.wbr_create
++ = au_wbr_create_val(param->string, &opt->wbr_create);
++ if (opt->wbr_create.wbr_create >= 0)
++ err = 0;
++ else
++ errorf(fc, "wrong value, %s", param->key);
++ break;
++
++ case Opt_wbr_copyup:
++ opt->wbr_copyup = au_wbr_copyup_val(param->string);
++ if (opt->wbr_copyup >= 0)
++ err = 0;
++ else
++ errorfc(fc, "wrong value, %s", param->key);
++ break;
++
++ case Opt_fhsm_sec:
++ if (unlikely(result.int_32 < 0)) {
++ errorfc(fc, "bad integer in %s\n", param->key);
++ break;
++ }
++ err = 0;
++ if (sysaufs_brs)
++ opt->fhsm_second = result.int_32;
++ else
++ warnfc(fc, "ignored %s %s", param->key, param->string);
++ break;
++
++ /* simple true/false flag */
++#define au_fsctx_TF(name) \
++ case Opt_##name: \
++ err = 0; \
++ opt->tf = !result.negated; \
++ break
++ au_fsctx_TF(trunc_xino);
++ au_fsctx_TF(trunc_xib);
++ au_fsctx_TF(dirperm1);
++ au_fsctx_TF(plink);
++ au_fsctx_TF(shwh);
++ au_fsctx_TF(dio);
++ au_fsctx_TF(warn_perm);
++ au_fsctx_TF(verbose);
++ au_fsctx_TF(sum);
++ au_fsctx_TF(dirren);
++ au_fsctx_TF(acl);
++#undef au_fsctx_TF
++
++ case Opt_noverbose:
++ err = 0;
++ opt->type = Opt_verbose;
++ opt->tf = false;
++ break;
++
++ case Opt_noxino:
++ fallthrough;
++ case Opt_list_plink:
++ fallthrough;
++ case Opt_wsum:
++ err = 0;
++ break;
++
++ case Opt_ignore:
++ warnfc(fc, "ignored %s", param->key);
++ fallthrough;
++ case Opt_ignore_silent:
++ a->skipped = 1;
++ err = 0;
++ break;
++ default:
++ a->skipped = 1;
++ err = -ENOPARAM;
++ break;
++ }
++ if (unlikely(err))
++ goto out;
++ if (a->skipped)
++ goto out;
++
++ switch (token) {
++ case Opt_br:
++ fallthrough;
++ case Opt_noverbose:
++ fallthrough;
++ case Opt_diropq:
++ break;
++ default:
++ opt->type = token;
++ break;
++ }
++ opt++;
++ if (unlikely(opt > a->opt_tail)) {
++ err = -E2BIG;
++ opt--;
++ }
++ opt->type = Opt_tail;
++ a->opt = opt;
++
++out:
++ return err;
++}
++
++/*
++ * these options accept both 'name=val' and 'name:val' form.
++ * some accept optional '=' in its value.
++ * eg. br:/br1=rw:/br2=ro and br=/br1=rw:/br2=ro
++ */
++static inline unsigned int is_colonopt(char *str)
++{
++#define do_test(name) \
++ if (!strncmp(str, name ":", sizeof(name))) \
++ return sizeof(name) - 1
++ do_test("br");
++ do_test("add");
++ do_test("ins");
++ do_test("append");
++ do_test("prepend");
++ do_test("del");
++ /* do_test("idel"); */
++ do_test("mod");
++ /* do_test("imod"); */
++#undef do_test
++
++ return 0;
++}
++
++static int au_fsctx_parse_monolithic(struct fs_context *fc, void *data)
++{
++ int err;
++ unsigned int u;
++ char *str;
++ struct au_fsctx_opts *a = fc->fs_private;
++
++ str = data;
++ AuDbg("str %s\n", str);
++ while (str) {
++ u = is_colonopt(str);
++ if (u)
++ str[u] = '=';
++ str = strchr(str, ',');
++ if (!str)
++ break;
++ str++;
++ }
++ str = data;
++ AuDbg("str %s\n", str);
++
++ err = generic_parse_monolithic(fc, str);
++ AuTraceErr(err);
++ au_fsctx_dump(&a->opts);
++
++ return err;
++}
++
++/* ---------------------------------------------------------------------- */
++
++static void au_fsctx_opts_free(struct au_opts *opts)
++{
++ struct au_opt *opt;
++
++ opt = opts->opt;
++ while (opt->type != Opt_tail) {
++ switch (opt->type) {
++ case Opt_add:
++ fallthrough;
++ case Opt_append:
++ fallthrough;
++ case Opt_prepend:
++ kfree(opt->add.pathname);
++ path_put(&opt->add.path);
++ break;
++ case Opt_del:
++ kfree(opt->del.pathname);
++ fallthrough;
++ case Opt_idel:
++ path_put(&opt->del.h_path);
++ break;
++ case Opt_mod:
++ kfree(opt->mod.path);
++ fallthrough;
++ case Opt_imod:
++ dput(opt->mod.h_root);
++ break;
++ case Opt_xino:
++ kfree(opt->xino.path);
++ fput(opt->xino.file);
++ break;
++ }
++ opt++;
++ }
++}
++
++static void au_fsctx_free(struct fs_context *fc)
++{
++ struct au_fsctx_opts *a = fc->fs_private;
++
++ /* fs_type=%p, root=%pD */
++ AuDbg("fc %p{sb_flags 0x%x, sb_flags_mask 0x%x, purpose %u\n",
++ fc, fc->sb_flags, fc->sb_flags_mask, fc->purpose);
++
++ kobject_put(&a->sbinfo->si_kobj);
++ au_fsctx_opts_free(&a->opts);
++ free_page((unsigned long)a->opts.opt);
++ au_kfree_rcu(a);
++}
++
++static const struct fs_context_operations au_fsctx_ops = {
++ .free = au_fsctx_free,
++ .parse_param = au_fsctx_parse_param,
++ .parse_monolithic = au_fsctx_parse_monolithic,
++ .get_tree = au_fsctx_get_tree,
++ .reconfigure = au_fsctx_reconfigure
++ /*
++ * nfs4 requires ->dup()? No.
++ * I don't know what is this ->dup() for.
++ */
++};
++
++int aufs_fsctx_init(struct fs_context *fc)
++{
++ int err;
++ struct au_fsctx_opts *a;
++
++ /* fs_type=%p, root=%pD */
++ AuDbg("fc %p{sb_flags 0x%x, sb_flags_mask 0x%x, purpose %u\n",
++ fc, fc->sb_flags, fc->sb_flags_mask, fc->purpose);
++
++ /* they will be freed by au_fsctx_free() */
++ err = -ENOMEM;
++ a = kzalloc(sizeof(*a), GFP_NOFS);
++ if (unlikely(!a))
++ goto out;
++ a->bindex = 0;
++ a->opts.opt = (void *)__get_free_page(GFP_NOFS);
++ if (unlikely(!a->opts.opt))
++ goto out_a;
++ a->opt = a->opts.opt;
++ a->opt->type = Opt_tail;
++ a->opts.max_opt = PAGE_SIZE / sizeof(*a->opts.opt);
++ a->opt_tail = a->opt + a->opts.max_opt - 1;
++ a->opts.sb_flags = fc->sb_flags;
++
++ a->sb = NULL;
++ if (fc->root) {
++ AuDebugOn(fc->purpose != FS_CONTEXT_FOR_RECONFIGURE);
++ a->opts.flags = AuOpts_REMOUNT;
++ a->sb = fc->root->d_sb;
++ a->sbinfo = au_sbi(a->sb);
++ kobject_get(&a->sbinfo->si_kobj);
++ } else {
++ a->sbinfo = au_si_alloc(a->sb);
++ AuDebugOn(!a->sbinfo);
++ err = PTR_ERR(a->sbinfo);
++ if (IS_ERR(a->sbinfo))
++ goto out_opt;
++ au_rw_write_unlock(&a->sbinfo->si_rwsem);
++ }
++
++ err = 0;
++ fc->fs_private = a;
++ fc->ops = &au_fsctx_ops;
++ goto out; /* success */
++
++out_opt:
++ free_page((unsigned long)a->opts.opt);
++out_a:
++ au_kfree_rcu(a);
++out:
++ AuTraceErr(err);
++ return err;
++}
+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 2022-10-26 22:30:38.465982192 +0200
+@@ -0,0 +1,401 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++/*
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
++ *
++ * This program, aufs is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ */
++
++/*
++ * judging filesystem type
++ */
++
++#ifndef __AUFS_FSTYPE_H__
++#define __AUFS_FSTYPE_H__
++
++#ifdef __KERNEL__
++
++#include <linux/fs.h>
++#include <linux/magic.h>
++#include <linux/nfs_fs.h>
++#include <linux/romfs_fs.h>
++
++static inline int au_test_aufs(struct super_block *sb)
++{
++ return sb->s_magic == AUFS_SUPER_MAGIC;
++}
++
++static inline const char *au_sbtype(struct super_block *sb)
++{
++ return sb->s_type->name;
++}
++
++static inline int au_test_iso9660(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_ISO9660_FS)
++ return sb->s_magic == ISOFS_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_romfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_ROMFS_FS)
++ return sb->s_magic == ROMFS_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_cramfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_CRAMFS)
++ return sb->s_magic == CRAMFS_MAGIC;
++#endif
++ return 0;
++}
++
++static inline int au_test_nfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_NFS_FS)
++ return sb->s_magic == NFS_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_fuse(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_FUSE_FS)
++ return sb->s_magic == FUSE_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_xfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_XFS_FS)
++ return sb->s_magic == XFS_SB_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_tmpfs(struct super_block *sb __maybe_unused)
++{
++#ifdef CONFIG_TMPFS
++ return sb->s_magic == TMPFS_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_ecryptfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_ECRYPT_FS)
++ return !strcmp(au_sbtype(sb), "ecryptfs");
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_ramfs(struct super_block *sb)
++{
++ return sb->s_magic == RAMFS_MAGIC;
++}
++
++static inline int au_test_ubifs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_UBIFS_FS)
++ return sb->s_magic == UBIFS_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_procfs(struct super_block *sb __maybe_unused)
++{
++#ifdef CONFIG_PROC_FS
++ return sb->s_magic == PROC_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_sysfs(struct super_block *sb __maybe_unused)
++{
++#ifdef CONFIG_SYSFS
++ return sb->s_magic == SYSFS_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_configfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_CONFIGFS_FS)
++ return sb->s_magic == CONFIGFS_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_minix(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_MINIX_FS)
++ return sb->s_magic == MINIX3_SUPER_MAGIC
++ || sb->s_magic == MINIX2_SUPER_MAGIC
++ || sb->s_magic == MINIX2_SUPER_MAGIC2
++ || sb->s_magic == MINIX_SUPER_MAGIC
++ || sb->s_magic == MINIX_SUPER_MAGIC2;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_fat(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_FAT_FS)
++ return sb->s_magic == MSDOS_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_msdos(struct super_block *sb)
++{
++ return au_test_fat(sb);
++}
++
++static inline int au_test_vfat(struct super_block *sb)
++{
++ return au_test_fat(sb);
++}
++
++static inline int au_test_securityfs(struct super_block *sb __maybe_unused)
++{
++#ifdef CONFIG_SECURITYFS
++ return sb->s_magic == SECURITYFS_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_squashfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_SQUASHFS)
++ return sb->s_magic == SQUASHFS_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_btrfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_BTRFS_FS)
++ return sb->s_magic == BTRFS_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_xenfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_XENFS)
++ return sb->s_magic == XENFS_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_debugfs(struct super_block *sb __maybe_unused)
++{
++#ifdef CONFIG_DEBUG_FS
++ return sb->s_magic == DEBUGFS_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_nilfs(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_NILFS)
++ return sb->s_magic == NILFS_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++static inline int au_test_hfsplus(struct super_block *sb __maybe_unused)
++{
++#if IS_ENABLED(CONFIG_HFSPLUS_FS)
++ return sb->s_magic == HFSPLUS_SUPER_MAGIC;
++#else
++ return 0;
++#endif
++}
++
++/* ---------------------------------------------------------------------- */
++/*
++ * they can't be an aufs branch.
++ */
++static inline int au_test_fs_unsuppoted(struct super_block *sb)
++{
++ return
+#ifndef CONFIG_AUFS_BR_RAMFS
+ au_test_ramfs(sb) ||
+#endif
+#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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/hbl.h 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/hfsnotify.c 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/hfsplus.c 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/hnotify.c 2022-10-26 22:30:38.465982192 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/iinfo.c 2022-10-26 22:30:38.469315525 +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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/inode.c 2022-10-26 22:30:38.469315525 +0200
@@ -0,0 +1,531 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/inode.h 2022-10-26 22:30:38.469315525 +0200
@@ -0,0 +1,705 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/ioctl.c 2022-10-26 22:30:38.469315525 +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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/i_op_add.c 2022-10-26 22:30:38.469315525 +0200
@@ -0,0 +1,941 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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-12-03 15:40:58.236647297 +0100
-@@ -0,0 +1,1513 @@
++++ linux/fs/aufs/i_op.c 2022-10-26 22:30:38.469315525 +0200
+@@ -0,0 +1,1512 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
+#include <linux/device_cgroup.h>
+#include <linux/fs_stack.h>
+#include <linux/iversion.h>
-+#include <linux/namei.h>
+#include <linux/security.h>
+#include "aufs.h"
+
+};
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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/i_op_del.c 2022-10-26 22:30:38.469315525 +0200
@@ -0,0 +1,522 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/i_op_ren.c 2022-10-26 22:30:38.469315525 +0200
@@ -0,0 +1,1257 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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-12-03 15:38:59.929980643 +0100
++++ linux/fs/aufs/Kconfig 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,199 @@
+# SPDX-License-Identifier: GPL-2.0
+config AUFS_FS
+ his child on the lower branch, since it is a bad idea to issue
+ rename(2) internally for every lower branch. But user may not
+ accept this behaviour. So here is a workaround to allow such
-+ rename(2) and store some extra infromation on the writable
++ rename(2) and store some extra information on the writable
+ branch. Obviously this costs high (and I don't like it).
+ To use this feature, you need to enable this configuration AND
+ to specify the mount option `dirren.'
+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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/lcnt.h 2022-10-26 22:30:38.469315525 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/loop.c 2022-10-26 22:30:38.469315525 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/loop.h 2022-10-26 22:30:38.469315525 +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-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/magic.mk 2022-10-26 22:30:38.469315525 +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-12-03 15:38:59.929980643 +0100
++++ linux/fs/aufs/Makefile 2022-10-26 22:30:38.459315526 +0200
@@ -0,0 +1,46 @@
+# SPDX-License-Identifier: GPL-2.0
+
+endif
+
+obj-$(CONFIG_AUFS_FS) += aufs.o
-+aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \
++aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o fsctx.o \
+ wkq.o vfsub.o dcsub.o \
+ cpup.o whout.o wbr_policy.o \
+ dinfo.o dentry.o \
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
--- /usr/share/empty/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c 2021-12-03 15:38:59.936647310 +0100
++++ linux/fs/aufs/module.c 2022-10-26 22:30:38.469315525 +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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/module.h 2022-10-26 22:30:38.469315525 +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-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/mvdown.c 2022-10-26 22:30:38.469315525 +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-12-03 15:38:59.939980643 +0100
-@@ -0,0 +1,1880 @@
++++ linux/fs/aufs/opts.c 2022-10-26 22:30:38.469315525 +0200
+@@ -0,0 +1,1032 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ * mount options/flags
+ */
+
-+#include <linux/namei.h>
+#include <linux/types.h> /* a distribution requires */
+#include <linux/parser.h>
+#include "aufs.h"
+
+/* ---------------------------------------------------------------------- */
+
-+enum {
-+ Opt_br,
-+ Opt_add, Opt_del, Opt_mod, Opt_append, Opt_prepend,
-+ Opt_idel, Opt_imod,
-+ Opt_dirwh, Opt_rdcache, Opt_rdblk, Opt_rdhash,
-+ Opt_rdblk_def, Opt_rdhash_def,
-+ Opt_xino, Opt_noxino,
-+ Opt_trunc_xino, Opt_trunc_xino_v, Opt_notrunc_xino,
-+ Opt_trunc_xino_path, Opt_itrunc_xino,
-+ Opt_trunc_xib, Opt_notrunc_xib,
-+ Opt_shwh, Opt_noshwh,
-+ Opt_plink, Opt_noplink, Opt_list_plink,
-+ Opt_udba,
-+ Opt_dio, Opt_nodio,
-+ Opt_diropq_a, Opt_diropq_w,
-+ Opt_warn_perm, Opt_nowarn_perm,
-+ Opt_wbr_copyup, Opt_wbr_create,
-+ Opt_fhsm_sec,
-+ Opt_verbose, Opt_noverbose,
-+ Opt_sum, Opt_nosum, Opt_wsum,
-+ Opt_dirperm1, Opt_nodirperm1,
-+ Opt_dirren, Opt_nodirren,
-+ Opt_acl, Opt_noacl,
-+ Opt_tail, Opt_ignore, Opt_ignore_silent, Opt_err
-+};
-+
-+static match_table_t options = {
-+ {Opt_br, "br=%s"},
-+ {Opt_br, "br:%s"},
-+
-+ {Opt_add, "add=%d:%s"},
-+ {Opt_add, "add:%d:%s"},
-+ {Opt_add, "ins=%d:%s"},
-+ {Opt_add, "ins:%d:%s"},
-+ {Opt_append, "append=%s"},
-+ {Opt_append, "append:%s"},
-+ {Opt_prepend, "prepend=%s"},
-+ {Opt_prepend, "prepend:%s"},
-+
-+ {Opt_del, "del=%s"},
-+ {Opt_del, "del:%s"},
-+ /* {Opt_idel, "idel:%d"}, */
-+ {Opt_mod, "mod=%s"},
-+ {Opt_mod, "mod:%s"},
-+ /* {Opt_imod, "imod:%d:%s"}, */
-+
-+ {Opt_dirwh, "dirwh=%d"},
-+
-+ {Opt_xino, "xino=%s"},
-+ {Opt_noxino, "noxino"},
-+ {Opt_trunc_xino, "trunc_xino"},
-+ {Opt_trunc_xino_v, "trunc_xino_v=%d:%d"},
-+ {Opt_notrunc_xino, "notrunc_xino"},
-+ {Opt_trunc_xino_path, "trunc_xino=%s"},
-+ {Opt_itrunc_xino, "itrunc_xino=%d"},
-+ /* {Opt_zxino, "zxino=%s"}, */
-+ {Opt_trunc_xib, "trunc_xib"},
-+ {Opt_notrunc_xib, "notrunc_xib"},
-+
-+#ifdef CONFIG_PROC_FS
-+ {Opt_plink, "plink"},
-+#else
-+ {Opt_ignore_silent, "plink"},
-+#endif
-+
-+ {Opt_noplink, "noplink"},
-+
-+#ifdef CONFIG_AUFS_DEBUG
-+ {Opt_list_plink, "list_plink"},
-+#endif
-+
-+ {Opt_udba, "udba=%s"},
-+
-+ {Opt_dio, "dio"},
-+ {Opt_nodio, "nodio"},
-+
-+#ifdef CONFIG_AUFS_DIRREN
-+ {Opt_dirren, "dirren"},
-+ {Opt_nodirren, "nodirren"},
-+#else
-+ {Opt_ignore, "dirren"},
-+ {Opt_ignore_silent, "nodirren"},
-+#endif
-+
-+#ifdef CONFIG_AUFS_FHSM
-+ {Opt_fhsm_sec, "fhsm_sec=%d"},
-+#else
-+ {Opt_ignore, "fhsm_sec=%d"},
-+#endif
-+
-+ {Opt_diropq_a, "diropq=always"},
-+ {Opt_diropq_a, "diropq=a"},
-+ {Opt_diropq_w, "diropq=whiteouted"},
-+ {Opt_diropq_w, "diropq=w"},
-+
-+ {Opt_warn_perm, "warn_perm"},
-+ {Opt_nowarn_perm, "nowarn_perm"},
-+
-+ /* keep them temporary */
-+ {Opt_ignore_silent, "nodlgt"},
-+ {Opt_ignore, "clean_plink"},
-+
-+#ifdef CONFIG_AUFS_SHWH
-+ {Opt_shwh, "shwh"},
-+#endif
-+ {Opt_noshwh, "noshwh"},
-+
-+ {Opt_dirperm1, "dirperm1"},
-+ {Opt_nodirperm1, "nodirperm1"},
-+
-+ {Opt_verbose, "verbose"},
-+ {Opt_verbose, "v"},
-+ {Opt_noverbose, "noverbose"},
-+ {Opt_noverbose, "quiet"},
-+ {Opt_noverbose, "q"},
-+ {Opt_noverbose, "silent"},
-+
-+ {Opt_sum, "sum"},
-+ {Opt_nosum, "nosum"},
-+ {Opt_wsum, "wsum"},
-+
-+ {Opt_rdcache, "rdcache=%d"},
-+ {Opt_rdblk, "rdblk=%d"},
-+ {Opt_rdblk_def, "rdblk=def"},
-+ {Opt_rdhash, "rdhash=%d"},
-+ {Opt_rdhash_def, "rdhash=def"},
-+
-+ {Opt_wbr_create, "create=%s"},
-+ {Opt_wbr_create, "create_policy=%s"},
-+ {Opt_wbr_copyup, "cpup=%s"},
-+ {Opt_wbr_copyup, "copyup=%s"},
-+ {Opt_wbr_copyup, "copyup_policy=%s"},
-+
-+ /* generic VFS flag */
-+#ifdef CONFIG_FS_POSIX_ACL
-+ {Opt_acl, "acl"},
-+ {Opt_noacl, "noacl"},
-+#else
-+ {Opt_ignore, "acl"},
-+ {Opt_ignore_silent, "noacl"},
-+#endif
-+
-+ /* internal use for the scripts */
-+ {Opt_ignore_silent, "si=%s"},
-+
-+ {Opt_br, "dirs=%s"},
-+ {Opt_ignore, "debug=%d"},
-+ {Opt_ignore, "delete=whiteout"},
-+ {Opt_ignore, "delete=all"},
-+ {Opt_ignore, "imap=%s"},
-+
-+ /* temporary workaround, due to old mount(8)? */
-+ {Opt_ignore_silent, "relatime"},
-+
-+ {Opt_err, NULL}
-+};
-+
-+/* ---------------------------------------------------------------------- */
-+
+static const char *au_parser_pattern(int val, match_table_t tbl)
+{
+ struct match_token *p;
+ return q - str->a;
+}
+
-+static int noinline_for_stack br_perm_val(char *perm)
++int au_br_perm_val(char *perm)
+{
+ int val, bad, sz;
+ char *p;
+ {-1, NULL}
+};
+
-+static int noinline_for_stack udba_val(char *str)
++int au_udba_val(char *str)
+{
+ substring_t args[MAX_OPT_ARGS];
+
+ return err;
+}
+
-+static int noinline_for_stack
-+au_wbr_create_val(char *str, struct au_opt_wbr_create *create)
++int au_wbr_create_val(char *str, struct au_opt_wbr_create *create)
+{
+ int err, e;
+ substring_t args[MAX_OPT_ARGS];
+ {-1, NULL}
+};
+
-+static int noinline_for_stack au_wbr_copyup_val(char *str)
++int au_wbr_copyup_val(char *str)
+{
+ substring_t args[MAX_OPT_ARGS];
+
+
+/* ---------------------------------------------------------------------- */
+
-+static const int lkup_dirflags = LOOKUP_FOLLOW | LOOKUP_DIRECTORY;
-+
-+static void dump_opts(struct au_opts *opts)
-+{
-+#ifdef CONFIG_AUFS_DEBUG
-+ /* reduce stack space */
-+ union {
-+ struct au_opt_add *add;
-+ struct au_opt_del *del;
-+ struct au_opt_mod *mod;
-+ struct au_opt_xino *xino;
-+ struct au_opt_xino_itrunc *xino_itrunc;
-+ struct au_opt_wbr_create *create;
-+ } u;
-+ struct au_opt *opt;
-+
-+ opt = opts->opt;
-+ while (opt->type != Opt_tail) {
-+ switch (opt->type) {
-+ case Opt_add:
-+ u.add = &opt->add;
-+ AuDbg("add {b%d, %s, 0x%x, %p}\n",
-+ u.add->bindex, u.add->pathname, u.add->perm,
-+ u.add->path.dentry);
-+ break;
-+ case Opt_del:
-+ case Opt_idel:
-+ u.del = &opt->del;
-+ AuDbg("del {%s, %p}\n",
-+ u.del->pathname, u.del->h_path.dentry);
-+ break;
-+ case Opt_mod:
-+ case Opt_imod:
-+ u.mod = &opt->mod;
-+ AuDbg("mod {%s, 0x%x, %p}\n",
-+ u.mod->path, u.mod->perm, u.mod->h_root);
-+ break;
-+ case Opt_append:
-+ u.add = &opt->add;
-+ AuDbg("append {b%d, %s, 0x%x, %p}\n",
-+ u.add->bindex, u.add->pathname, u.add->perm,
-+ u.add->path.dentry);
-+ break;
-+ case Opt_prepend:
-+ u.add = &opt->add;
-+ AuDbg("prepend {b%d, %s, 0x%x, %p}\n",
-+ u.add->bindex, u.add->pathname, u.add->perm,
-+ u.add->path.dentry);
-+ break;
-+ case Opt_dirwh:
-+ AuDbg("dirwh %d\n", opt->dirwh);
-+ break;
-+ case Opt_rdcache:
-+ AuDbg("rdcache %d\n", opt->rdcache);
-+ break;
-+ case Opt_rdblk:
-+ AuDbg("rdblk %u\n", opt->rdblk);
-+ break;
-+ case Opt_rdblk_def:
-+ AuDbg("rdblk_def\n");
-+ break;
-+ case Opt_rdhash:
-+ AuDbg("rdhash %u\n", opt->rdhash);
-+ break;
-+ case Opt_rdhash_def:
-+ AuDbg("rdhash_def\n");
-+ break;
-+ case Opt_xino:
-+ u.xino = &opt->xino;
-+ AuDbg("xino {%s %pD}\n", u.xino->path, u.xino->file);
-+ break;
-+ case Opt_trunc_xino:
-+ AuLabel(trunc_xino);
-+ break;
-+ case Opt_notrunc_xino:
-+ AuLabel(notrunc_xino);
-+ break;
-+ case Opt_trunc_xino_path:
-+ case Opt_itrunc_xino:
-+ u.xino_itrunc = &opt->xino_itrunc;
-+ AuDbg("trunc_xino %d\n", u.xino_itrunc->bindex);
-+ break;
-+ case Opt_noxino:
-+ AuLabel(noxino);
-+ break;
-+ case Opt_trunc_xib:
-+ AuLabel(trunc_xib);
-+ break;
-+ case Opt_notrunc_xib:
-+ AuLabel(notrunc_xib);
-+ break;
-+ case Opt_shwh:
-+ AuLabel(shwh);
-+ break;
-+ case Opt_noshwh:
-+ AuLabel(noshwh);
-+ break;
-+ case Opt_dirperm1:
-+ AuLabel(dirperm1);
-+ break;
-+ case Opt_nodirperm1:
-+ AuLabel(nodirperm1);
-+ break;
-+ case Opt_plink:
-+ AuLabel(plink);
-+ break;
-+ case Opt_noplink:
-+ AuLabel(noplink);
-+ break;
-+ case Opt_list_plink:
-+ AuLabel(list_plink);
-+ break;
-+ case Opt_udba:
-+ AuDbg("udba %d, %s\n",
-+ opt->udba, au_optstr_udba(opt->udba));
-+ break;
-+ case Opt_dio:
-+ AuLabel(dio);
-+ break;
-+ case Opt_nodio:
-+ AuLabel(nodio);
-+ break;
-+ case Opt_diropq_a:
-+ AuLabel(diropq_a);
-+ break;
-+ case Opt_diropq_w:
-+ AuLabel(diropq_w);
-+ break;
-+ case Opt_warn_perm:
-+ AuLabel(warn_perm);
-+ break;
-+ case Opt_nowarn_perm:
-+ AuLabel(nowarn_perm);
-+ break;
-+ case Opt_verbose:
-+ AuLabel(verbose);
-+ break;
-+ case Opt_noverbose:
-+ AuLabel(noverbose);
-+ break;
-+ case Opt_sum:
-+ AuLabel(sum);
-+ break;
-+ case Opt_nosum:
-+ AuLabel(nosum);
-+ break;
-+ case Opt_wsum:
-+ AuLabel(wsum);
-+ break;
-+ case Opt_wbr_create:
-+ u.create = &opt->wbr_create;
-+ AuDbg("create %d, %s\n", u.create->wbr_create,
-+ au_optstr_wbr_create(u.create->wbr_create));
-+ switch (u.create->wbr_create) {
-+ case AuWbrCreate_MFSV:
-+ case AuWbrCreate_PMFSV:
-+ AuDbg("%d sec\n", u.create->mfs_second);
-+ break;
-+ case AuWbrCreate_MFSRR:
-+ case AuWbrCreate_TDMFS:
-+ AuDbg("%llu watermark\n",
-+ u.create->mfsrr_watermark);
-+ break;
-+ case AuWbrCreate_MFSRRV:
-+ case AuWbrCreate_TDMFSV:
-+ case AuWbrCreate_PMFSRRV:
-+ AuDbg("%llu watermark, %d sec\n",
-+ u.create->mfsrr_watermark,
-+ u.create->mfs_second);
-+ break;
-+ }
-+ break;
-+ case Opt_wbr_copyup:
-+ AuDbg("copyup %d, %s\n", opt->wbr_copyup,
-+ au_optstr_wbr_copyup(opt->wbr_copyup));
-+ break;
-+ case Opt_fhsm_sec:
-+ AuDbg("fhsm_sec %u\n", opt->fhsm_second);
-+ break;
-+ case Opt_dirren:
-+ AuLabel(dirren);
-+ break;
-+ case Opt_nodirren:
-+ AuLabel(nodirren);
-+ break;
-+ case Opt_acl:
-+ AuLabel(acl);
-+ break;
-+ case Opt_noacl:
-+ AuLabel(noacl);
-+ break;
-+ default:
-+ BUG();
-+ }
-+ opt++;
-+ }
-+#endif
-+}
-+
-+void au_opts_free(struct au_opts *opts)
-+{
-+ struct au_opt *opt;
-+
-+ opt = opts->opt;
-+ while (opt->type != Opt_tail) {
-+ switch (opt->type) {
-+ case Opt_add:
-+ case Opt_append:
-+ case Opt_prepend:
-+ path_put(&opt->add.path);
-+ break;
-+ case Opt_del:
-+ case Opt_idel:
-+ path_put(&opt->del.h_path);
-+ break;
-+ case Opt_mod:
-+ case Opt_imod:
-+ dput(opt->mod.h_root);
-+ break;
-+ case Opt_xino:
-+ fput(opt->xino.file);
-+ break;
-+ }
-+ opt++;
-+ }
-+}
-+
-+static int opt_add(struct au_opt *opt, char *opt_str, unsigned long sb_flags,
-+ aufs_bindex_t bindex)
++int au_opt_add(struct au_opt *opt, char *opt_str, unsigned long sb_flags,
++ aufs_bindex_t bindex)
+{
+ int err;
+ struct au_opt_add *add = &opt->add;
+ if (p) {
+ *p++ = 0;
+ if (*p)
-+ add->perm = br_perm_val(p);
++ add->perm = au_br_perm_val(p);
+ }
+
-+ err = vfsub_kern_path(add->pathname, lkup_dirflags, &add->path);
++ err = vfsub_kern_path(add->pathname, AuOpt_LkupDirFlags, &add->path);
+ if (!err) {
+ if (!p) {
+ add->perm = AuBrPerm_RO;
+ return err;
+}
+
-+static int au_opts_parse_del(struct au_opt_del *del, substring_t args[])
-+{
-+ int err;
-+
-+ del->pathname = args[0].from;
-+ AuDbg("del path %s\n", del->pathname);
-+
-+ err = vfsub_kern_path(del->pathname, lkup_dirflags, &del->h_path);
-+ if (unlikely(err))
-+ pr_err("lookup failed %s (%d)\n", del->pathname, err);
-+
-+ return err;
-+}
-+
-+#if 0 /* reserved for future use */
-+static int au_opts_parse_idel(struct super_block *sb, aufs_bindex_t bindex,
-+ struct au_opt_del *del, substring_t args[])
-+{
-+ int err;
-+ struct dentry *root;
-+
-+ err = -EINVAL;
-+ root = sb->s_root;
-+ aufs_read_lock(root, AuLock_FLUSH);
-+ if (bindex < 0 || au_sbbot(sb) < bindex) {
-+ pr_err("out of bounds, %d\n", bindex);
-+ goto out;
-+ }
-+
-+ err = 0;
-+ del->h_path.dentry = dget(au_h_dptr(root, bindex));
-+ del->h_path.mnt = mntget(au_sbr_mnt(sb, bindex));
-+
-+out:
-+ aufs_read_unlock(root, !AuLock_IR);
-+ return err;
-+}
-+#endif
-+
-+static int noinline_for_stack
-+au_opts_parse_mod(struct au_opt_mod *mod, substring_t args[])
-+{
-+ int err;
-+ struct path path;
-+ char *p;
-+
-+ err = -EINVAL;
-+ mod->path = args[0].from;
-+ p = strchr(mod->path, '=');
-+ if (unlikely(!p)) {
-+ pr_err("no permission %s\n", args[0].from);
-+ goto out;
-+ }
-+
-+ *p++ = 0;
-+ err = vfsub_kern_path(mod->path, lkup_dirflags, &path);
-+ if (unlikely(err)) {
-+ pr_err("lookup failed %s (%d)\n", mod->path, err);
-+ goto out;
-+ }
-+
-+ mod->perm = br_perm_val(p);
-+ AuDbg("mod path %s, perm 0x%x, %s\n", mod->path, mod->perm, p);
-+ mod->h_root = dget(path.dentry);
-+ path_put(&path);
-+
-+out:
-+ return err;
-+}
-+
-+#if 0 /* reserved for future use */
-+static int au_opts_parse_imod(struct super_block *sb, aufs_bindex_t bindex,
-+ struct au_opt_mod *mod, substring_t args[])
-+{
-+ int err;
-+ struct dentry *root;
-+
-+ err = -EINVAL;
-+ root = sb->s_root;
-+ aufs_read_lock(root, AuLock_FLUSH);
-+ if (bindex < 0 || au_sbbot(sb) < bindex) {
-+ pr_err("out of bounds, %d\n", bindex);
-+ goto out;
-+ }
-+
-+ err = 0;
-+ mod->perm = br_perm_val(args[1].from);
-+ AuDbg("mod path %s, perm 0x%x, %s\n",
-+ mod->path, mod->perm, args[1].from);
-+ mod->h_root = dget(au_h_dptr(root, bindex));
-+
-+out:
-+ aufs_read_unlock(root, !AuLock_IR);
-+ return err;
-+}
-+#endif
-+
-+static int au_opts_parse_xino(struct super_block *sb, struct au_opt_xino *xino,
-+ substring_t args[])
-+{
-+ int err;
-+ struct file *file;
-+
-+ file = au_xino_create(sb, args[0].from, /*silent*/0, /*wbrtop*/0);
-+ err = PTR_ERR(file);
-+ if (IS_ERR(file))
-+ goto out;
-+
-+ err = -EINVAL;
-+ if (unlikely(file->f_path.dentry->d_sb == sb)) {
-+ fput(file);
-+ pr_err("%s must be outside\n", args[0].from);
-+ goto out;
-+ }
-+
-+ err = 0;
-+ xino->file = file;
-+ xino->path = args[0].from;
-+
-+out:
-+ return err;
-+}
-+
-+static int noinline_for_stack
-+au_opts_parse_xino_itrunc_path(struct super_block *sb,
-+ struct au_opt_xino_itrunc *xino_itrunc,
-+ substring_t args[])
-+{
-+ int err;
-+ aufs_bindex_t bbot, bindex;
-+ struct path path;
-+ struct dentry *root;
-+
-+ err = vfsub_kern_path(args[0].from, lkup_dirflags, &path);
-+ if (unlikely(err)) {
-+ pr_err("lookup failed %s (%d)\n", args[0].from, err);
-+ goto out;
-+ }
-+
-+ xino_itrunc->bindex = -1;
-+ root = sb->s_root;
-+ aufs_read_lock(root, AuLock_FLUSH);
-+ bbot = au_sbbot(sb);
-+ for (bindex = 0; bindex <= bbot; bindex++) {
-+ if (au_h_dptr(root, bindex) == path.dentry) {
-+ xino_itrunc->bindex = bindex;
-+ break;
-+ }
-+ }
-+ aufs_read_unlock(root, !AuLock_IR);
-+ path_put(&path);
-+
-+ if (unlikely(xino_itrunc->bindex < 0)) {
-+ pr_err("no such branch %s\n", args[0].from);
-+ err = -EINVAL;
-+ }
-+
-+out:
-+ return err;
-+}
-+
-+/* called without aufs lock */
-+int au_opts_parse(struct super_block *sb, char *str, struct au_opts *opts)
-+{
-+ int err, n, token;
-+ aufs_bindex_t bindex;
-+ unsigned char skipped;
-+ struct dentry *root;
-+ struct au_opt *opt, *opt_tail;
-+ char *opt_str;
-+ /* reduce the stack space */
-+ union {
-+ struct au_opt_xino_itrunc *xino_itrunc;
-+ struct au_opt_wbr_create *create;
-+ } u;
-+ struct {
-+ substring_t args[MAX_OPT_ARGS];
-+ } *a;
-+
-+ err = -ENOMEM;
-+ a = kmalloc(sizeof(*a), GFP_NOFS);
-+ if (unlikely(!a))
-+ goto out;
-+
-+ root = sb->s_root;
-+ err = 0;
-+ bindex = 0;
-+ opt = opts->opt;
-+ opt_tail = opt + opts->max_opt - 1;
-+ opt->type = Opt_tail;
-+ while (!err && (opt_str = strsep(&str, ",")) && *opt_str) {
-+ err = -EINVAL;
-+ skipped = 0;
-+ token = match_token(opt_str, options, a->args);
-+ switch (token) {
-+ case Opt_br:
-+ err = 0;
-+ while (!err && (opt_str = strsep(&a->args[0].from, ":"))
-+ && *opt_str) {
-+ err = opt_add(opt, opt_str, opts->sb_flags,
-+ bindex++);
-+ if (unlikely(!err && ++opt > opt_tail)) {
-+ err = -E2BIG;
-+ break;
-+ }
-+ opt->type = Opt_tail;
-+ skipped = 1;
-+ }
-+ break;
-+ case Opt_add:
-+ if (unlikely(match_int(&a->args[0], &n))) {
-+ pr_err("bad integer in %s\n", opt_str);
-+ break;
-+ }
-+ bindex = n;
-+ err = opt_add(opt, a->args[1].from, opts->sb_flags,
-+ bindex);
-+ if (!err)
-+ opt->type = token;
-+ break;
-+ case Opt_append:
-+ err = opt_add(opt, a->args[0].from, opts->sb_flags,
-+ /*dummy bindex*/1);
-+ if (!err)
-+ opt->type = token;
-+ break;
-+ case Opt_prepend:
-+ err = opt_add(opt, a->args[0].from, opts->sb_flags,
-+ /*bindex*/0);
-+ if (!err)
-+ opt->type = token;
-+ break;
-+ case Opt_del:
-+ err = au_opts_parse_del(&opt->del, a->args);
-+ if (!err)
-+ opt->type = token;
-+ break;
-+#if 0 /* reserved for future use */
-+ case Opt_idel:
-+ del->pathname = "(indexed)";
-+ if (unlikely(match_int(&args[0], &n))) {
-+ pr_err("bad integer in %s\n", opt_str);
-+ break;
-+ }
-+ err = au_opts_parse_idel(sb, n, &opt->del, a->args);
-+ if (!err)
-+ opt->type = token;
-+ break;
-+#endif
-+ case Opt_mod:
-+ err = au_opts_parse_mod(&opt->mod, a->args);
-+ if (!err)
-+ opt->type = token;
-+ break;
-+#ifdef IMOD /* reserved for future use */
-+ case Opt_imod:
-+ u.mod->path = "(indexed)";
-+ if (unlikely(match_int(&a->args[0], &n))) {
-+ pr_err("bad integer in %s\n", opt_str);
-+ break;
-+ }
-+ err = au_opts_parse_imod(sb, n, &opt->mod, a->args);
-+ if (!err)
-+ opt->type = token;
-+ break;
-+#endif
-+ case Opt_xino:
-+ err = au_opts_parse_xino(sb, &opt->xino, a->args);
-+ if (!err)
-+ opt->type = token;
-+ break;
-+
-+ case Opt_trunc_xino_path:
-+ err = au_opts_parse_xino_itrunc_path
-+ (sb, &opt->xino_itrunc, a->args);
-+ if (!err)
-+ opt->type = token;
-+ break;
-+
-+ case Opt_itrunc_xino:
-+ u.xino_itrunc = &opt->xino_itrunc;
-+ if (unlikely(match_int(&a->args[0], &n))) {
-+ pr_err("bad integer in %s\n", opt_str);
-+ break;
-+ }
-+ u.xino_itrunc->bindex = n;
-+ aufs_read_lock(root, AuLock_FLUSH);
-+ if (n < 0 || au_sbbot(sb) < n) {
-+ pr_err("out of bounds, %d\n", n);
-+ aufs_read_unlock(root, !AuLock_IR);
-+ break;
-+ }
-+ aufs_read_unlock(root, !AuLock_IR);
-+ err = 0;
-+ opt->type = token;
-+ break;
-+
-+ case Opt_dirwh:
-+ if (unlikely(match_int(&a->args[0], &opt->dirwh)))
-+ break;
-+ err = 0;
-+ opt->type = token;
-+ break;
-+
-+ case Opt_rdcache:
-+ if (unlikely(match_int(&a->args[0], &n))) {
-+ pr_err("bad integer in %s\n", opt_str);
-+ break;
-+ }
-+ if (unlikely(n > AUFS_RDCACHE_MAX)) {
-+ pr_err("rdcache must be smaller than %d\n",
-+ AUFS_RDCACHE_MAX);
-+ break;
-+ }
-+ opt->rdcache = n;
-+ err = 0;
-+ opt->type = token;
-+ break;
-+ case Opt_rdblk:
-+ if (unlikely(match_int(&a->args[0], &n)
-+ || n < 0
-+ || n > KMALLOC_MAX_SIZE)) {
-+ pr_err("bad integer in %s\n", opt_str);
-+ break;
-+ }
-+ if (unlikely(n && n < NAME_MAX)) {
-+ pr_err("rdblk must be larger than %d\n",
-+ NAME_MAX);
-+ break;
-+ }
-+ opt->rdblk = n;
-+ err = 0;
-+ opt->type = token;
-+ break;
-+ case Opt_rdhash:
-+ if (unlikely(match_int(&a->args[0], &n)
-+ || n < 0
-+ || n * sizeof(struct hlist_head)
-+ > KMALLOC_MAX_SIZE)) {
-+ pr_err("bad integer in %s\n", opt_str);
-+ break;
-+ }
-+ opt->rdhash = n;
-+ err = 0;
-+ opt->type = token;
-+ break;
-+
-+ case Opt_trunc_xino:
-+ case Opt_notrunc_xino:
-+ case Opt_noxino:
-+ case Opt_trunc_xib:
-+ case Opt_notrunc_xib:
-+ case Opt_shwh:
-+ case Opt_noshwh:
-+ case Opt_dirperm1:
-+ case Opt_nodirperm1:
-+ case Opt_plink:
-+ case Opt_noplink:
-+ case Opt_list_plink:
-+ case Opt_dio:
-+ case Opt_nodio:
-+ case Opt_diropq_a:
-+ case Opt_diropq_w:
-+ case Opt_warn_perm:
-+ case Opt_nowarn_perm:
-+ case Opt_verbose:
-+ case Opt_noverbose:
-+ case Opt_sum:
-+ case Opt_nosum:
-+ case Opt_wsum:
-+ case Opt_rdblk_def:
-+ case Opt_rdhash_def:
-+ case Opt_dirren:
-+ case Opt_nodirren:
-+ case Opt_acl:
-+ case Opt_noacl:
-+ err = 0;
-+ opt->type = token;
-+ break;
-+
-+ case Opt_udba:
-+ opt->udba = udba_val(a->args[0].from);
-+ if (opt->udba >= 0) {
-+ err = 0;
-+ opt->type = token;
-+ } else
-+ pr_err("wrong value, %s\n", opt_str);
-+ break;
-+
-+ case Opt_wbr_create:
-+ u.create = &opt->wbr_create;
-+ u.create->wbr_create
-+ = au_wbr_create_val(a->args[0].from, u.create);
-+ if (u.create->wbr_create >= 0) {
-+ err = 0;
-+ opt->type = token;
-+ } else
-+ pr_err("wrong value, %s\n", opt_str);
-+ break;
-+ case Opt_wbr_copyup:
-+ opt->wbr_copyup = au_wbr_copyup_val(a->args[0].from);
-+ if (opt->wbr_copyup >= 0) {
-+ err = 0;
-+ opt->type = token;
-+ } else
-+ pr_err("wrong value, %s\n", opt_str);
-+ break;
-+
-+ case Opt_fhsm_sec:
-+ if (unlikely(match_int(&a->args[0], &n)
-+ || n < 0)) {
-+ pr_err("bad integer in %s\n", opt_str);
-+ break;
-+ }
-+ if (sysaufs_brs) {
-+ opt->fhsm_second = n;
-+ opt->type = token;
-+ } else
-+ pr_warn("ignored %s\n", opt_str);
-+ err = 0;
-+ break;
-+
-+ case Opt_ignore:
-+ pr_warn("ignored %s\n", opt_str);
-+ fallthrough;
-+ case Opt_ignore_silent:
-+ skipped = 1;
-+ err = 0;
-+ break;
-+ case Opt_err:
-+ pr_err("unknown option %s\n", opt_str);
-+ break;
-+ }
-+
-+ if (!err && !skipped) {
-+ if (unlikely(++opt > opt_tail)) {
-+ err = -E2BIG;
-+ opt--;
-+ opt->type = Opt_tail;
-+ break;
-+ }
-+ opt->type = Opt_tail;
-+ }
-+ }
-+
-+ au_kfree_rcu(a);
-+ dump_opts(opts);
-+ if (unlikely(err))
-+ au_opts_free(opts);
-+
-+out:
-+ return err;
-+}
-+
+static int au_opt_wbr_create(struct super_block *sb,
+ struct au_opt_wbr_create *create)
+{
+ break;
+
+ case Opt_plink:
-+ au_opt_set(sbinfo->si_mntflags, PLINK);
-+ break;
-+ case Opt_noplink:
-+ if (au_opt_test(sbinfo->si_mntflags, PLINK))
-+ au_plink_put(sb, /*verbose*/1);
-+ au_opt_clr(sbinfo->si_mntflags, PLINK);
++ if (opt->tf)
++ au_opt_set(sbinfo->si_mntflags, PLINK);
++ else {
++ if (au_opt_test(sbinfo->si_mntflags, PLINK))
++ au_plink_put(sb, /*verbose*/1);
++ au_opt_clr(sbinfo->si_mntflags, PLINK);
++ }
+ break;
+ case Opt_list_plink:
+ if (au_opt_test(sbinfo->si_mntflags, PLINK))
+ break;
+
+ case Opt_dio:
-+ au_opt_set(sbinfo->si_mntflags, DIO);
-+ au_fset_opts(opts->flags, REFRESH_DYAOP);
-+ break;
-+ case Opt_nodio:
-+ au_opt_clr(sbinfo->si_mntflags, DIO);
-+ au_fset_opts(opts->flags, REFRESH_DYAOP);
++ if (opt->tf) {
++ au_opt_set(sbinfo->si_mntflags, DIO);
++ au_fset_opts(opts->flags, REFRESH_DYAOP);
++ } else {
++ au_opt_clr(sbinfo->si_mntflags, DIO);
++ au_fset_opts(opts->flags, REFRESH_DYAOP);
++ }
+ break;
+
+ case Opt_fhsm_sec:
+ break;
+
+ case Opt_warn_perm:
-+ au_opt_set(sbinfo->si_mntflags, WARN_PERM);
-+ break;
-+ case Opt_nowarn_perm:
-+ au_opt_clr(sbinfo->si_mntflags, WARN_PERM);
++ if (opt->tf)
++ au_opt_set(sbinfo->si_mntflags, WARN_PERM);
++ else
++ au_opt_clr(sbinfo->si_mntflags, WARN_PERM);
+ break;
+
+ case Opt_verbose:
-+ au_opt_set(sbinfo->si_mntflags, VERBOSE);
-+ break;
-+ case Opt_noverbose:
-+ au_opt_clr(sbinfo->si_mntflags, VERBOSE);
++ if (opt->tf)
++ au_opt_set(sbinfo->si_mntflags, VERBOSE);
++ else
++ au_opt_clr(sbinfo->si_mntflags, VERBOSE);
+ break;
+
+ case Opt_sum:
-+ au_opt_set(sbinfo->si_mntflags, SUM);
++ if (opt->tf)
++ au_opt_set(sbinfo->si_mntflags, SUM);
++ else {
++ au_opt_clr(sbinfo->si_mntflags, SUM);
++ au_opt_clr(sbinfo->si_mntflags, SUM_W);
++ }
+ break;
+ case Opt_wsum:
+ au_opt_clr(sbinfo->si_mntflags, SUM);
+ au_opt_set(sbinfo->si_mntflags, SUM_W);
+ break;
-+ case Opt_nosum:
-+ au_opt_clr(sbinfo->si_mntflags, SUM);
-+ au_opt_clr(sbinfo->si_mntflags, SUM_W);
-+ break;
+
+ case Opt_wbr_create:
+ err = au_opt_wbr_create(sb, &opt->wbr_create);
+ case Opt_rdblk:
+ sbinfo->si_rdblk = opt->rdblk;
+ break;
-+ case Opt_rdblk_def:
-+ sbinfo->si_rdblk = AUFS_RDBLK_DEF;
-+ break;
+ case Opt_rdhash:
+ sbinfo->si_rdhash = opt->rdhash;
+ break;
-+ case Opt_rdhash_def:
-+ sbinfo->si_rdhash = AUFS_RDHASH_DEF;
-+ break;
+
+ case Opt_shwh:
-+ au_opt_set(sbinfo->si_mntflags, SHWH);
-+ break;
-+ case Opt_noshwh:
-+ au_opt_clr(sbinfo->si_mntflags, SHWH);
++ if (opt->tf)
++ au_opt_set(sbinfo->si_mntflags, SHWH);
++ else
++ au_opt_clr(sbinfo->si_mntflags, SHWH);
+ break;
+
+ case Opt_dirperm1:
-+ au_opt_set(sbinfo->si_mntflags, DIRPERM1);
-+ break;
-+ case Opt_nodirperm1:
-+ au_opt_clr(sbinfo->si_mntflags, DIRPERM1);
++ if (opt->tf)
++ au_opt_set(sbinfo->si_mntflags, DIRPERM1);
++ else
++ au_opt_clr(sbinfo->si_mntflags, DIRPERM1);
+ break;
+
+ case Opt_trunc_xino:
-+ au_opt_set(sbinfo->si_mntflags, TRUNC_XINO);
-+ break;
-+ case Opt_notrunc_xino:
-+ au_opt_clr(sbinfo->si_mntflags, TRUNC_XINO);
++ if (opt->tf)
++ au_opt_set(sbinfo->si_mntflags, TRUNC_XINO);
++ else
++ au_opt_clr(sbinfo->si_mntflags, TRUNC_XINO);
+ break;
+
+ case Opt_trunc_xino_path:
+ break;
+
+ case Opt_trunc_xib:
-+ au_fset_opts(opts->flags, TRUNC_XIB);
-+ break;
-+ case Opt_notrunc_xib:
-+ au_fclr_opts(opts->flags, TRUNC_XIB);
++ if (opt->tf)
++ au_fset_opts(opts->flags, TRUNC_XIB);
++ else
++ au_fclr_opts(opts->flags, TRUNC_XIB);
+ break;
+
+ case Opt_dirren:
+ err = 1;
-+ if (!au_opt_test(sbinfo->si_mntflags, DIRREN)) {
-+ err = au_dr_opt_set(sb);
-+ if (!err)
-+ err = 1;
-+ }
-+ if (err == 1)
-+ au_opt_set(sbinfo->si_mntflags, DIRREN);
-+ break;
-+ case Opt_nodirren:
-+ err = 1;
-+ if (au_opt_test(sbinfo->si_mntflags, DIRREN)) {
-+ err = au_dr_opt_clr(sb, au_ftest_opts(opts->flags,
-+ DR_FLUSHED));
-+ if (!err)
-+ err = 1;
++ if (opt->tf) {
++ if (!au_opt_test(sbinfo->si_mntflags, DIRREN)) {
++ err = au_dr_opt_set(sb);
++ if (!err)
++ err = 1;
++ }
++ if (err == 1)
++ au_opt_set(sbinfo->si_mntflags, DIRREN);
++ } else {
++ if (au_opt_test(sbinfo->si_mntflags, DIRREN)) {
++ err = au_dr_opt_clr(sb, au_ftest_opts(opts->flags,
++ DR_FLUSHED));
++ if (!err)
++ err = 1;
++ }
++ if (err == 1)
++ au_opt_clr(sbinfo->si_mntflags, DIRREN);
+ }
-+ if (err == 1)
-+ au_opt_clr(sbinfo->si_mntflags, DIRREN);
+ break;
+
+ case Opt_acl:
-+ sb->s_flags |= SB_POSIXACL;
-+ break;
-+ case Opt_noacl:
-+ sb->s_flags &= ~SB_POSIXACL;
++ if (opt->tf)
++ sb->s_flags |= SB_POSIXACL;
++ else
++ sb->s_flags &= ~SB_POSIXACL;
+ break;
+
+ default:
+ case Opt_xino:
+ err = au_xino_set(sb, &opt->xino,
+ !!au_ftest_opts(opts->flags, REMOUNT));
-+ if (unlikely(err))
-+ break;
-+
-+ *opt_xino = &opt->xino;
++ if (!err)
++ *opt_xino = &opt->xino;
+ break;
-+
+ case Opt_noxino:
+ au_xino_clr(sb);
+ *opt_xino = (void *)-1;
+}
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-12-03 15:38:59.939980643 +0100
-@@ -0,0 +1,225 @@
++++ linux/fs/aufs/opts.h 2022-10-26 22:30:38.469315525 +0200
+@@ -0,0 +1,263 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
+
+#ifdef __KERNEL__
+
++#include <linux/fs_parser.h>
++#include <linux/namei.h>
+#include <linux/path.h>
+
-+struct file;
++enum {
++ Opt_br,
++ Opt_add, Opt_del, Opt_mod, Opt_append, Opt_prepend,
++ Opt_idel, Opt_imod,
++ Opt_dirwh, Opt_rdcache, Opt_rdblk, Opt_rdhash,
++ Opt_xino, Opt_noxino,
++ Opt_trunc_xino, Opt_trunc_xino_v,
++ Opt_trunc_xino_path, Opt_itrunc_xino,
++ Opt_trunc_xib,
++ Opt_shwh,
++ Opt_plink, Opt_list_plink,
++ Opt_udba,
++ Opt_dio,
++ Opt_diropq, Opt_diropq_a, Opt_diropq_w,
++ Opt_warn_perm,
++ Opt_wbr_copyup, Opt_wbr_create,
++ Opt_fhsm_sec,
++ Opt_verbose, Opt_noverbose,
++ Opt_sum, Opt_wsum,
++ Opt_dirperm1,
++ Opt_dirren,
++ Opt_acl,
++ Opt_tail, Opt_ignore, Opt_ignore_silent, Opt_err
++};
+
+/* ---------------------------------------------------------------------- */
+
+ | AuOpt_UDBA_REVAL \
+ | AuOpt_UDBA_HNOTIFY)
+
++#define AuOpt_LkupDirFlags (LOOKUP_FOLLOW | LOOKUP_DIRECTORY)
++
+#define au_opt_test(flags, name) (flags & AuOpt_##name)
+#define au_opt_set(flags, name) do { \
+ BUILD_BUG_ON(AuOpt_##name & AuOptMask_UDBA); \
+
+/* ---------------------------------------------------------------------- */
+
++struct file;
++
+struct au_opt_add {
+ aufs_bindex_t bindex;
+ char *pathname;
+ struct au_opt_wbr_create wbr_create;
+ int wbr_copyup;
+ unsigned int fhsm_second;
++ bool tf; /* generic flag, true or false */
+ };
+};
+
+/* ---------------------------------------------------------------------- */
+
+/* opts.c */
++int au_br_perm_val(char *perm);
+void au_optstr_br_perm(au_br_perm_str_t *str, int perm);
++int au_udba_val(char *str);
+const char *au_optstr_udba(int udba);
-+const char *au_optstr_wbr_copyup(int wbr_copyup);
++int au_wbr_create_val(char *str, struct au_opt_wbr_create *create);
+const char *au_optstr_wbr_create(int wbr_create);
++int au_wbr_copyup_val(char *str);
++const char *au_optstr_wbr_copyup(int wbr_copyup);
+
-+void au_opts_free(struct au_opts *opts);
++int au_opt_add(struct au_opt *opt, char *opt_str, unsigned long sb_flags,
++ aufs_bindex_t bindex);
+struct super_block;
-+int au_opts_parse(struct super_block *sb, char *str, struct au_opts *opts);
+int au_opts_verify(struct super_block *sb, unsigned long sb_flags,
+ unsigned int pending);
+int au_opts_mount(struct super_block *sb, struct au_opts *opts);
+
+unsigned int au_opt_udba(struct super_block *sb);
+
++/* fsctx.c */
++int aufs_fsctx_init(struct fs_context *fc);
++extern const struct fs_parameter_spec aufs_fsctx_paramspec[];
++
+#endif /* __KERNEL__ */
+#endif /* __AUFS_OPTS_H__ */
diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
--- /usr/share/empty/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/plink.c 2021-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/plink.c 2022-10-26 22:30:38.469315525 +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-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/poll.c 2022-10-26 22:30:38.469315525 +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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/posix_acl.c 2022-10-26 22:30:38.469315525 +0200
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/procfs.c 2022-10-26 22:30:38.469315525 +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-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/rdu.c 2022-10-26 22:30:38.472648858 +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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/rwsem.h 2022-10-26 22:30:38.472648858 +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-12-03 15:38:59.939980643 +0100
-@@ -0,0 +1,314 @@
++++ linux/fs/aufs/sbinfo.c 2022-10-26 22:30:38.472648858 +0200
+@@ -0,0 +1,316 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ au_kfree_rcu(sbinfo);
+}
+
-+int au_si_alloc(struct super_block *sb)
++struct au_sbinfo *au_si_alloc(struct super_block *sb)
+{
-+ int err, i;
+ struct au_sbinfo *sbinfo;
++ int err, i;
+
+ err = -ENOMEM;
+ sbinfo = kzalloc(sizeof(*sbinfo), GFP_NOFS);
+
+ /* leave other members for sysaufs and si_mnt. */
+ sbinfo->si_sb = sb;
-+ sb->s_fs_info = sbinfo;
-+ si_pid_set(sb);
-+ return 0; /* success */
++ if (sb) {
++ sb->s_fs_info = sbinfo;
++ si_pid_set(sb);
++ }
++ return sbinfo; /* success */
+
+out_br:
+ au_kfree_try_rcu(sbinfo->si_branch);
+out_sbinfo:
+ au_kfree_rcu(sbinfo);
+out:
-+ return err;
++ return ERR_PTR(err);
+}
+
+int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr, int may_shrink)
+}
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-12-03 15:40:58.236647297 +0100
-@@ -0,0 +1,1050 @@
++++ linux/fs/aufs/super.c 2022-10-26 22:30:38.472648858 +0200
+@@ -0,0 +1,871 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ continue;
+
+ h_sb = au_sbr_sb(sb, bindex);
-+ e = vfsub_sync_filesystem(h_sb, wait);
++ e = vfsub_sync_filesystem(h_sb);
+ if (unlikely(e && !err))
+ err = e;
+ /* go on even if an error happens */
+ return err;
+}
+
-+static void au_remount_refresh(struct super_block *sb, unsigned int do_idop)
++void au_remount_refresh(struct super_block *sb, unsigned int do_idop)
+{
+ int err, e;
+ unsigned int udba;
+ AuIOErr("refresh failed, ignored, %d\n", err);
+}
+
-+/* stop extra interpretation of errno in mount(8), and strange error messages */
-+static int cvt_err(int err)
-+{
-+ AuTraceErr(err);
-+
-+ switch (err) {
-+ case -ENOENT:
-+ case -ENOTDIR:
-+ case -EEXIST:
-+ case -EIO:
-+ err = -EINVAL;
-+ }
-+ return err;
-+}
-+
-+static int aufs_remount_fs(struct super_block *sb, int *flags, char *data)
-+{
-+ int err, do_dx;
-+ unsigned int mntflags;
-+ struct au_opts opts = {
-+ .opt = NULL
-+ };
-+ struct dentry *root;
-+ struct inode *inode;
-+ struct au_sbinfo *sbinfo;
-+
-+ err = 0;
-+ root = sb->s_root;
-+ if (!data || !*data) {
-+ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
-+ if (!err) {
-+ di_write_lock_child(root);
-+ err = au_opts_verify(sb, *flags, /*pending*/0);
-+ aufs_write_unlock(root);
-+ }
-+ goto out;
-+ }
-+
-+ err = -ENOMEM;
-+ opts.opt = (void *)__get_free_page(GFP_NOFS);
-+ if (unlikely(!opts.opt))
-+ goto out;
-+ opts.max_opt = PAGE_SIZE / sizeof(*opts.opt);
-+ opts.flags = AuOpts_REMOUNT;
-+ opts.sb_flags = *flags;
-+
-+ /* parse it before aufs lock */
-+ err = au_opts_parse(sb, data, &opts);
-+ if (unlikely(err))
-+ goto out_opts;
-+
-+ sbinfo = au_sbi(sb);
-+ inode = d_inode(root);
-+ inode_lock(inode);
-+ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
-+ if (unlikely(err))
-+ goto out_mtx;
-+ di_write_lock_child(root);
-+
-+ /* au_opts_remount() may return an error */
-+ err = au_opts_remount(sb, &opts);
-+ au_opts_free(&opts);
-+
-+ if (au_ftest_opts(opts.flags, REFRESH))
-+ au_remount_refresh(sb, au_ftest_opts(opts.flags, REFRESH_IDOP));
-+
-+ if (au_ftest_opts(opts.flags, REFRESH_DYAOP)) {
-+ mntflags = au_mntflags(sb);
-+ do_dx = !!au_opt_test(mntflags, DIO);
-+ au_dy_arefresh(do_dx);
-+ }
-+
-+ au_fhsm_wrote_all(sb, /*force*/1); /* ?? */
-+ aufs_write_unlock(root);
-+
-+out_mtx:
-+ inode_unlock(inode);
-+out_opts:
-+ free_page((unsigned long)opts.opt);
-+out:
-+ err = cvt_err(err);
-+ AuTraceErr(err);
-+ return err;
-+}
-+
-+static const struct super_operations aufs_sop = {
++const struct super_operations aufs_sop = {
+ .alloc_inode = aufs_alloc_inode,
+ .destroy_inode = aufs_destroy_inode,
+ .free_inode = aufs_free_inode,
+ .show_options = aufs_show_options,
+ .statfs = aufs_statfs,
+ .put_super = aufs_put_super,
-+ .sync_fs = aufs_sync_fs,
-+ .remount_fs = aufs_remount_fs
++ .sync_fs = aufs_sync_fs
+};
+
+/* ---------------------------------------------------------------------- */
+
-+static int alloc_root(struct super_block *sb)
++int au_alloc_root(struct super_block *sb)
+{
+ int err;
+ struct inode *inode;
+ return err;
+}
+
-+static int aufs_fill_super(struct super_block *sb, void *raw_data,
-+ int silent __maybe_unused)
++/* ---------------------------------------------------------------------- */
++
++static void aufs_kill_sb(struct super_block *sb)
+{
-+ int err;
-+ struct au_opts opts = {
-+ .opt = NULL
-+ };
+ struct au_sbinfo *sbinfo;
+ struct dentry *root;
-+ struct inode *inode;
-+ char *arg = raw_data;
-+
-+ if (unlikely(!arg || !*arg)) {
-+ err = -EINVAL;
-+ pr_err("no arg\n");
-+ goto out;
-+ }
-+
-+ err = -ENOMEM;
-+ opts.opt = (void *)__get_free_page(GFP_NOFS);
-+ if (unlikely(!opts.opt))
-+ goto out;
-+ opts.max_opt = PAGE_SIZE / sizeof(*opts.opt);
-+ opts.sb_flags = sb->s_flags;
+
-+ err = au_si_alloc(sb);
-+ if (unlikely(err))
-+ goto out_opts;
+ sbinfo = au_sbi(sb);
++ if (!sbinfo)
++ goto out;
+
-+ /* all timestamps always follow the ones on the branch */
-+ sb->s_flags |= SB_NOATIME | SB_NODIRATIME;
-+ sb->s_flags |= SB_I_VERSION; /* do we really need this? */
-+ sb->s_op = &aufs_sop;
-+ sb->s_d_op = &aufs_dop;
-+ sb->s_magic = AUFS_SUPER_MAGIC;
-+ sb->s_maxbytes = 0;
-+ sb->s_stack_depth = 1;
-+ au_export_init(sb);
-+ au_xattr_init(sb);
++ au_sbilist_del(sb);
+
-+ err = alloc_root(sb);
-+ if (unlikely(err)) {
-+ si_write_unlock(sb);
-+ goto out_info;
-+ }
+ root = sb->s_root;
-+ inode = d_inode(root);
-+
-+ /*
-+ * actually we can parse options regardless aufs lock here.
-+ * but at remount time, parsing must be done before aufs lock.
-+ * so we follow the same rule.
-+ */
-+ ii_write_lock_parent(inode);
-+ aufs_write_unlock(root);
-+ err = au_opts_parse(sb, arg, &opts);
-+ if (unlikely(err))
-+ goto out_root;
++ if (root)
++ aufs_write_lock(root);
++ else
++ __si_write_lock(sb);
+
-+ /* lock vfs_inode first, then aufs. */
-+ inode_lock(inode);
-+ aufs_write_lock(root);
-+ err = au_opts_mount(sb, &opts);
-+ au_opts_free(&opts);
-+ if (!err && au_ftest_si(sbinfo, NO_DREVAL)) {
-+ sb->s_d_op = &aufs_dop_noreval;
-+ pr_info("%ps\n", sb->s_d_op);
-+ au_refresh_dop(root, /*force_reval*/0);
-+ sbinfo->si_iop_array = aufs_iop_nogetattr;
-+ au_refresh_iop(inode, /*force_getattr*/0);
++ au_fhsm_fin(sb);
++ if (sbinfo->si_wbr_create_ops->fin)
++ sbinfo->si_wbr_create_ops->fin(sb);
++ if (au_opt_test(sbinfo->si_mntflags, UDBA_HNOTIFY)) {
++ au_opt_set_udba(sbinfo->si_mntflags, UDBA_NONE);
++ au_remount_refresh(sb, /*do_idop*/0);
+ }
-+ aufs_write_unlock(root);
-+ inode_unlock(inode);
-+ if (!err)
-+ goto out_opts; /* success */
-+
-+out_root:
-+ dput(root);
-+ sb->s_root = NULL;
-+out_info:
-+ kobject_put(&sbinfo->si_kobj);
-+ sb->s_fs_info = NULL;
-+out_opts:
-+ free_page((unsigned long)opts.opt);
-+out:
-+ AuTraceErr(err);
-+ err = cvt_err(err);
-+ AuTraceErr(err);
-+ return err;
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+static struct dentry *aufs_mount(struct file_system_type *fs_type, int flags,
-+ const char *dev_name __maybe_unused,
-+ void *raw_data)
-+{
-+ struct dentry *root;
++ if (au_opt_test(sbinfo->si_mntflags, PLINK))
++ au_plink_put(sb, /*verbose*/1);
++ au_xino_clr(sb);
++ if (root)
++ au_dr_opt_flush(sb);
+
-+ /* all timestamps always follow the ones on the branch */
-+ /* mnt->mnt_flags |= MNT_NOATIME | MNT_NODIRATIME; */
-+ root = mount_nodev(fs_type, flags, raw_data, aufs_fill_super);
-+ if (IS_ERR(root))
-+ goto out;
++ if (root)
++ aufs_write_unlock(root);
++ else
++ __si_write_unlock(sb);
+
-+ au_sbilist_add(root->d_sb);
++ sbinfo->si_sb = NULL;
++ au_nwt_flush(&sbinfo->si_nowait);
+
+out:
-+ return root;
-+}
-+
-+static void aufs_kill_sb(struct super_block *sb)
-+{
-+ struct au_sbinfo *sbinfo;
-+
-+ sbinfo = au_sbi(sb);
-+ if (sbinfo) {
-+ au_sbilist_del(sb);
-+ aufs_write_lock(sb->s_root);
-+ au_fhsm_fin(sb);
-+ if (sbinfo->si_wbr_create_ops->fin)
-+ sbinfo->si_wbr_create_ops->fin(sb);
-+ if (au_opt_test(sbinfo->si_mntflags, UDBA_HNOTIFY)) {
-+ au_opt_set_udba(sbinfo->si_mntflags, UDBA_NONE);
-+ au_remount_refresh(sb, /*do_idop*/0);
-+ }
-+ if (au_opt_test(sbinfo->si_mntflags, PLINK))
-+ au_plink_put(sb, /*verbose*/1);
-+ au_xino_clr(sb);
-+ au_dr_opt_flush(sb);
-+ sbinfo->si_sb = NULL;
-+ aufs_write_unlock(sb->s_root);
-+ au_nwt_flush(&sbinfo->si_nowait);
-+ }
+ kill_anon_super(sb);
+}
+
+ /* untested */
+ /*| FS_ALLOW_IDMAP*/
+ ,
-+ .mount = aufs_mount,
++ .init_fs_context = aufs_fsctx_init,
++ .parameters = aufs_fsctx_paramspec,
+ .kill_sb = aufs_kill_sb,
+ /* no need to __module_get() and module_put(). */
+ .owner = THIS_MODULE,
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2021-12-03 15:38:59.939980643 +0100
-@@ -0,0 +1,587 @@
++++ linux/fs/aufs/super.h 2022-10-26 22:30:38.472648858 +0200
+@@ -0,0 +1,592 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
+/* ---------------------------------------------------------------------- */
+
+/* super.c */
-+extern struct file_system_type aufs_fs_type;
+struct inode *au_iget_locked(struct super_block *sb, ino_t ino);
++
+typedef unsigned long long (*au_arraycb_t)(struct super_block *sb, void *array,
+ unsigned long long max, void *arg);
+void *au_array_alloc(unsigned long long *hint, au_arraycb_t cb,
+struct inode **au_iarray_alloc(struct super_block *sb, unsigned long long *max);
+void au_iarray_free(struct inode **a, unsigned long long max);
+
++void au_remount_refresh(struct super_block *sb, unsigned int do_idop);
++extern const struct super_operations aufs_sop;
++int au_alloc_root(struct super_block *sb);
++extern struct file_system_type aufs_fs_type;
++
+/* sbinfo.c */
+void au_si_free(struct kobject *kobj);
-+int au_si_alloc(struct super_block *sb);
++struct au_sbinfo *au_si_alloc(struct super_block *sb);
+int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr, int may_shrink);
+
+unsigned int au_sigen_inc(struct super_block *sb);
+#endif /* __AUFS_SUPER_H__ */
diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
--- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c 2021-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/sysaufs.c 2022-10-26 22:30:38.472648858 +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-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/sysaufs.h 2022-10-26 22:30:38.472648858 +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-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/sysfs.c 2022-10-26 22:30:38.472648858 +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-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/sysrq.c 2022-10-26 22:30:38.472648858 +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-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/vdir.c 2022-10-26 22:30:38.472648858 +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-12-03 15:40:58.236647297 +0100
-@@ -0,0 +1,919 @@
++++ linux/fs/aufs/vfsub.c 2022-10-26 22:30:38.472648858 +0200
+@@ -0,0 +1,918 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ */
+
+#include <linux/mnt_namespace.h>
-+#include <linux/namei.h>
+#include <linux/nsproxy.h>
+#include <linux/security.h>
+#include <linux/splice.h>
+}
+#endif
+
-+int vfsub_sync_filesystem(struct super_block *h_sb, int wait)
++int vfsub_sync_filesystem(struct super_block *h_sb)
+{
+ int err;
+
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2021-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/vfsub.h 2022-10-26 22:30:38.472648858 +0200
@@ -0,0 +1,358 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+AuStubInt0(vfsub_test_mntns, struct vfsmount *mnt, struct super_block *h_sb);
+#endif
+
-+int vfsub_sync_filesystem(struct super_block *h_sb, int wait);
++int vfsub_sync_filesystem(struct super_block *h_sb);
+
+/* ---------------------------------------------------------------------- */
+
+#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-12-03 15:38:59.939980643 +0100
++++ linux/fs/aufs/wbr_policy.c 2022-10-26 22:30:38.472648858 +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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/whout.c 2022-10-26 22:30:38.472648858 +0200
@@ -0,0 +1,1072 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/whout.h 2022-10-26 22:30:38.472648858 +0200
@@ -0,0 +1,87 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+#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-12-03 15:38:59.943313977 +0100
++++ linux/fs/aufs/wkq.c 2022-10-26 22:30:38.472648858 +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-12-03 15:38:59.943313977 +0100
++++ linux/fs/aufs/wkq.h 2022-10-26 22:30:38.472648858 +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-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/xattr.c 2022-10-26 22:30:38.475982192 +0200
@@ -0,0 +1,368 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+}
diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
--- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c 2021-12-03 15:40:58.236647297 +0100
++++ linux/fs/aufs/xino.c 2022-10-26 22:30:38.475982192 +0200
@@ -0,0 +1,1926 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ }
+
+ err = -EINVAL;
-+ if (unlikely(sb == d->d_sb)) {
++ if (unlikely(sb && sb == d->d_sb)) {
+ if (!silent)
+ pr_err("%s must be outside\n", fpath);
+ goto out;
+}
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-12-03 15:40:58.239980630 +0100
++++ linux/include/uapi/linux/aufs_type.h 2022-10-26 22:30:38.475982192 +0200
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+#include <limits.h>
+#endif /* __KERNEL__ */
+
-+#define AUFS_VERSION "5.15.5-20211129"
++#define AUFS_VERSION "5.15.41-20220620"
+
+/* 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.15.5 loopback patch
+aufs5.15.41 loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index c9d1ef703673c..ca8b0b1146a60 100644
+index 7a9e40b97831..5ed06240cc9c 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -672,6 +672,15 @@ static inline void loop_update_dio(struct loop_device *lo)
+@@ -673,6 +673,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio);
}
static void loop_reread_partitions(struct loop_device *lo)
{
int rc;
-@@ -729,6 +738,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -730,6 +739,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
{
struct file *file = fget(arg);
struct file *old_file;
int error;
bool partscan;
bool is_loop;
-@@ -748,11 +758,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -749,11 +759,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
if (!(lo->lo_flags & LO_FLAGS_READ_ONLY))
goto out_err;
error = -EINVAL;
-@@ -765,6 +783,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -766,6 +784,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
blk_mq_freeze_queue(lo->lo_queue);
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
lo->lo_backing_file = file;
lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
mapping_set_gfp_mask(file->f_mapping,
lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
-@@ -787,6 +806,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -788,6 +807,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
if (partscan)
loop_reread_partitions(lo);
return 0;
-@@ -795,6 +816,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -796,6 +817,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
loop_global_unlock(lo, is_loop);
out_putf:
fput(file);
return error;
}
-@@ -1195,6 +1218,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1201,6 +1224,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
const struct loop_config *config)
{
struct file *file = fget(config->fd);
struct inode *inode;
struct address_space *mapping;
int error;
-@@ -1210,6 +1234,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1216,6 +1240,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
/* This is safe, since we have a reference from open(). */
__module_get(THIS_MODULE);
/*
* If we don't hold exclusive handle for the device, upgrade to it
* here to avoid changing device under exclusive owner.
-@@ -1275,6 +1306,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1281,6 +1312,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
lo->lo_device = bdev;
lo->lo_backing_file = file;
lo->old_gfp_mask = mapping_gfp_mask(mapping);
mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
-@@ -1325,6 +1357,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1331,6 +1363,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
bd_abort_claiming(bdev, loop_configure);
out_putf:
fput(file);
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
return error;
-@@ -1333,6 +1367,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1339,6 +1373,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
static int __loop_clr_fd(struct loop_device *lo, bool release)
{
struct file *filp = NULL;
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
-@@ -1384,6 +1419,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1390,6 +1425,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);
-@@ -1464,6 +1500,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1470,6 +1506,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 04c88dd6eabd6..0ff3ba22ee170 100644
+index 04c88dd6eabd..0ff3ba22ee17 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 99ceca1440449..e49dfe8550329 100644
+index 99ceca144044..e49dfe855032 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)
if (file->f_mapping != h_file->f_mapping) {
file->f_mapping = h_file->f_mapping;
diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
-index 74347bd75b380..5ef888a1d53f4 100644
+index 74347bd75b38..5ef888a1d53f 100644
--- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c
@@ -133,3 +133,19 @@ void au_loopback_fin(void)
+ return f;
+}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index 7293bee427f96..3345c098d0d47 100644
+index 7293bee427f9..3345c098d0d4 100644
--- a/fs/aufs/loop.h
+++ b/fs/aufs/loop.h
@@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index ae38857541533..af32f0960e595 100644
+index 90043afec51c..0835f6da42d9 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
-@@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {
+@@ -758,7 +758,10 @@ const struct super_operations aufs_sop = {
+ .show_options = aufs_show_options,
.statfs = aufs_statfs,
.put_super = aufs_put_super,
- .sync_fs = aufs_sync_fs,
-- .remount_fs = aufs_remount_fs
-+ .remount_fs = aufs_remount_fs,
+- .sync_fs = aufs_sync_fs
++ .sync_fs = aufs_sync_fs,
+#ifdef CONFIG_AUFS_BDEV_LOOP
+ .real_loop = aufs_real_loop
+#endif
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index e60d8ad854004..2ac5317f9b795 100644
+index e60d8ad85400..2ac5317f9b79 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2226,6 +2226,10 @@ struct super_operations {
projects / packages / kernel.git / commitdiff