Skip to content

GitLab

Commit 98e97cf2 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

aufs5.x-rcN 20200113 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent c7562e1d
Hide whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ 98e97cf2
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index 9d3a5c54a41d..f33398b47c42 100644
index 8982c6e013b3..476cdc18e782 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2832,6 +2832,19 @@ F: include/linux/audit.h
@@ -2877,6 +2877,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
......@@ -26,10 +26,10 @@ index 9d3a5c54a41d..f33398b47c42 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index f6f77eaa7217..5e094699215e 100644
index 739b372a5112..872e3b3a7693 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -750,6 +750,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}
......@@ -55,10 +55,10 @@ index f6f77eaa7217..5e094699215e 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
index e88cf0554e65..7ce4ccf5a51c 100644
index b280e07e162b..046000653e4d 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1264,7 +1264,7 @@ enum d_walk_ret {
@@ -1266,7 +1266,7 @@ enum d_walk_ret {
*
* The @enter() callbacks are called with d_lock held.
*/
......@@ -68,7 +68,7 @@ index e88cf0554e65..7ce4ccf5a51c 100644
{
struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 3d40771e8e7c..d62303c5472a 100644
index 9bc167562ee8..c01290dcb893 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -32,7 +32,7 @@
......@@ -90,10 +90,10 @@ index 3d40771e8e7c..d62303c5472a 100644
return error;
diff --git a/fs/inode.c b/fs/inode.c
index fef457a42882..aaeacde398ee 100644
index 96d62d97694e..31796c1040d6 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1673,7 +1673,7 @@ EXPORT_SYMBOL(generic_update_time);
@@ -1680,7 +1680,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 fef457a42882..aaeacde398ee 100644
int (*update_time)(struct inode *, struct timespec64 *, int);
diff --git a/fs/namespace.c b/fs/namespace.c
index 2adfe7b166a3..0f7e57e5f4b7 100644
index 5e1bf611a9eb..c05ac2488abb 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -776,6 +776,12 @@ static inline int check_mnt(struct mount *mnt)
......@@ -153,10 +153,10 @@ index 5bbf587f5bc1..3265bb84f152 100644
{
mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c
index 98412721f056..75b489fcb66f 100644
index 3009652a41c8..d9bcc4a71a0a 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -834,8 +834,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
@@ -849,8 +849,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
/*
* Attempt to initiate a splice from pipe to file.
*/
......@@ -167,7 +167,7 @@ index 98412721f056..75b489fcb66f 100644
{
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
loff_t *, size_t, unsigned int);
@@ -851,9 +851,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
@@ -866,9 +866,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
/*
* Attempt to initiate a splice from a file to a pipe.
*/
......@@ -194,7 +194,7 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644
if (wait)
sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e0d909d35763..3e997d7fc67f 100644
index 98e0349adb52..712037492ea5 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1349,6 +1349,7 @@ extern void fasync_free(struct fasync_struct *);
......@@ -205,7 +205,7 @@ index e0d909d35763..3e997d7fc67f 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);
@@ -1835,6 +1836,7 @@ struct file_operations {
@@ -1842,6 +1843,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);
......@@ -213,7 +213,7 @@ index e0d909d35763..3e997d7fc67f 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);
@@ -1905,6 +1907,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
@@ -1912,6 +1914,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
......@@ -226,7 +226,7 @@ index e0d909d35763..3e997d7fc67f 100644
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
@@ -2325,6 +2333,7 @@ extern int current_umask(void);
@@ -2332,6 +2340,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);
......@@ -234,7 +234,7 @@ index e0d909d35763..3e997d7fc67f 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
@@ -2613,6 +2622,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
@@ -2620,6 +2629,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false;
}
#endif
......@@ -243,7 +243,7 @@ index e0d909d35763..3e997d7fc67f 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 b8a835fd611b..f452521f2e05 100644
index c50d01ef1414..4f4677020360 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -331,6 +331,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
......@@ -255,7 +255,7 @@ index b8a835fd611b..f452521f2e05 100644
/*
* Acquire a lock.
*
@@ -473,6 +475,7 @@ struct lockdep_map { };
@@ -472,6 +474,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0)
......@@ -298,7 +298,7 @@ index 74b4911ac16d..19789fbea567 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 233459c03b5a..407c08ac8ac8 100644
index 32282e7112d3..9d1b34c71e3c 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -153,7 +153,7 @@ static
......
aufs5-kbuild.patch
View file @ 98e97cf2
......@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index 2501e6f1f965..38a6a5991da9 100644
index 7b623e9fc1b0..9070b9159188 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -264,6 +264,7 @@ source "fs/pstore/Kconfig"
......@@ -14,10 +14,10 @@ index 2501e6f1f965..38a6a5991da9 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
index 14231b4cf383..8765e191ebe0 100644
index 1148c555c4d3..ed6ff7ddc478 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -132,3 +132,4 @@ obj-$(CONFIG_CEPH_FS) += ceph/
@@ -133,3 +133,4 @@ obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/
obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_EROFS_FS) += erofs/
......
aufs5-loopback.patch
View file @ 98e97cf2
......@@ -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 5e094699215e..22b2ecb6cfe8 100644
index 872e3b3a7693..768100025129 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -625,6 +625,15 @@ static inline void loop_update_dio(struct loop_device *lo)
@@ -635,6 +635,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio);
}
......@@ -21,7 +21,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
static void loop_reread_partitions(struct loop_device *lo,
struct block_device *bdev)
{
@@ -678,6 +687,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -690,6 +699,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 5e094699215e..22b2ecb6cfe8 100644
int error;
bool partscan;
@@ -697,12 +707,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -709,12 +719,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 5e094699215e..22b2ecb6cfe8 100644
error = -EINVAL;
@@ -714,6 +731,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -726,6 +743,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 5e094699215e..22b2ecb6cfe8 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));
@@ -727,6 +745,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -739,6 +757,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
......@@ -66,7 +66,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
if (partscan)
loop_reread_partitions(lo, bdev);
return 0;
@@ -735,6 +755,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -747,6 +767,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
mutex_unlock(&loop_ctl_mutex);
if (file)
fput(file);
......@@ -75,7 +75,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
return error;
}
@@ -939,7 +961,7 @@ static void loop_update_rotational(struct loop_device *lo)
@@ -951,7 +973,7 @@ static void loop_update_rotational(struct loop_device *lo)
static int loop_set_fd(struct loop_device *lo, fmode_t mode,
struct block_device *bdev, unsigned int arg)
{
......@@ -84,7 +84,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
struct inode *inode;
struct address_space *mapping;
struct block_device *claimed_bdev = NULL;
@@ -955,6 +977,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -967,6 +989,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
file = fget(arg);
if (!file)
goto out;
......@@ -97,7 +97,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
@@ -1003,6 +1031,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -1015,6 +1043,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
lo->lo_backing_file = file;
......@@ -105,7 +105,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
lo->transfer = NULL;
lo->ioctl = NULL;
lo->lo_sizelimit = 0;
@@ -1056,6 +1085,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -1068,6 +1097,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
bd_abort_claiming(bdev, claimed_bdev, loop_set_fd);
out_putf:
fput(file);
......@@ -114,7 +114,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
@@ -1102,6 +1133,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
@@ -1114,6 +1145,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
static int __loop_clr_fd(struct loop_device *lo, bool release)
{
struct file *filp = NULL;
......@@ -122,7 +122,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
@@ -1125,6 +1157,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1137,6 +1169,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 5e094699215e..22b2ecb6cfe8 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
@@ -1207,6 +1240,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1220,6 +1253,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
......@@ -228,10 +228,10 @@ index a97e2921cb09..f74eb6962684 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 3e997d7fc67f..b28d4d0ecaed 100644
index 712037492ea5..40b828d7c275 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1973,6 +1973,10 @@ struct super_operations {
@@ -1980,6 +1980,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
......
aufs5-mmap.patch
View file @ 98e97cf2
......@@ -72,10 +72,10 @@ index 7907e6419e57..d17209cf52bc 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 a2adf95b3f9c..70e1dccc1283 100644
index 80a9162b406c..b62eb5096595 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1510,6 +1510,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -1495,6 +1495,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
......@@ -125,10 +125,10 @@ index 270aa8fd2800..33848c2165e2 100644
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
index 13b38794efb5..ede7225bae95 100644
index 2508a4f238a3..115953f242d9 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -562,7 +562,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -565,7 +565,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 13b38794efb5..ede7225bae95 100644
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
index d996846697ef..fbadb91df4e4 100644
index 1937cc251883..778c1e399903 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -42,7 +42,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
......@@ -151,10 +151,10 @@ index d996846697ef..fbadb91df4e4 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 85b7d087eb45..115275a4a0e2 100644
index bf6aa30be58d..32ca075c0c8b 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2696,7 +2696,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -2675,7 +2675,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
......@@ -164,7 +164,7 @@ index 85b7d087eb45..115275a4a0e2 100644
if (page->mapping != inode->i_mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
index a7d8c84d19b7..9c350dc3f570 100644
index 9c648524e4dc..6a019dc6d654 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -182,7 +182,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
......@@ -176,7 +176,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
mpol_put(vma_policy(vma));
vm_area_free(vma);
return next;
@@ -940,7 +940,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
@@ -915,7 +915,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 a7d8c84d19b7..9c350dc3f570 100644
}
if (next->anon_vma)
anon_vma_merge(vma, next);
@@ -1865,8 +1865,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
@@ -1843,8 +1843,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
......@@ -195,7 +195,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
@@ -2695,7 +2695,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2673,7 +2673,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
......@@ -204,7 +204,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -2714,7 +2714,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2692,7 +2692,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)
......@@ -213,7 +213,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
@@ -2906,7 +2906,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -2884,7 +2884,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;
......@@ -222,7 +222,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid);
@@ -2981,10 +2981,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -2959,10 +2959,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
}
}
......@@ -251,7 +251,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
out:
up_write(&mm->mmap_sem);
if (populate)
@@ -3274,7 +3291,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
@@ -3253,7 +3270,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)
......@@ -261,10 +261,10 @@ index a7d8c84d19b7..9c350dc3f570 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 99b7ec318824..de5b6cd162fe 100644
index bd2b4e5ef144..acdab5253263 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -552,7 +552,7 @@ static void __put_nommu_region(struct vm_region *region)
@@ -563,7 +563,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);
if (region->vm_file)
......@@ -273,7 +273,7 @@ index 99b7ec318824..de5b6cd162fe 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
@@ -690,7 +690,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
@@ -695,7 +695,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)
......@@ -282,7 +282,7 @@ index 99b7ec318824..de5b6cd162fe 100644
put_nommu_region(vma->vm_region);
vm_area_free(vma);
}
@@ -1213,7 +1213,7 @@ unsigned long do_mmap(struct file *file,
@@ -1218,7 +1218,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
......@@ -291,7 +291,7 @@ index 99b7ec318824..de5b6cd162fe 100644
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
@@ -1290,10 +1290,10 @@ unsigned long do_mmap(struct file *file,
@@ -1295,10 +1295,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem);
error:
if (region->vm_file)
......
aufs5-standalone.patch
View file @ 98e97cf2
......@@ -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 7ce4ccf5a51c..00d7e6a08026 100644
index 046000653e4d..15aa871d1b45 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1369,6 +1369,7 @@ void d_walk(struct dentry *parent, void *data,
@@ -1371,6 +1371,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
......@@ -13,7 +13,7 @@ index 7ce4ccf5a51c..00d7e6a08026 100644
struct check_mount {
struct vfsmount *mnt;
@@ -2914,6 +2915,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
@@ -2916,6 +2917,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock);
}
......@@ -22,10 +22,10 @@ index 7ce4ccf5a51c..00d7e6a08026 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
index 555e93c7dec8..dad39c6b3878 100644
index 74d88dab98dd..71eb4fcace94 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -110,6 +110,7 @@ bool path_noexec(const struct path *path)
@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
}
......@@ -34,7 +34,7 @@ index 555e93c7dec8..dad39c6b3878 100644
#ifdef CONFIG_USELIB
/*
diff --git a/fs/fcntl.c b/fs/fcntl.c
index d62303c5472a..d4ad34463848 100644
index c01290dcb893..113ccee10a97 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
......@@ -66,10 +66,10 @@ index 30d55c9a1744..34b9bbf4c556 100644
void __init files_init(void)
{
diff --git a/fs/inode.c b/fs/inode.c
index aaeacde398ee..5be87f2d3828 100644
index 31796c1040d6..217169541ac4 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1682,6 +1682,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
@@ -1689,6 +1689,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
return update_time(inode, time, flags);
}
......@@ -78,7 +78,7 @@ index aaeacde398ee..5be87f2d3828 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index 0f7e57e5f4b7..516c2f397d33 100644
index c05ac2488abb..100b7839c8b0 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
......@@ -166,10 +166,10 @@ index 3265bb84f152..5b2dbddb0efe 100644
/* 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 75b489fcb66f..0a1f7498c22b 100644
index d9bcc4a71a0a..bf8725e99070 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -847,6 +847,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
@@ -862,6 +862,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
return splice_write(pipe, out, ppos, len, flags);
}
......@@ -177,7 +177,7 @@ index 75b489fcb66f..0a1f7498c22b 100644
/*
* Attempt to initiate a splice from a file to a pipe.
@@ -876,6 +877,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
@@ -891,6 +892,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return splice_read(in, ppos, pipe, len, flags);
}
......@@ -210,7 +210,7 @@ index 90dd78f0eb27..40b01dd1b14a 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 407c08ac8ac8..d7f71842f8a2 100644
index 9d1b34c71e3c..bfa1670007fe 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -174,6 +174,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
......@@ -230,17 +230,8 @@ index 0fef395662a6..83fb1ecfc33d 100644
}
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 725674f3276d..83f6494c52a2 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -824,3 +824,4 @@ int __devcgroup_check_permission(short type, u32 major, u32 minor,
return 0;
}
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c
index 1bc000f834e2..306f2c9f7ee2 100644
index cd2d18d2d279..fbf716450399 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1036,6 +1036,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
......
include/uapi/linux/aufs_type.h
View file @ 98e97cf2
......@@ -40,7 +40,7 @@
#include <linux/limits.h>
#define AUFS_VERSION "5.x-rcN-20191223"
#define AUFS_VERSION "5.x-rcN-20200113"
/* 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
View file @ 98e97cf2
......@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN lockdep patch
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index f452521f2e05..8043dba1cceb 100644
index 4f4677020360..1aef2c1047a3 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -17,7 +17,7 @@ struct lockdep_map;
......@@ -15,10 +15,10 @@ index f452521f2e05..8043dba1cceb 100644
#include <linux/types.h>
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index d7f71842f8a2..f1a630b92260 100644
index bfa1670007fe..736d3350b173 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4767,6 +4773,7 @@ void lockdep_reset(void)
@@ -4764,6 +4770,7 @@ void lockdep_reset(void)
INIT_HLIST_HEAD(chainhash_table + i);
raw_local_irq_restore(flags);
}
......
proc_mounts.patch
View file @ 98e97cf2
......@@ -15,7 +15,7 @@ index 711a4093e475..a5703d5c7205 100644
extern const struct seq_operations mounts_op;
diff --git a/fs/namespace.c b/fs/namespace.c
index 2adfe7b166a3..eb4f14c2dd0e 100644
index 5e1bf611a9eb..a4cc7a494f32 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1246,46 +1246,80 @@ struct vfsmount *mnt_clone_internal(const struct path *path)
......
tmpfs-idr.patch
View file @ 98e97cf2
......@@ -20,7 +20,7 @@ index de8e4b71e3ba..ae8c9fcaea91 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 220be9fa2c41..56b50b2b3639 100644
index 165fa6332993..bdfe59273826 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -110,7 +110,7 @@ struct shmem_falloc {
......@@ -61,7 +61,7 @@ index 220be9fa2c41..56b50b2b3639 100644
shmem_free_inode(inode->i_sb);
clear_inode(inode);
}
@@ -2236,13 +2244,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
@@ -2241,13 +2249,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
struct inode *inode;
struct shmem_inode_info *info;
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
......@@ -76,7 +76,7 @@ index 220be9fa2c41..56b50b2b3639 100644
inode_init_owner(inode, dir, mode);
inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
@@ -2286,6 +2294,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
@@ -2291,6 +2299,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
break;
}
......@@ -102,7 +102,7 @@ index 220be9fa2c41..56b50b2b3639 100644
lockdep_annotate_inode_mutex_key(inode);
} else
shmem_free_inode(sb);
@@ -3291,8 +3318,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
@@ -3296,8 +3323,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
static int shmem_match(struct inode *ino, void *vfh)
{
__u32 *fh = vfh;
......@@ -112,7 +112,7 @@ index 220be9fa2c41..56b50b2b3639 100644
return ino->i_ino == inum && fh[0] == ino->i_generation;
}
@@ -3312,14 +3338,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3317,14 +3343,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL;
u64 inum;
......@@ -130,7 +130,7 @@ index 220be9fa2c41..56b50b2b3639 100644
if (inode) {
dentry = shmem_find_alias(inode);
iput(inode);
@@ -3331,30 +3354,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3336,30 +3359,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)
{
......@@ -164,7 +164,7 @@ index 220be9fa2c41..56b50b2b3639 100644
return 1;
}
@@ -3435,7 +3443,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
@@ -3440,7 +3448,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);
......@@ -173,7 +173,7 @@ index 220be9fa2c41..56b50b2b3639 100644
goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES;
break;
@@ -3533,7 +3541,7 @@ static int shmem_reconfigure(struct fs_context *fc)
@@ -3538,7 +3546,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);
......@@ -182,7 +182,7 @@ index 220be9fa2c41..56b50b2b3639 100644
const char *err;
spin_lock(&sbinfo->stat_lock);
@@ -3592,7 +3600,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
@@ -3597,7 +3605,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())
......@@ -191,7 +191,7 @@ index 220be9fa2c41..56b50b2b3639 100644
if (sbinfo->mode != (0777 | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -3616,6 +3624,8 @@ static void shmem_put_super(struct super_block *sb)
@@ -3621,6 +3629,8 @@ static void shmem_put_super(struct super_block *sb)
{
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
......@@ -200,7 +200,7 @@ index 220be9fa2c41..56b50b2b3639 100644
percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol);
kfree(sbinfo);
@@ -3656,6 +3666,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
@@ -3661,6 +3671,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
#else
sb->s_flags |= SB_NOUSER;
#endif
......@@ -209,7 +209,7 @@ index 220be9fa2c41..56b50b2b3639 100644
sbinfo->max_blocks = ctx->blocks;
sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes;
sbinfo->uid = ctx->uid;
@@ -3767,6 +3779,15 @@ static void shmem_destroy_inodecache(void)
@@ -3772,6 +3784,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep);
}
......@@ -225,7 +225,7 @@ index 220be9fa2c41..56b50b2b3639 100644
static const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage,
.set_page_dirty = __set_page_dirty_no_writeback,
@@ -3907,6 +3928,7 @@ int __init shmem_init(void)
@@ -3912,6 +3933,7 @@ int __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n");
goto out1;
}
......
vfs-ino.patch
View file @ 98e97cf2
SPDX-License-Identifier: GPL-2.0
diff --git a/fs/inode.c b/fs/inode.c
index fef457a42882..466c685248c2 100644
index 96d62d97694e..9f873b4380a4 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -885,6 +885,8 @@ unsigned int get_next_ino(void)
@@ -892,6 +892,8 @@ unsigned int get_next_ino(void)
unsigned int *p = &get_cpu_var(last_ino);
unsigned int res = *p;
......@@ -12,7 +12,7 @@ index fef457a42882..466c685248c2 100644
#ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
static atomic_t shared_last_ino;
@@ -897,7 +899,7 @@ unsigned int get_next_ino(void)
@@ -904,7 +906,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