Skip to content

GitLab

"vscode:/vscode.git/clone" did not exist on "dddb04eb47a11261f6cdc6292f66fe9f369063b1"
Commit 84a85227 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

5.x-rcN 20210517 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent a87c4ef0
Hide whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ 84a85227
......@@ -2,12 +2,12 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index 9450e052f1b13..f7db6edba5a37 100644
index bd7aff0c120f2..7c4bc08596e0b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2992,6 +2992,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
@@ -3040,6 +3040,19 @@ F: include/uapi/linux/audit.h
F: kernel/audit*
F: lib/*audit.c
+AUFS (advanced multi layered unification filesystem) FILESYSTEM
+M: "J. R. Okajima" <hooanon05g@gmail.com>
......@@ -26,10 +26,10 @@ index 9450e052f1b13..f7db6edba5a37 100644
M: Miguel Ojeda <ojeda@kernel.org>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index a370cde3ddd49..01ca256575fb2 100644
index d58d68f3c7cd0..794a8a1341989 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -761,6 +761,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -762,6 +762,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}
......@@ -55,10 +55,10 @@ index a370cde3ddd49..01ca256575fb2 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
index 7d24ff7eb2068..3caa7ab4b84f1 100644
index cf871a81f4fdc..bc5095b734f58 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1318,7 +1318,7 @@ enum d_walk_ret {
@@ -1320,7 +1320,7 @@ enum d_walk_ret {
*
* The @enter() callbacks are called with d_lock held.
*/
......@@ -90,10 +90,10 @@ index dfc72f15be7fc..d8a12eb63961d 100644
return error;
diff --git a/fs/inode.c b/fs/inode.c
index a047ab306f9a8..ba1df0895b69f 100644
index c93500d84264d..f24d21236ad01 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1772,7 +1772,7 @@ EXPORT_SYMBOL(generic_update_time);
@@ -1778,7 +1778,7 @@ EXPORT_SYMBOL(generic_update_time);
* This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this.
*/
......@@ -103,7 +103,7 @@ index a047ab306f9a8..ba1df0895b69f 100644
if (inode->i_op->update_time)
return inode->i_op->update_time(inode, time, flags);
diff --git a/fs/namespace.c b/fs/namespace.c
index 56bb5a5fdc0d0..540679d7e0434 100644
index f63337828e1c4..099e89c81af7c 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -807,6 +807,12 @@ static inline int check_mnt(struct mount *mnt)
......@@ -161,10 +161,10 @@ index 1373a610dc784..b7b5a0a0df6ff 100644
if (wait)
sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index ec8f3ddf4a6aa..4fa4b24535fde 100644
index c3c88fdb9b2a5..93eb43e002d97 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1332,6 +1332,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -1335,6 +1335,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int);
......@@ -172,7 +172,7 @@ index ec8f3ddf4a6aa..4fa4b24535fde 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp);
@@ -1909,6 +1910,7 @@ struct file_operations {
@@ -2043,6 +2044,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
......@@ -180,7 +180,7 @@ index ec8f3ddf4a6aa..4fa4b24535fde 100644
int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -2428,6 +2430,7 @@ extern int current_umask(void);
@@ -2565,6 +2567,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode);
extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int);
......@@ -188,7 +188,7 @@ index ec8f3ddf4a6aa..4fa4b24535fde 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
@@ -2668,6 +2671,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
@@ -2805,6 +2808,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
}
void emergency_thaw_all(void);
......@@ -197,7 +197,7 @@ index ec8f3ddf4a6aa..4fa4b24535fde 100644
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 7b7ebf2e28ec5..20c46305e057e 100644
index 5cf3878137549..59b65e1a9e85c 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,
......@@ -245,10 +245,10 @@ index a55179fd60fc3..8e21c53cf8831 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index f160f1c97ca1e..fe71c2737eb9e 100644
index 48d736aa03b24..dce278159546c 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -188,7 +188,7 @@ static
@@ -189,7 +189,7 @@ static
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
......@@ -257,7 +257,7 @@ index f160f1c97ca1e..fe71c2737eb9e 100644
{
unsigned int class_idx = hlock->class_idx;
@@ -209,6 +209,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
@@ -210,6 +210,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
......
aufs5-kbuild.patch
View file @ 84a85227
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index a55bda4233bbe..c4984b5bf340f 100644
index 141a856c50e71..6741d695b1df8 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -288,6 +288,7 @@ source "fs/sysv/Kconfig"
@@ -292,6 +292,7 @@ source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/erofs/Kconfig"
source "fs/vboxsf/Kconfig"
......@@ -14,10 +14,10 @@ index a55bda4233bbe..c4984b5bf340f 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
index 3215fe205256d..7218277473b8f 100644
index 9c708e1fbe8fb..fde6be84a0830 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -135,3 +135,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
@@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_EROFS_FS) += erofs/
obj-$(CONFIG_VBOXSF_FS) += vboxsf/
obj-$(CONFIG_ZONEFS_FS) += zonefs/
......
aufs5-loopback.patch
View file @ 84a85227
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 01ca256575fb2..f5a76bacf6c85 100644
index 794a8a1341989..0e5664a6753e5 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -646,6 +646,15 @@ static inline void loop_update_dio(struct loop_device *lo)
@@ -647,6 +647,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio);
}
......@@ -21,7 +21,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
static void loop_reread_partitions(struct loop_device *lo,
struct block_device *bdev)
{
@@ -701,6 +710,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -702,6 +711,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
unsigned int arg)
{
struct file *file = NULL, *old_file;
......@@ -29,7 +29,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
int error;
bool partscan;
@@ -720,12 +730,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -721,12 +731,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
file = fget(arg);
if (!file)
goto out_err;
......@@ -49,7 +49,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
error = -EINVAL;
@@ -737,6 +754,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -738,6 +755,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;
......@@ -57,7 +57,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
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));
@@ -750,6 +768,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -751,6 +769,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
......@@ -66,7 +66,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
if (partscan)
loop_reread_partitions(lo, bdev);
return 0;
@@ -758,6 +778,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -759,6 +779,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
mutex_unlock(&lo->lo_mutex);
if (file)
fput(file);
......@@ -75,7 +75,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
return error;
}
@@ -1084,7 +1106,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1085,7 +1107,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
struct block_device *bdev,
const struct loop_config *config)
{
......@@ -84,7 +84,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
struct inode *inode;
struct address_space *mapping;
int error;
@@ -1099,6 +1121,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1100,6 +1122,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
file = fget(config->fd);
if (!file)
goto out;
......@@ -97,7 +97,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
@@ -1153,6 +1181,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1154,6 +1182,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;
......@@ -105,7 +105,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
lo->old_gfp_mask = mapping_gfp_mask(mapping);
mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
@@ -1203,6 +1232,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1204,6 +1233,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
bd_abort_claiming(bdev, loop_configure);
out_putf:
fput(file);
......@@ -114,7 +114,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
@@ -1212,6 +1243,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1213,6 +1244,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;
......@@ -122,7 +122,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
@@ -1238,6 +1270,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1239,6 +1271,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock);
lo->lo_backing_file = NULL;
......@@ -130,7 +130,7 @@ index 01ca256575fb2..f5a76bacf6c85 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
@@ -1319,6 +1352,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1320,6 +1353,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
......@@ -228,10 +228,10 @@ index d252963a87b53..ecfc5fc96ad8c 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4fa4b24535fde..2aec4bc9f5aa1 100644
index 93eb43e002d97..8b392f6b36a62 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2041,6 +2041,10 @@ struct super_operations {
@@ -2178,6 +2178,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
......
aufs5-mmap.patch
View file @ 84a85227
......@@ -31,7 +31,7 @@ index 13452b32e2bd5..38acccfef9d49 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index e862cab695838..5c45041943a6f 100644
index fc9784544b241..84ba06f5158e9 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)
......@@ -46,7 +46,7 @@ index e862cab695838..5c45041943a6f 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1861,7 +1864,7 @@ static int show_numa_map(struct seq_file *m, void *v)
@@ -1864,7 +1867,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;
......@@ -72,10 +72,10 @@ index a6d21fc0033c6..02c2de31196e0 100644
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 8ba434287387b..6d23d40ad1523 100644
index 322ec61d0da79..ae6f0584e4c98 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1759,6 +1759,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -1798,6 +1798,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
......@@ -125,10 +125,10 @@ index 6613b26a88946..e94df45b5483a 100644
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
index 426cd0c51f9eb..ea0ae494c6dde 100644
index dc06afd725cbd..66f1486e63e35 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -555,7 +555,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -559,7 +559,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping;
......@@ -138,7 +138,7 @@ index 426cd0c51f9eb..ea0ae494c6dde 100644
put_write_access(inode);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
index 72227b24a6168..5d03943b08e03 100644
index bf71e295e9f69..bd223b81c564c 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
......@@ -151,10 +151,10 @@ index 72227b24a6168..5d03943b08e03 100644
# Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c
index 6ce832dc59e73..8b7a71b6f0e6c 100644
index 66f7e9fdfbc4f..f9a8ff48e697a 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3162,7 +3162,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -3240,7 +3240,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);
......@@ -164,10 +164,10 @@ index 6ce832dc59e73..8b7a71b6f0e6c 100644
if (page->mapping != mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
index 3f287599a7a30..eb36f1b18f048 100644
index 0584e540246e1..8b2f082002a9c 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -185,7 +185,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
......@@ -176,7 +176,7 @@ index 3f287599a7a30..eb36f1b18f048 100644
mpol_put(vma_policy(vma));
vm_area_free(vma);
return next;
@@ -949,7 +949,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
@@ -955,7 +955,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
if (remove_next) {
if (file) {
uprobe_munmap(next, next->vm_start, next->vm_end);
......@@ -185,7 +185,7 @@ index 3f287599a7a30..eb36f1b18f048 100644
}
if (next->anon_vma)
anon_vma_merge(vma, next);
@@ -1895,7 +1895,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
@@ -1901,7 +1901,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
......@@ -194,7 +194,7 @@ index 3f287599a7a30..eb36f1b18f048 100644
vma->vm_file = NULL;
/* Undo any partial mapping done by a device driver. */
@@ -2755,7 +2755,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2761,7 +2761,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
......@@ -203,7 +203,7 @@ index 3f287599a7a30..eb36f1b18f048 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -2774,7 +2774,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2780,7 +2780,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)
......@@ -212,7 +212,7 @@ index 3f287599a7a30..eb36f1b18f048 100644
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
@@ -2967,7 +2967,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -2973,7 +2973,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma;
unsigned long populate = 0;
unsigned long ret = -EINVAL;
......@@ -221,9 +221,9 @@ index 3f287599a7a30..eb36f1b18f048 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid);
@@ -3042,10 +3042,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
}
}
@@ -3032,10 +3032,27 @@ 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);
+ vma_get_file(vma);
......@@ -250,7 +250,7 @@ index 3f287599a7a30..eb36f1b18f048 100644
out:
mmap_write_unlock(mm);
if (populate)
@@ -3332,7 +3349,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
@@ -3322,7 +3339,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)
......@@ -260,10 +260,10 @@ index 3f287599a7a30..eb36f1b18f048 100644
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 5c9ab799c0e63..dd78905704c12 100644
index 85a3a68dffb68..a2bee44172ccc 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -533,7 +533,7 @@ static void __put_nommu_region(struct vm_region *region)
@@ -523,7 +523,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);
if (region->vm_file)
......@@ -272,7 +272,7 @@ index 5c9ab799c0e63..dd78905704c12 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
@@ -665,7 +665,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
@@ -655,7 +655,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
......@@ -281,7 +281,7 @@ index 5c9ab799c0e63..dd78905704c12 100644
put_nommu_region(vma->vm_region);
vm_area_free(vma);
}
@@ -1188,7 +1188,7 @@ unsigned long do_mmap(struct file *file,
@@ -1178,7 +1178,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
......@@ -290,7 +290,7 @@ index 5c9ab799c0e63..dd78905704c12 100644
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
@@ -1265,10 +1265,10 @@ unsigned long do_mmap(struct file *file,
@@ -1255,10 +1255,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem);
error:
if (region->vm_file)
......
aufs5-standalone.patch
View file @ 84a85227
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
index 3caa7ab4b84f1..00e97c9ae7c45 100644
index bc5095b734f58..9508bd57a3bc0 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1423,6 +1423,7 @@ void d_walk(struct dentry *parent, void *data,
@@ -1425,6 +1425,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
......@@ -13,7 +13,7 @@ index 3caa7ab4b84f1..00e97c9ae7c45 100644
struct check_mount {
struct vfsmount *mnt;
@@ -2968,6 +2969,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
@@ -2970,6 +2971,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock);
}
......@@ -66,10 +66,10 @@ index 45437f8e1003e..786af52904fcf 100644
void __init files_init(void)
{
diff --git a/fs/inode.c b/fs/inode.c
index ba1df0895b69f..0672530acf7dd 100644
index f24d21236ad01..78de5b5dc0840 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1778,6 +1778,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
@@ -1784,6 +1784,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
return inode->i_op->update_time(inode, time, flags);
return generic_update_time(inode, time, flags);
}
......@@ -78,7 +78,7 @@ index ba1df0895b69f..0672530acf7dd 100644
/**
* atime_needs_update - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index 540679d7e0434..74957d5edaa86 100644
index 099e89c81af7c..3e46b53795b1e 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -438,6 +438,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
......@@ -97,7 +97,7 @@ index 540679d7e0434..74957d5edaa86 100644
/*
* vfsmount lock must be held for write
@@ -1985,6 +1987,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
@@ -1987,6 +1989,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
......@@ -106,7 +106,7 @@ index 540679d7e0434..74957d5edaa86 100644
static void lock_mnt_tree(struct mount *mnt)
{
diff --git a/fs/notify/group.c b/fs/notify/group.c
index ffd723ffe46de..ec6172836b6f6 100644
index fb89c351295d6..460ad19c2570a 100644
--- a/fs/notify/group.c
+++ b/fs/notify/group.c
@@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
......@@ -182,10 +182,10 @@ index b7b5a0a0df6ff..fa5c7fba7f1ba 100644
/*
* Write out and wait upon all dirty data associated with this
diff --git a/fs/xattr.c b/fs/xattr.c
index b3444e06cded4..7b0f851b63d75 100644
index 5c8c5175b385c..ff7e9ff774b73 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -383,6 +383,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
@@ -384,6 +384,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
*xattr_value = value;
return error;
}
......@@ -194,10 +194,10 @@ index b3444e06cded4..7b0f851b63d75 100644
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 fe71c2737eb9e..185531f89239a 100644
index dce278159546c..5b0c571dbca2f 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -209,6 +209,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -210,6 +210,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
......@@ -206,19 +206,19 @@ index fe71c2737eb9e..185531f89239a 100644
#ifdef CONFIG_LOCK_STAT
diff --git a/kernel/task_work.c b/kernel/task_work.c
index 9cde961875c0a..ac8c79dc81813 100644
index 1698fbe6f0e13..081b05acadf82 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
@@ -143,3 +143,4 @@ void task_work_run(void)
@@ -167,3 +167,4 @@ void task_work_run(void)
} while (work);
}
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c
index 5ac96b16f8fab..46d334d6ac1f6 100644
index b38155b2de83f..386c2741886ce 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1102,6 +1102,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
@@ -1146,6 +1146,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
}
......@@ -226,7 +226,7 @@ index 5ac96b16f8fab..46d334d6ac1f6 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry)
{
@@ -1118,6 +1119,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
@@ -1162,6 +1163,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);
}
......@@ -234,7 +234,7 @@ index 5ac96b16f8fab..46d334d6ac1f6 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
@@ -1126,6 +1128,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
@@ -1170,6 +1172,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);
}
......@@ -242,7 +242,7 @@ index 5ac96b16f8fab..46d334d6ac1f6 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
@@ -1153,6 +1156,7 @@ int security_path_truncate(const struct path *path)
@@ -1197,6 +1200,7 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
......@@ -250,7 +250,7 @@ index 5ac96b16f8fab..46d334d6ac1f6 100644
int security_path_chmod(const struct path *path, umode_t mode)
{
@@ -1160,6 +1164,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
@@ -1204,6 +1208,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
......@@ -258,7 +258,7 @@ index 5ac96b16f8fab..46d334d6ac1f6 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
@@ -1167,6 +1172,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
@@ -1211,6 +1216,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);
}
......@@ -266,7 +266,7 @@ index 5ac96b16f8fab..46d334d6ac1f6 100644
int security_path_chroot(const struct path *path)
{
@@ -1267,6 +1273,7 @@ int security_inode_permission(struct inode *inode, int mask)
@@ -1311,6 +1317,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return call_int_hook(inode_permission, 0, inode, mask);
}
......@@ -274,7 +274,7 @@ index 5ac96b16f8fab..46d334d6ac1f6 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
@@ -1464,6 +1471,7 @@ int security_file_permission(struct file *file, int mask)
@@ -1508,6 +1515,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
......
include/uapi/linux/aufs_type.h
View file @ 84a85227
......@@ -40,7 +40,7 @@
#include <limits.h>
#endif /* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN-20210503"
#define AUFS_VERSION "5.x-rcN-20210517"
/* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
lockdep-debug.patch deleted 100644 → 0
View file @ a87c4ef0
SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN lockdep patch
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 20c46305e057e..17362f35d3845 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 185531f89239a..7432e0c97366e 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index de49f9e1c11ba..df5b79a3122b9 100644
--- a/kernel/locking/lockdep_internals.h
+++ b/kernel/locking/lockdep_internals.h
@@ -99,15 +99,15 @@ static const unsigned long LOCKF_USED_IN_IRQ_READ =
#define MAX_STACK_TRACE_ENTRIES 262144UL
#define STACK_TRACE_HASH_SIZE 8192
#else
-#define MAX_LOCKDEP_ENTRIES 32768UL
+#define MAX_LOCKDEP_ENTRIES (32768UL << 5)
-#define MAX_LOCKDEP_CHAINS_BITS 16
+#define MAX_LOCKDEP_CHAINS_BITS (16 + 5)
/*
* Stack-trace: tightly packed array of stack backtrace
* addresses. Protected by the hash_lock.
*/
-#define MAX_STACK_TRACE_ENTRIES 524288UL
+#define MAX_STACK_TRACE_ENTRIES (524288UL << 5)
#define STACK_TRACE_HASH_SIZE 16384
#endif
tmpfs-idr.patch
View file @ 84a85227
......@@ -21,7 +21,7 @@ index d82b6f396588..ff9c7acfedc8 100644
umode_t mode; /* Mount mode for root directory */
unsigned char huge; /* Whether to try for hugepages */
diff --git a/mm/shmem.c b/mm/shmem.c
index b2db4ed0fbc7..031a61e0920f 100644
index a08cedefbfaa..24c068fd3af2 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -109,7 +109,7 @@ struct shmem_falloc {
......@@ -88,7 +88,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
lockdep_annotate_inode_mutex_key(inode);
} else
shmem_free_inode(sb);
@@ -3280,8 +3307,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
@@ -3283,8 +3310,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
static int shmem_match(struct inode *ino, void *vfh)
{
__u32 *fh = vfh;
......@@ -98,7 +98,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
return ino->i_ino == inum && fh[0] == ino->i_generation;
}
@@ -3301,14 +3327,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3304,14 +3330,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL;
u64 inum;
......@@ -116,7 +116,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
if (inode) {
dentry = shmem_find_alias(inode);
iput(inode);
@@ -3320,30 +3343,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3323,30 +3346,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len,
struct inode *parent)
{
......@@ -150,7 +150,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
return 1;
}
@@ -3422,7 +3430,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
@@ -3425,7 +3433,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
break;
case Opt_nr_inodes:
ctx->inodes = memparse(param->string, &rest);
......@@ -159,7 +159,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES;
break;
@@ -3532,7 +3540,7 @@ static int shmem_reconfigure(struct fs_context *fc)
@@ -3535,7 +3543,7 @@ static int shmem_reconfigure(struct fs_context *fc)
{
struct shmem_options *ctx = fc->fs_private;
struct shmem_sb_info *sbinfo = SHMEM_SB(fc->root->d_sb);
......@@ -168,7 +168,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
const char *err;
spin_lock(&sbinfo->stat_lock);
@@ -3599,7 +3607,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
@@ -3602,7 +3610,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
seq_printf(seq, ",size=%luk",
sbinfo->max_blocks << (PAGE_SHIFT - 10));
if (sbinfo->max_inodes != shmem_default_max_inodes())
......@@ -177,7 +177,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
if (sbinfo->mode != (0777 | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -3646,6 +3654,8 @@ static void shmem_put_super(struct super_block *sb)
@@ -3649,6 +3657,8 @@ static void shmem_put_super(struct super_block *sb)
{
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
......@@ -186,7 +186,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
free_percpu(sbinfo->ino_batch);
percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol);
@@ -3689,6 +3699,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
@@ -3692,6 +3702,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
#else
sb->s_flags |= SB_NOUSER;
#endif
......@@ -195,7 +195,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
sbinfo->max_blocks = ctx->blocks;
sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes;
if (sb->s_flags & SB_KERNMOUNT) {
@@ -3806,6 +3818,15 @@ static void shmem_destroy_inodecache(void)
@@ -3809,6 +3821,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep);
}
......@@ -211,7 +211,7 @@ index b2db4ed0fbc7..031a61e0920f 100644
const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage,
.set_page_dirty = __set_page_dirty_no_writeback,
@@ -3947,6 +3968,7 @@ int __init shmem_init(void)
@@ -3950,6 +3971,7 @@ int __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n");
goto out1;
}
......
vfs-ino.patch
View file @ 84a85227
SPDX-License-Identifier: GPL-2.0
diff --git a/fs/inode.c b/fs/inode.c
index a047ab306f9a..416de919417e 100644
index c93500d84264..df8585cf08b6 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -894,6 +894,8 @@ unsigned int get_next_ino(void)
@@ -900,6 +900,8 @@ unsigned int get_next_ino(void)
unsigned int *p = &get_cpu_var(last_ino);
unsigned int res = *p;
......@@ -13,7 +13,7 @@ index a047ab306f9a..416de919417e 100644
#ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
static atomic_t shared_last_ino;
@@ -906,7 +908,7 @@ unsigned int get_next_ino(void)
@@ -912,7 +914,7 @@ unsigned int get_next_ino(void)
res++;
/* get_next_ino should not provide a 0 inode number */
if (unlikely(!res))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment