Skip to content

GitLab

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

5.1 20200622 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 9256990c
Show whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ d051ff35
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.1 base patch aufs5.1 base patch
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index 2c2fce72e694..f5be2663b01e 100644 index 2c2fce72e694f..f5be2663b01ee 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2699,6 +2699,19 @@ F: include/linux/audit.h @@ -2699,6 +2699,19 @@ F: include/linux/audit.h
...@@ -26,7 +26,7 @@ index 2c2fce72e694..f5be2663b01e 100644 ...@@ -26,7 +26,7 @@ index 2c2fce72e694..f5be2663b01e 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com> M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index bf1c61cab8eb..7e18c8c72dcc 100644 index bf1c61cab8eb1..7e18c8c72dccb 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/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, @@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
...@@ -55,7 +55,7 @@ index bf1c61cab8eb..7e18c8c72dcc 100644 ...@@ -55,7 +55,7 @@ index bf1c61cab8eb..7e18c8c72dcc 100644
static ssize_t loop_attr_show(struct device *dev, char *page, static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index aac41adf4743..fc18967c2522 100644 index aac41adf47433..fc18967c25227 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -1247,7 +1247,7 @@ enum d_walk_ret { @@ -1247,7 +1247,7 @@ enum d_walk_ret {
...@@ -68,7 +68,7 @@ index aac41adf4743..fc18967c2522 100644 ...@@ -68,7 +68,7 @@ index aac41adf4743..fc18967c2522 100644
{ {
struct dentry *this_parent; struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index 083185174c6d..7828d53148a7 100644 index 083185174c6d1..7828d53148a79 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
...@@ -90,7 +90,7 @@ index 083185174c6d..7828d53148a7 100644 ...@@ -90,7 +90,7 @@ index 083185174c6d..7828d53148a7 100644
return error; return error;
diff --git a/fs/inode.c b/fs/inode.c diff --git a/fs/inode.c b/fs/inode.c
index 9a453f3637f8..ee4434cea572 100644 index 9a453f3637f85..ee4434cea572e 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -1657,7 +1657,7 @@ EXPORT_SYMBOL(generic_update_time); @@ -1657,7 +1657,7 @@ EXPORT_SYMBOL(generic_update_time);
...@@ -103,7 +103,7 @@ index 9a453f3637f8..ee4434cea572 100644 ...@@ -103,7 +103,7 @@ index 9a453f3637f8..ee4434cea572 100644
int (*update_time)(struct inode *, struct timespec64 *, int); int (*update_time)(struct inode *, struct timespec64 *, int);
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index c9cab307fa77..e56de0b2bee0 100644 index c9cab307fa77d..e56de0b2bee05 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -769,6 +769,12 @@ static inline int check_mnt(struct mount *mnt) @@ -769,6 +769,12 @@ static inline int check_mnt(struct mount *mnt)
...@@ -120,7 +120,7 @@ index c9cab307fa77..e56de0b2bee0 100644 ...@@ -120,7 +120,7 @@ index c9cab307fa77..e56de0b2bee0 100644
* vfsmount lock must be held for write * vfsmount lock must be held for write
*/ */
diff --git a/fs/read_write.c b/fs/read_write.c diff --git a/fs/read_write.c b/fs/read_write.c
index 61b43ad7608e..e1e66b631a1a 100644 index 61b43ad7608e3..e1e66b631a1a1 100644
--- a/fs/read_write.c --- a/fs/read_write.c
+++ b/fs/read_write.c +++ b/fs/read_write.c
@@ -489,6 +489,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p, @@ -489,6 +489,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
...@@ -153,7 +153,7 @@ index 61b43ad7608e..e1e66b631a1a 100644 ...@@ -153,7 +153,7 @@ index 61b43ad7608e..e1e66b631a1a 100644
{ {
mm_segment_t old_fs; mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c diff --git a/fs/splice.c b/fs/splice.c
index 25212dcca2df..9629564ee8f2 100644 index 25212dcca2dfd..9629564ee8f2f 100644
--- a/fs/splice.c --- a/fs/splice.c
+++ b/fs/splice.c +++ b/fs/splice.c
@@ -833,8 +833,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); @@ -833,8 +833,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
...@@ -181,7 +181,7 @@ index 25212dcca2df..9629564ee8f2 100644 ...@@ -181,7 +181,7 @@ index 25212dcca2df..9629564ee8f2 100644
ssize_t (*splice_read)(struct file *, loff_t *, ssize_t (*splice_read)(struct file *, loff_t *,
struct pipe_inode_info *, size_t, unsigned int); struct pipe_inode_info *, size_t, unsigned int);
diff --git a/fs/sync.c b/fs/sync.c diff --git a/fs/sync.c b/fs/sync.c
index b54e0541ad89..28607828e96f 100644 index b54e0541ad899..28607828e96f2 100644
--- a/fs/sync.c --- a/fs/sync.c
+++ b/fs/sync.c +++ b/fs/sync.c
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
...@@ -194,7 +194,7 @@ index b54e0541ad89..28607828e96f 100644 ...@@ -194,7 +194,7 @@ index b54e0541ad89..28607828e96f 100644
if (wait) if (wait)
sync_inodes_sb(sb); sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index dd28e7679089..4e81cae7cdac 100644 index dd28e76790891..4e81cae7cdac8 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1327,6 +1327,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1327,6 +1327,7 @@ extern void fasync_free(struct fasync_struct *);
...@@ -243,7 +243,7 @@ index dd28e7679089..4e81cae7cdac 100644 ...@@ -243,7 +243,7 @@ index dd28e7679089..4e81cae7cdac 100644
extern const struct file_operations def_blk_fops; extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops; extern const struct file_operations def_chr_fops;
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 79c3873d58ac..470795d9f4a2 100644 index 79c3873d58acc..470795d9f4a28 100644
--- a/include/linux/lockdep.h --- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h +++ b/include/linux/lockdep.h
@@ -320,6 +320,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, @@ -320,6 +320,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
...@@ -264,7 +264,7 @@ index 79c3873d58ac..470795d9f4a2 100644 ...@@ -264,7 +264,7 @@ index 79c3873d58ac..470795d9f4a2 100644
#define lockdep_assert_held(l) do { (void)(l); } while (0) #define lockdep_assert_held(l) do { (void)(l); } while (0)
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
index 35942084cd40..24f5fd1a789d 100644 index 35942084cd40d..24f5fd1a789de 100644
--- a/include/linux/mnt_namespace.h --- a/include/linux/mnt_namespace.h
+++ b/include/linux/mnt_namespace.h +++ b/include/linux/mnt_namespace.h
@@ -6,11 +6,14 @@ @@ -6,11 +6,14 @@
...@@ -283,7 +283,7 @@ index 35942084cd40..24f5fd1a789d 100644 ...@@ -283,7 +283,7 @@ index 35942084cd40..24f5fd1a789d 100644
extern const struct file_operations proc_mountinfo_operations; extern const struct file_operations proc_mountinfo_operations;
extern const struct file_operations proc_mountstats_operations; extern const struct file_operations proc_mountstats_operations;
diff --git a/include/linux/splice.h b/include/linux/splice.h diff --git a/include/linux/splice.h b/include/linux/splice.h
index 74b4911ac16d..19789fbea567 100644 index 74b4911ac16dd..19789fbea5675 100644
--- a/include/linux/splice.h --- a/include/linux/splice.h
+++ b/include/linux/splice.h +++ b/include/linux/splice.h
@@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); @@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
...@@ -298,7 +298,7 @@ index 74b4911ac16d..19789fbea567 100644 ...@@ -298,7 +298,7 @@ index 74b4911ac16d..19789fbea567 100644
+ unsigned int flags); + unsigned int flags);
#endif #endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index e221be724fe8..c738ac7c3a46 100644 index e221be724fe82..c738ac7c3a46e 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -151,7 +151,7 @@ static @@ -151,7 +151,7 @@ static
......
aufs5-kbuild.patch
View file @ d051ff35
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.1 kbuild patch aufs5.1 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig diff --git a/fs/Kconfig b/fs/Kconfig
index 3e6d3101f3ff..8b099435d01d 100644 index 3e6d3101f3ff0..8b099435d01d1 100644
--- a/fs/Kconfig --- a/fs/Kconfig
+++ b/fs/Kconfig +++ b/fs/Kconfig
@@ -261,6 +261,7 @@ source "fs/romfs/Kconfig" @@ -261,6 +261,7 @@ source "fs/romfs/Kconfig"
...@@ -14,7 +14,7 @@ index 3e6d3101f3ff..8b099435d01d 100644 ...@@ -14,7 +14,7 @@ index 3e6d3101f3ff..8b099435d01d 100644
endif # MISC_FILESYSTEMS endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile diff --git a/fs/Makefile b/fs/Makefile
index 427fec226fae..e5ec0a044931 100644 index 427fec226faeb..e5ec0a0449316 100644
--- a/fs/Makefile --- a/fs/Makefile
+++ b/fs/Makefile +++ b/fs/Makefile
@@ -129,3 +129,4 @@ obj-$(CONFIG_F2FS_FS) += f2fs/ @@ -129,3 +129,4 @@ obj-$(CONFIG_F2FS_FS) += f2fs/
......
aufs5-loopback.patch
View file @ d051ff35
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.1 loopback patch aufs5.1 loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 7e18c8c72dcc..33f8813e97d6 100644 index 7e18c8c72dccb..33f8813e97d63 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -625,6 +625,15 @@ static inline void loop_update_dio(struct loop_device *lo) @@ -625,6 +625,15 @@ static inline void loop_update_dio(struct loop_device *lo)
...@@ -140,7 +140,7 @@ index 7e18c8c72dcc..33f8813e97d6 100644 ...@@ -140,7 +140,7 @@ index 7e18c8c72dcc..33f8813e97d6 100644
} }
diff --git a/drivers/block/loop.h b/drivers/block/loop.h diff --git a/drivers/block/loop.h b/drivers/block/loop.h
index af75a5ee4094..1d847cb194ff 100644 index af75a5ee40944..1d847cb194ff6 100644
--- a/drivers/block/loop.h --- a/drivers/block/loop.h
+++ b/drivers/block/loop.h +++ b/drivers/block/loop.h
@@ -46,7 +46,7 @@ struct loop_device { @@ -46,7 +46,7 @@ struct loop_device {
...@@ -153,7 +153,7 @@ index af75a5ee4094..1d847cb194ff 100644 ...@@ -153,7 +153,7 @@ index af75a5ee4094..1d847cb194ff 100644
void *key_data; void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
index 6fb4a4ed8cc7..ba9a959f2db2 100644 index 6fb4a4ed8cc7f..ba9a959f2db27 100644
--- a/fs/aufs/f_op.c --- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c +++ b/fs/aufs/f_op.c
@@ -359,7 +359,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter) @@ -359,7 +359,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
...@@ -166,7 +166,7 @@ index 6fb4a4ed8cc7..ba9a959f2db2 100644 ...@@ -166,7 +166,7 @@ index 6fb4a4ed8cc7..ba9a959f2db2 100644
if (file->f_mapping != h_file->f_mapping) { if (file->f_mapping != h_file->f_mapping) {
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 diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
index a8b63acc6204..9d97c3af5686 100644 index a8b63acc62045..9d97c3af5686a 100644
--- a/fs/aufs/loop.c --- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c +++ b/fs/aufs/loop.c
@@ -133,3 +133,19 @@ void au_loopback_fin(void) @@ -133,3 +133,19 @@ void au_loopback_fin(void)
...@@ -190,7 +190,7 @@ index a8b63acc6204..9d97c3af5686 100644 ...@@ -190,7 +190,7 @@ index a8b63acc6204..9d97c3af5686 100644
+ return f; + return f;
+} +}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
index 94f4f80ae33b..ca1194354aff 100644 index 94f4f80ae33bf..ca1194354aff4 100644
--- a/fs/aufs/loop.h --- a/fs/aufs/loop.h
+++ b/fs/aufs/loop.h +++ b/fs/aufs/loop.h
@@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb); @@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
...@@ -212,7 +212,7 @@ index 94f4f80ae33b..ca1194354aff 100644 ...@@ -212,7 +212,7 @@ index 94f4f80ae33b..ca1194354aff 100644
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c diff --git a/fs/aufs/super.c b/fs/aufs/super.c
index e3b81808a78a..eff4f475de06 100644 index e3b81808a78a7..eff4f475de060 100644
--- a/fs/aufs/super.c --- a/fs/aufs/super.c
+++ b/fs/aufs/super.c +++ b/fs/aufs/super.c
@@ -846,7 +846,10 @@ static const struct super_operations aufs_sop = { @@ -846,7 +846,10 @@ static const struct super_operations aufs_sop = {
...@@ -228,7 +228,7 @@ index e3b81808a78a..eff4f475de06 100644 ...@@ -228,7 +228,7 @@ index e3b81808a78a..eff4f475de06 100644
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4e81cae7cdac..0d7ebed99cb7 100644 index 4e81cae7cdac8..0d7ebed99cb79 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1940,6 +1940,10 @@ struct super_operations { @@ -1940,6 +1940,10 @@ struct super_operations {
......
aufs5-mmap.patch
View file @ d051ff35
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.1 mmap patch aufs5.1 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c diff --git a/fs/proc/base.c b/fs/proc/base.c
index 6a803a0b75df..a51f41a1b4dd 100644 index 6a803a0b75df4..a51f41a1b4dd1 100644
--- a/fs/proc/base.c --- a/fs/proc/base.c
+++ b/fs/proc/base.c +++ b/fs/proc/base.c
@@ -2019,7 +2019,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) @@ -2019,7 +2019,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
...@@ -15,7 +15,7 @@ index 6a803a0b75df..a51f41a1b4dd 100644 ...@@ -15,7 +15,7 @@ index 6a803a0b75df..a51f41a1b4dd 100644
rc = 0; rc = 0;
} }
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index 3b63be64e436..fb9913bf3d10 100644 index 3b63be64e4364..fb9913bf3d10d 100644
--- a/fs/proc/nommu.c --- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c +++ b/fs/proc/nommu.c
@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) @@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
...@@ -31,7 +31,7 @@ index 3b63be64e436..fb9913bf3d10 100644 ...@@ -31,7 +31,7 @@ index 3b63be64e436..fb9913bf3d10 100644
ino = inode->i_ino; ino = inode->i_ino;
} }
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 95ca1fe7283c..914d9fa7c596 100644 index 95ca1fe7283cf..914d9fa7c596d 100644
--- a/fs/proc/task_mmu.c --- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c
@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) @@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
...@@ -56,7 +56,7 @@ index 95ca1fe7283c..914d9fa7c596 100644 ...@@ -56,7 +56,7 @@ index 95ca1fe7283c..914d9fa7c596 100644
struct mm_walk walk = { struct mm_walk walk = {
.hugetlb_entry = gather_hugetlb_stats, .hugetlb_entry = gather_hugetlb_stats,
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 36bf0f2e102e..8df6cbc58756 100644 index 36bf0f2e102e7..8df6cbc587563 100644
--- a/fs/proc/task_nommu.c --- a/fs/proc/task_nommu.c
+++ b/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) @@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
...@@ -72,7 +72,7 @@ index 36bf0f2e102e..8df6cbc58756 100644 ...@@ -72,7 +72,7 @@ index 36bf0f2e102e..8df6cbc58756 100644
ino = inode->i_ino; ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h diff --git a/include/linux/mm.h b/include/linux/mm.h
index 6b10c21630f5..5951915df163 100644 index 6b10c21630f54..5951915df163a 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1486,6 +1486,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -1486,6 +1486,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
...@@ -105,7 +105,7 @@ index 6b10c21630f5..5951915df163 100644 ...@@ -105,7 +105,7 @@ index 6b10c21630f5..5951915df163 100644
void *buf, int len, unsigned int gup_flags); void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, 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 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 4ef4bbe78a1d..8cac6e0bc1a8 100644 index 4ef4bbe78a1da..8cac6e0bc1a8d 100644
--- a/include/linux/mm_types.h --- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h +++ b/include/linux/mm_types.h
@@ -250,6 +250,7 @@ struct vm_region { @@ -250,6 +250,7 @@ struct vm_region {
...@@ -125,7 +125,7 @@ index 4ef4bbe78a1d..8cac6e0bc1a8 100644 ...@@ -125,7 +125,7 @@ index 4ef4bbe78a1d..8cac6e0bc1a8 100644
atomic_long_t swap_readahead_info; atomic_long_t swap_readahead_info;
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index 9dcd18aa210b..cf478ebb6926 100644 index 9dcd18aa210b5..cf478ebb6926f 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -546,7 +546,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -546,7 +546,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
...@@ -138,7 +138,7 @@ index 9dcd18aa210b..cf478ebb6926 100644 ...@@ -138,7 +138,7 @@ index 9dcd18aa210b..cf478ebb6926 100644
atomic_dec(&inode->i_writecount); atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping); i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile diff --git a/mm/Makefile b/mm/Makefile
index d210cc9d6f80..e77e80ce7298 100644 index d210cc9d6f800..e77e80ce7298b 100644
--- a/mm/Makefile --- a/mm/Makefile
+++ b/mm/Makefile +++ b/mm/Makefile
@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ @@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
...@@ -151,7 +151,7 @@ index d210cc9d6f80..e77e80ce7298 100644 ...@@ -151,7 +151,7 @@ index d210cc9d6f80..e77e80ce7298 100644
obj-y += init-mm.o obj-y += init-mm.o
obj-y += memblock.o obj-y += memblock.o
diff --git a/mm/filemap.c b/mm/filemap.c diff --git a/mm/filemap.c b/mm/filemap.c
index d78f577baef2..7dcd21948a79 100644 index d78f577baef2a..7dcd21948a796 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -2764,7 +2764,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) @@ -2764,7 +2764,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
...@@ -164,7 +164,7 @@ index d78f577baef2..7dcd21948a79 100644 ...@@ -164,7 +164,7 @@ index d78f577baef2..7dcd21948a79 100644
if (page->mapping != inode->i_mapping) { if (page->mapping != inode->i_mapping) {
unlock_page(page); unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c diff --git a/mm/mmap.c b/mm/mmap.c
index bd7b9f293b39..f3fd32a1df36 100644 index bd7b9f293b391..f3fd32a1df361 100644
--- a/mm/mmap.c --- a/mm/mmap.c
+++ b/mm/mmap.c +++ b/mm/mmap.c
@@ -181,7 +181,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) @@ -181,7 +181,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
...@@ -261,7 +261,7 @@ index bd7b9f293b39..f3fd32a1df36 100644 ...@@ -261,7 +261,7 @@ index bd7b9f293b39..f3fd32a1df36 100644
new_vma->vm_ops->open(new_vma); new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent); vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c diff --git a/mm/nommu.c b/mm/nommu.c
index 749276beb109..c7957f06fbc4 100644 index 749276beb1094..c7957f06fbc46 100644
--- a/mm/nommu.c --- a/mm/nommu.c
+++ b/mm/nommu.c +++ b/mm/nommu.c
@@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm_region *region) @@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm_region *region)
...@@ -306,7 +306,7 @@ index 749276beb109..c7957f06fbc4 100644 ...@@ -306,7 +306,7 @@ index 749276beb109..c7957f06fbc4 100644
diff --git a/mm/prfile.c b/mm/prfile.c diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644 new file mode 100644
index 000000000000..00d51187c325 index 0000000000000..00d51187c3250
--- /dev/null --- /dev/null
+++ b/mm/prfile.c +++ b/mm/prfile.c
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
......
aufs5-standalone.patch
View file @ d051ff35
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.1 standalone patch aufs5.1 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index fc18967c2522..50eb587c1253 100644 index fc18967c25227..50eb587c12538 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -1352,6 +1352,7 @@ void d_walk(struct dentry *parent, void *data, @@ -1352,6 +1352,7 @@ void d_walk(struct dentry *parent, void *data,
...@@ -22,7 +22,7 @@ index fc18967c2522..50eb587c1253 100644 ...@@ -22,7 +22,7 @@ index fc18967c2522..50eb587c1253 100644
/** /**
* d_ancestor - search for an ancestor * d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c diff --git a/fs/exec.c b/fs/exec.c
index 2e0033348d8e..bd946a5b9b1e 100644 index 2e0033348d8e1..bd946a5b9b1ee 100644
--- a/fs/exec.c --- a/fs/exec.c
+++ b/fs/exec.c +++ b/fs/exec.c
@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path) @@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
...@@ -34,7 +34,7 @@ index 2e0033348d8e..bd946a5b9b1e 100644 ...@@ -34,7 +34,7 @@ index 2e0033348d8e..bd946a5b9b1e 100644
#ifdef CONFIG_USELIB #ifdef CONFIG_USELIB
/* /*
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index 7828d53148a7..efd8e2e9c0fa 100644 index 7828d53148a79..efd8e2e9c0fa7 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg) @@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
...@@ -46,7 +46,7 @@ index 7828d53148a7..efd8e2e9c0fa 100644 ...@@ -46,7 +46,7 @@ index 7828d53148a7..efd8e2e9c0fa 100644
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force) int force)
diff --git a/fs/file_table.c b/fs/file_table.c diff --git a/fs/file_table.c b/fs/file_table.c
index 155d7514a094..eefcbb908038 100644 index 155d7514a0943..eefcbb9080380 100644
--- a/fs/file_table.c --- a/fs/file_table.c
+++ b/fs/file_table.c +++ b/fs/file_table.c
@@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred) @@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
...@@ -74,7 +74,7 @@ index 155d7514a094..eefcbb908038 100644 ...@@ -74,7 +74,7 @@ index 155d7514a094..eefcbb908038 100644
void __init files_init(void) void __init files_init(void)
{ {
diff --git a/fs/inode.c b/fs/inode.c diff --git a/fs/inode.c b/fs/inode.c
index ee4434cea572..78b9f5631976 100644 index ee4434cea572e..78b9f56319763 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -1666,6 +1666,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags) @@ -1666,6 +1666,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
...@@ -86,7 +86,7 @@ index ee4434cea572..78b9f5631976 100644 ...@@ -86,7 +86,7 @@ index ee4434cea572..78b9f5631976 100644
/** /**
* touch_atime - update the access time * touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index e56de0b2bee0..f63c51204a41 100644 index e56de0b2bee05..f63c51204a418 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -435,6 +435,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -435,6 +435,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
...@@ -114,7 +114,7 @@ index e56de0b2bee0..f63c51204a41 100644 ...@@ -114,7 +114,7 @@ index e56de0b2bee0..f63c51204a41 100644
static void lock_mnt_tree(struct mount *mnt) static void lock_mnt_tree(struct mount *mnt)
{ {
diff --git a/fs/notify/group.c b/fs/notify/group.c diff --git a/fs/notify/group.c b/fs/notify/group.c
index c03b83662876..94d210ca384a 100644 index c03b836628769..94d210ca384a6 100644
--- a/fs/notify/group.c --- a/fs/notify/group.c
+++ b/fs/notify/group.c +++ b/fs/notify/group.c
@@ -112,6 +112,7 @@ void fsnotify_get_group(struct fsnotify_group *group) @@ -112,6 +112,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
...@@ -142,7 +142,7 @@ index c03b83662876..94d210ca384a 100644 ...@@ -142,7 +142,7 @@ index c03b83662876..94d210ca384a 100644
int fsnotify_fasync(int fd, struct file *file, int on) int fsnotify_fasync(int fd, struct file *file, int on)
{ {
diff --git a/fs/notify/mark.c b/fs/notify/mark.c diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 22acb0a79b53..a38381e57490 100644 index 22acb0a79b532..a38381e57490f 100644
--- a/fs/notify/mark.c --- a/fs/notify/mark.c
+++ b/fs/notify/mark.c +++ b/fs/notify/mark.c
@@ -289,6 +289,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) @@ -289,6 +289,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
...@@ -178,7 +178,7 @@ index 22acb0a79b53..a38381e57490 100644 ...@@ -178,7 +178,7 @@ index 22acb0a79b53..a38381e57490 100644
/* /*
* Destroy all marks in destroy_list, waits for SRCU period to finish before * Destroy all marks in destroy_list, waits for SRCU period to finish before
diff --git a/fs/open.c b/fs/open.c diff --git a/fs/open.c b/fs/open.c
index a00350018a47..fc17a6a34071 100644 index a00350018a479..fc17a6a34071b 100644
--- a/fs/open.c --- a/fs/open.c
+++ b/fs/open.c +++ b/fs/open.c
@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, @@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
...@@ -190,7 +190,7 @@ index a00350018a47..fc17a6a34071 100644 ...@@ -190,7 +190,7 @@ index a00350018a47..fc17a6a34071 100644
long vfs_truncate(const struct path *path, loff_t length) long vfs_truncate(const struct path *path, loff_t length)
{ {
diff --git a/fs/read_write.c b/fs/read_write.c diff --git a/fs/read_write.c b/fs/read_write.c
index e1e66b631a1a..ed36db32507f 100644 index e1e66b631a1a1..ed36db32507f6 100644
--- a/fs/read_write.c --- a/fs/read_write.c
+++ b/fs/read_write.c +++ b/fs/read_write.c
@@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) @@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
...@@ -226,7 +226,7 @@ index e1e66b631a1a..ed36db32507f 100644 ...@@ -226,7 +226,7 @@ index e1e66b631a1a..ed36db32507f 100644
static inline loff_t file_pos_read(struct file *file) static inline loff_t file_pos_read(struct file *file)
{ {
diff --git a/fs/splice.c b/fs/splice.c diff --git a/fs/splice.c b/fs/splice.c
index 9629564ee8f2..f277bda5f717 100644 index 9629564ee8f2f..f277bda5f717d 100644
--- a/fs/splice.c --- a/fs/splice.c
+++ b/fs/splice.c +++ b/fs/splice.c
@@ -846,6 +846,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, @@ -846,6 +846,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
...@@ -246,7 +246,7 @@ index 9629564ee8f2..f277bda5f717 100644 ...@@ -246,7 +246,7 @@ index 9629564ee8f2..f277bda5f717 100644
/** /**
* splice_direct_to_actor - splices data directly between two non-pipes * splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/fs/sync.c b/fs/sync.c diff --git a/fs/sync.c b/fs/sync.c
index 28607828e96f..ffd7ea43831e 100644 index 28607828e96f2..ffd7ea43831ea 100644
--- a/fs/sync.c --- a/fs/sync.c
+++ b/fs/sync.c +++ b/fs/sync.c
@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait) @@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
...@@ -258,7 +258,7 @@ index 28607828e96f..ffd7ea43831e 100644 ...@@ -258,7 +258,7 @@ index 28607828e96f..ffd7ea43831e 100644
/* /*
* Write out and wait upon all dirty data associated with this * Write out and wait upon all dirty data associated with this
diff --git a/fs/xattr.c b/fs/xattr.c diff --git a/fs/xattr.c b/fs/xattr.c
index 0d6a6a4af861..7ce4701b7289 100644 index 0d6a6a4af8616..7ce4701b7289d 100644
--- a/fs/xattr.c --- a/fs/xattr.c
+++ b/fs/xattr.c +++ b/fs/xattr.c
@@ -295,6 +295,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value, @@ -295,6 +295,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
...@@ -270,7 +270,7 @@ index 0d6a6a4af861..7ce4701b7289 100644 ...@@ -270,7 +270,7 @@ index 0d6a6a4af861..7ce4701b7289 100644
ssize_t ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index c738ac7c3a46..92de98d9c634 100644 index c738ac7c3a46e..92de98d9c6347 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -162,6 +162,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) @@ -162,6 +162,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
...@@ -282,7 +282,7 @@ index c738ac7c3a46..92de98d9c634 100644 ...@@ -282,7 +282,7 @@ index c738ac7c3a46..92de98d9c634 100644
#ifdef CONFIG_LOCK_STAT #ifdef CONFIG_LOCK_STAT
diff --git a/kernel/task_work.c b/kernel/task_work.c diff --git a/kernel/task_work.c b/kernel/task_work.c
index 0fef395662a6..83fb1ecfc33d 100644 index 0fef395662a6e..83fb1ecfc33de 100644
--- a/kernel/task_work.c --- a/kernel/task_work.c
+++ b/kernel/task_work.c +++ b/kernel/task_work.c
@@ -116,3 +116,4 @@ void task_work_run(void) @@ -116,3 +116,4 @@ void task_work_run(void)
...@@ -291,7 +291,7 @@ index 0fef395662a6..83fb1ecfc33d 100644 ...@@ -291,7 +291,7 @@ index 0fef395662a6..83fb1ecfc33d 100644
} }
+EXPORT_SYMBOL_GPL(task_work_run); +EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index dc28914fa72e..c2ddfea2b280 100644 index dc28914fa72e0..c2ddfea2b2803 100644
--- a/security/device_cgroup.c --- a/security/device_cgroup.c
+++ b/security/device_cgroup.c +++ b/security/device_cgroup.c
@@ -824,3 +824,4 @@ int __devcgroup_check_permission(short type, u32 major, u32 minor, @@ -824,3 +824,4 @@ int __devcgroup_check_permission(short type, u32 major, u32 minor,
...@@ -300,7 +300,7 @@ index dc28914fa72e..c2ddfea2b280 100644 ...@@ -300,7 +300,7 @@ index dc28914fa72e..c2ddfea2b280 100644
} }
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission); +EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c diff --git a/security/security.c b/security/security.c
index 23cbb1a295a3..72b2c47ef649 100644 index 23cbb1a295a36..72b2c47ef6496 100644
--- a/security/security.c --- a/security/security.c
+++ b/security/security.c +++ b/security/security.c
@@ -992,6 +992,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) @@ -992,6 +992,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
......
include/uapi/linux/aufs_type.h
View file @ d051ff35
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.1-20200518" #define AUFS_VERSION "5.1-20200622"
/* todo? move this to linux-2.6.19/include/magic.h */ /* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') #define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
lockdep-debug.patch
View file @ d051ff35
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.1 lockdep patch aufs5.1 lockdep patch
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 470795d9f4a2..42bf321d9181 100644 index 470795d9f4a28..42bf321d91817 100644
--- a/include/linux/lockdep.h --- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h +++ b/include/linux/lockdep.h
@@ -17,7 +17,7 @@ struct lockdep_map; @@ -17,7 +17,7 @@ struct lockdep_map;
...@@ -15,11 +15,11 @@ index 470795d9f4a2..42bf321d9181 100644 ...@@ -15,11 +15,11 @@ index 470795d9f4a2..42bf321d9181 100644
#include <linux/types.h> #include <linux/types.h>
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 92de98d9c634..82764fbac637 100644 index 92de98d9c6347..82764fbac6371 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index d4c197425f68..a103700a63bd 100644 index d4c197425f68a..a103700a63bd7 100644
--- a/kernel/locking/lockdep_internals.h --- a/kernel/locking/lockdep_internals.h
+++ b/kernel/locking/lockdep_internals.h +++ b/kernel/locking/lockdep_internals.h
@@ -71,15 +71,15 @@ enum { @@ -71,15 +71,15 @@ enum {
......
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