Skip to content

GitLab

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

aufs5.x-rcN 20190520 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent fc5023ea
Show whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ 51a0d3a9
...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index dce5c099f43c..d10f05c88860 100644 index 2c2fce72e694..f5be2663b01e 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2635,6 +2635,19 @@ F: include/linux/audit.h @@ -2699,6 +2699,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h F: include/uapi/linux/audit.h
F: kernel/audit* F: kernel/audit*
...@@ -26,7 +26,7 @@ index dce5c099f43c..d10f05c88860 100644 ...@@ -26,7 +26,7 @@ index dce5c099f43c..d10f05c88860 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 cf5538942834..a271e17e4b10 100644 index bf1c61cab8eb..7e18c8c72dcc 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,
...@@ -90,7 +90,7 @@ index 083185174c6d..78234ee16784 100644 ...@@ -90,7 +90,7 @@ index 083185174c6d..78234ee16784 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 73432e64f874..4a1756b8b4bd 100644 index 9a453f3637f8..ee4434cea572 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,10 +103,10 @@ index 73432e64f874..4a1756b8b4bd 100644 ...@@ -103,10 +103,10 @@ index 73432e64f874..4a1756b8b4bd 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 678ef175d63a..9b6a3d0f87a1 100644 index c9cab307fa77..e56de0b2bee0 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -768,6 +768,12 @@ static inline int check_mnt(struct mount *mnt) @@ -769,6 +769,12 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns; return mnt->mnt_ns == current->nsproxy->mnt_ns;
} }
...@@ -120,10 +120,10 @@ index 678ef175d63a..9b6a3d0f87a1 100644 ...@@ -120,10 +120,10 @@ index 678ef175d63a..9b6a3d0f87a1 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 ff3c5e6f87cf..5c18a9e51f37 100644 index 61b43ad7608e..8979e01e9bf0 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 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count, @@ -489,6 +489,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
return -EINVAL; return -EINVAL;
} }
...@@ -153,10 +153,10 @@ index ff3c5e6f87cf..5c18a9e51f37 100644 ...@@ -153,10 +153,10 @@ index ff3c5e6f87cf..5c18a9e51f37 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 de2ede048473..5dcf77b8e1b2 100644 index 25212dcca2df..9629564ee8f2 100644
--- a/fs/splice.c --- a/fs/splice.c
+++ b/fs/splice.c +++ b/fs/splice.c
@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); @@ -833,8 +833,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
/* /*
* Attempt to initiate a splice from pipe to file. * Attempt to initiate a splice from pipe to file.
*/ */
...@@ -167,7 +167,7 @@ index de2ede048473..5dcf77b8e1b2 100644 ...@@ -167,7 +167,7 @@ index de2ede048473..5dcf77b8e1b2 100644
{ {
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
loff_t *, size_t, unsigned int); loff_t *, size_t, unsigned int);
@@ -854,9 +854,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, @@ -850,9 +850,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. * Attempt to initiate a splice from a file to a pipe.
*/ */
...@@ -194,10 +194,10 @@ index b54e0541ad89..28607828e96f 100644 ...@@ -194,10 +194,10 @@ 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 29d8e2cfed0e..5db265e7d35a 100644 index dd28e7679089..77933034b50a 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1310,6 +1310,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1327,6 +1327,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */ /* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int); extern void kill_fasync(struct fasync_struct **, int, int);
...@@ -205,7 +205,7 @@ index 29d8e2cfed0e..5db265e7d35a 100644 ...@@ -205,7 +205,7 @@ index 29d8e2cfed0e..5db265e7d35a 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); 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 int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp); extern void f_delown(struct file *filp);
@@ -1803,6 +1804,7 @@ struct file_operations { @@ -1806,6 +1807,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); 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); unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int); int (*check_flags)(int);
...@@ -213,7 +213,7 @@ index 29d8e2cfed0e..5db265e7d35a 100644 ...@@ -213,7 +213,7 @@ index 29d8e2cfed0e..5db265e7d35a 100644
int (*flock) (struct file *, int, struct file_lock *); 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_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); ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -1873,6 +1875,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, @@ -1876,6 +1878,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer, struct iovec *fast_pointer,
struct iovec **ret_pointer); struct iovec **ret_pointer);
...@@ -226,7 +226,7 @@ index 29d8e2cfed0e..5db265e7d35a 100644 ...@@ -226,7 +226,7 @@ index 29d8e2cfed0e..5db265e7d35a 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_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 *); extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
@@ -2298,6 +2306,7 @@ extern int current_umask(void); @@ -2306,6 +2314,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode); extern void ihold(struct inode * inode);
extern void iput(struct inode *); extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int); extern int generic_update_time(struct inode *, struct timespec64 *, int);
...@@ -234,7 +234,7 @@ index 29d8e2cfed0e..5db265e7d35a 100644 ...@@ -234,7 +234,7 @@ index 29d8e2cfed0e..5db265e7d35a 100644
/* /sys/fs */ /* /sys/fs */
extern struct kobject *fs_kobj; extern struct kobject *fs_kobj;
@@ -2585,6 +2594,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) @@ -2594,6 +2603,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false; return false;
} }
#endif #endif
...@@ -243,10 +243,10 @@ index 29d8e2cfed0e..5db265e7d35a 100644 ...@@ -243,10 +243,10 @@ index 29d8e2cfed0e..5db265e7d35a 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 c5335df2372f..4e48a5059536 100644 index 79c3873d58ac..470795d9f4a2 100644
--- a/include/linux/lockdep.h --- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h +++ b/include/linux/lockdep.h
@@ -306,6 +306,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,
return lock->key == key; return lock->key == key;
} }
...@@ -255,7 +255,7 @@ index c5335df2372f..4e48a5059536 100644 ...@@ -255,7 +255,7 @@ index c5335df2372f..4e48a5059536 100644
/* /*
* Acquire a lock. * Acquire a lock.
* *
@@ -432,6 +434,7 @@ struct lockdep_map { }; @@ -458,6 +460,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0) #define lockdep_depth(tsk) (0)
...@@ -298,10 +298,10 @@ index 74b4911ac16d..19789fbea567 100644 ...@@ -298,10 +298,10 @@ 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 95932333a48b..516ab7da26fb 100644 index e221be724fe8..c738ac7c3a46 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -143,7 +143,7 @@ static @@ -151,7 +151,7 @@ static
#endif #endif
struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
...@@ -310,7 +310,7 @@ index 95932333a48b..516ab7da26fb 100644 ...@@ -310,7 +310,7 @@ index 95932333a48b..516ab7da26fb 100644
{ {
if (!hlock->class_idx) { if (!hlock->class_idx) {
/* /*
@@ -154,6 +154,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) @@ -162,6 +162,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
} }
return lock_classes + hlock->class_idx - 1; return lock_classes + hlock->class_idx - 1;
} }
......
aufs5-kbuild.patch
View file @ 51a0d3a9
...@@ -2,22 +2,22 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,22 +2,22 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN kbuild patch aufs5.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig diff --git a/fs/Kconfig b/fs/Kconfig
index ac474a61be37..284cee954591 100644 index 3e6d3101f3ff..8b099435d01d 100644
--- a/fs/Kconfig --- a/fs/Kconfig
+++ b/fs/Kconfig +++ b/fs/Kconfig
@@ -255,6 +255,7 @@ source "fs/pstore/Kconfig" @@ -261,6 +261,7 @@ source "fs/romfs/Kconfig"
source "fs/pstore/Kconfig"
source "fs/sysv/Kconfig" source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig" source "fs/ufs/Kconfig"
source "fs/exofs/Kconfig"
+source "fs/aufs/Kconfig" +source "fs/aufs/Kconfig"
endif # MISC_FILESYSTEMS endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile diff --git a/fs/Makefile b/fs/Makefile
index 293733f61594..12d19d0de07a 100644 index 427fec226fae..e5ec0a044931 100644
--- a/fs/Makefile --- a/fs/Makefile
+++ b/fs/Makefile +++ b/fs/Makefile
@@ -128,3 +128,4 @@ obj-y += exofs/ # Multiple modules @@ -129,3 +129,4 @@ obj-$(CONFIG_F2FS_FS) += f2fs/
obj-$(CONFIG_CEPH_FS) += ceph/ obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/ obj-$(CONFIG_PSTORE) += pstore/
obj-$(CONFIG_EFIVAR_FS) += efivarfs/ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
......
aufs5-loopback.patch
View file @ 51a0d3a9
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN loopback patch aufs5.x-rcN 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 a271e17e4b10..ee17c7577224 100644 index 7e18c8c72dcc..33f8813e97d6 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)
...@@ -130,7 +130,7 @@ index a271e17e4b10..ee17c7577224 100644 ...@@ -130,7 +130,7 @@ index a271e17e4b10..ee17c7577224 100644
spin_unlock_irq(&lo->lo_lock); spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo); loop_release_xfer(lo);
@@ -1146,6 +1179,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) @@ -1160,6 +1193,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/ */
if (filp) if (filp)
fput(filp); fput(filp);
...@@ -166,7 +166,7 @@ index 0309f0d502ff..19feb4f3cb5f 100644 ...@@ -166,7 +166,7 @@ index 0309f0d502ff..19feb4f3cb5f 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 f05887d612fd..6f0505723cb4 100644 index 9ba35a878ecd..4ed0ff03d5ab 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)
...@@ -228,10 +228,10 @@ index 73255f63b80c..f04e211cbf89 100644 ...@@ -228,10 +228,10 @@ index 73255f63b80c..f04e211cbf89 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 5db265e7d35a..8895cd2343e3 100644 index 77933034b50a..9a9b195fb847 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1937,6 +1937,10 @@ struct super_operations { @@ -1940,6 +1940,10 @@ struct super_operations {
struct shrink_control *); struct shrink_control *);
long (*free_cached_objects)(struct super_block *, long (*free_cached_objects)(struct super_block *,
struct shrink_control *); struct shrink_control *);
......
aufs5-mmap.patch
View file @ 51a0d3a9
...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN mmap patch aufs5.x-rcN 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 f5ed9512d193..e8f8e59d93bb 100644 index 6a803a0b75df..a51f41a1b4dd 100644
--- a/fs/proc/base.c --- a/fs/proc/base.c
+++ b/fs/proc/base.c +++ b/fs/proc/base.c
@@ -2014,7 +2014,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)
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
vma = find_exact_vma(mm, vm_start, vm_end); vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) { if (vma && vma->vm_file) {
...@@ -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 85b0ef890b28..0f7fb8138160 100644 index 95ca1fe7283c..914d9fa7c596 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)
...@@ -46,7 +46,7 @@ index 85b0ef890b28..0f7fb8138160 100644 ...@@ -46,7 +46,7 @@ index 85b0ef890b28..0f7fb8138160 100644
dev = inode->i_sb->s_dev; dev = inode->i_sb->s_dev;
ino = inode->i_ino; ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1740,7 +1743,7 @@ static int show_numa_map(struct seq_file *m, void *v) @@ -1760,7 +1763,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps; struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v; struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md; struct numa_maps *md = &numa_priv->md;
...@@ -56,7 +56,7 @@ index 85b0ef890b28..0f7fb8138160 100644 ...@@ -56,7 +56,7 @@ index 85b0ef890b28..0f7fb8138160 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 0b63d68dedb2..400d1c594ceb 100644 index 36bf0f2e102e..8df6cbc58756 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,10 +72,10 @@ index 0b63d68dedb2..400d1c594ceb 100644 ...@@ -72,10 +72,10 @@ index 0b63d68dedb2..400d1c594ceb 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 80bb6408fe73..59a1ea611ba7 100644 index 6b10c21630f5..5951915df163 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1518,6 +1518,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,
unmap_mapping_range(mapping, holebegin, holelen, 0); unmap_mapping_range(mapping, holebegin, holelen, 0);
} }
...@@ -105,10 +105,10 @@ index 80bb6408fe73..59a1ea611ba7 100644 ...@@ -105,10 +105,10 @@ index 80bb6408fe73..59a1ea611ba7 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 2c471a2c43fa..c6e7aa6996ff 100644 index 4ef4bbe78a1d..8cac6e0bc1a8 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
@@ -244,6 +244,7 @@ struct vm_region { @@ -250,6 +250,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */ unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */ unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */ struct file *vm_file; /* the backing file or NULL */
...@@ -116,7 +116,7 @@ index 2c471a2c43fa..c6e7aa6996ff 100644 ...@@ -116,7 +116,7 @@ index 2c471a2c43fa..c6e7aa6996ff 100644
int vm_usage; /* region usage count (access under nommu_region_sem) */ int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for bool vm_icache_flushed : 1; /* true if the icache has been flushed for
@@ -318,6 +319,7 @@ struct vm_area_struct { @@ -324,6 +325,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */ units */
struct file * vm_file; /* File we map to (can be NULL). */ struct file * vm_file; /* File we map to (can be NULL). */
...@@ -125,10 +125,10 @@ index 2c471a2c43fa..c6e7aa6996ff 100644 ...@@ -125,10 +125,10 @@ index 2c471a2c43fa..c6e7aa6996ff 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 b69248e6f0e0..099b89978dd3 100644 index 9dcd18aa210b..cf478ebb6926 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -547,7 +547,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,
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping; struct address_space *mapping = file->f_mapping;
...@@ -151,10 +151,10 @@ index d210cc9d6f80..e77e80ce7298 100644 ...@@ -151,10 +151,10 @@ 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 9f5e323e883e..90db684a7cf4 100644 index d78f577baef2..7dcd21948a79 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -2677,7 +2677,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)
vm_fault_t ret = VM_FAULT_LOCKED; vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb); sb_start_pagefault(inode->i_sb);
...@@ -164,10 +164,10 @@ index 9f5e323e883e..90db684a7cf4 100644 ...@@ -164,10 +164,10 @@ index 9f5e323e883e..90db684a7cf4 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 fc1809b1bed6..8f62e47a60ea 100644 index bd7b9f293b39..f3fd32a1df36 100644
--- a/mm/mmap.c --- a/mm/mmap.c
+++ b/mm/mmap.c +++ b/mm/mmap.c
@@ -180,7 +180,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)
if (vma->vm_ops && vma->vm_ops->close) if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma); vma->vm_ops->close(vma);
if (vma->vm_file) if (vma->vm_file)
...@@ -176,7 +176,7 @@ index fc1809b1bed6..8f62e47a60ea 100644 ...@@ -176,7 +176,7 @@ index fc1809b1bed6..8f62e47a60ea 100644
mpol_put(vma_policy(vma)); mpol_put(vma_policy(vma));
vm_area_free(vma); vm_area_free(vma);
return next; return next;
@@ -929,7 +929,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, @@ -930,7 +930,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
if (remove_next) { if (remove_next) {
if (file) { if (file) {
uprobe_munmap(next, next->vm_start, next->vm_end); uprobe_munmap(next, next->vm_start, next->vm_end);
...@@ -185,7 +185,7 @@ index fc1809b1bed6..8f62e47a60ea 100644 ...@@ -185,7 +185,7 @@ index fc1809b1bed6..8f62e47a60ea 100644
} }
if (next->anon_vma) if (next->anon_vma)
anon_vma_merge(vma, next); anon_vma_merge(vma, next);
@@ -1845,8 +1845,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, @@ -1846,8 +1846,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr; return addr;
unmap_and_free_vma: unmap_and_free_vma:
...@@ -195,7 +195,7 @@ index fc1809b1bed6..8f62e47a60ea 100644 ...@@ -195,7 +195,7 @@ index fc1809b1bed6..8f62e47a60ea 100644
/* Undo any partial mapping done by a device driver. */ /* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
@@ -2675,7 +2675,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, @@ -2679,7 +2679,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol; goto out_free_mpol;
if (new->vm_file) if (new->vm_file)
...@@ -204,7 +204,7 @@ index fc1809b1bed6..8f62e47a60ea 100644 ...@@ -204,7 +204,7 @@ index fc1809b1bed6..8f62e47a60ea 100644
if (new->vm_ops && new->vm_ops->open) if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new); new->vm_ops->open(new);
@@ -2694,7 +2694,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, @@ -2698,7 +2698,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->close) if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new); new->vm_ops->close(new);
if (new->vm_file) if (new->vm_file)
...@@ -213,7 +213,7 @@ index fc1809b1bed6..8f62e47a60ea 100644 ...@@ -213,7 +213,7 @@ index fc1809b1bed6..8f62e47a60ea 100644
unlink_anon_vmas(new); unlink_anon_vmas(new);
out_free_mpol: out_free_mpol:
mpol_put(vma_policy(new)); mpol_put(vma_policy(new));
@@ -2884,7 +2884,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, @@ -2888,7 +2888,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma; struct vm_area_struct *vma;
unsigned long populate = 0; unsigned long populate = 0;
unsigned long ret = -EINVAL; unsigned long ret = -EINVAL;
...@@ -222,7 +222,7 @@ index fc1809b1bed6..8f62e47a60ea 100644 ...@@ -222,7 +222,7 @@ index fc1809b1bed6..8f62e47a60ea 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n", pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid); current->comm, current->pid);
@@ -2959,10 +2959,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, @@ -2963,10 +2963,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
} }
} }
...@@ -251,7 +251,7 @@ index fc1809b1bed6..8f62e47a60ea 100644 ...@@ -251,7 +251,7 @@ index fc1809b1bed6..8f62e47a60ea 100644
out: out:
up_write(&mm->mmap_sem); up_write(&mm->mmap_sem);
if (populate) if (populate)
@@ -3252,7 +3269,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, @@ -3256,7 +3273,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma)) if (anon_vma_clone(new_vma, vma))
goto out_free_mempol; goto out_free_mempol;
if (new_vma->vm_file) if (new_vma->vm_file)
......
aufs5-standalone.patch
View file @ 51a0d3a9
...@@ -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 fb72d36f7823..7ce68004cbf8 100644 index 2e0033348d8e..bd946a5b9b1e 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)
...@@ -46,7 +46,7 @@ index 78234ee16784..2072f690b121 100644 ...@@ -46,7 +46,7 @@ index 78234ee16784..2072f690b121 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 5679e7fcb6b0..961eec3df1eb 100644 index 155d7514a094..eefcbb908038 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)
...@@ -65,7 +65,7 @@ index 5679e7fcb6b0..961eec3df1eb 100644 ...@@ -65,7 +65,7 @@ index 5679e7fcb6b0..961eec3df1eb 100644
static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput); static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
@@ -365,6 +367,7 @@ void __fput_sync(struct file *file) @@ -370,6 +372,7 @@ void __fput_sync(struct file *file)
} }
EXPORT_SYMBOL(fput); EXPORT_SYMBOL(fput);
...@@ -74,7 +74,7 @@ index 5679e7fcb6b0..961eec3df1eb 100644 ...@@ -74,7 +74,7 @@ index 5679e7fcb6b0..961eec3df1eb 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 4a1756b8b4bd..6e51d5f9b9f3 100644 index ee4434cea572..78b9f5631976 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,10 +86,10 @@ index 4a1756b8b4bd..6e51d5f9b9f3 100644 ...@@ -86,10 +86,10 @@ index 4a1756b8b4bd..6e51d5f9b9f3 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 9b6a3d0f87a1..8c4d3d56f2df 100644 index e56de0b2bee0..f63c51204a41 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -434,6 +434,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -435,6 +435,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
mnt_dec_writers(real_mount(mnt)); mnt_dec_writers(real_mount(mnt));
preempt_enable(); preempt_enable();
} }
...@@ -97,7 +97,7 @@ index 9b6a3d0f87a1..8c4d3d56f2df 100644 ...@@ -97,7 +97,7 @@ index 9b6a3d0f87a1..8c4d3d56f2df 100644
/** /**
* mnt_drop_write - give up write access to a mount * mnt_drop_write - give up write access to a mount
@@ -773,6 +774,7 @@ int is_current_mnt_ns(struct vfsmount *mnt) @@ -774,6 +775,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
{ {
return check_mnt(real_mount(mnt)); return check_mnt(real_mount(mnt));
} }
...@@ -105,13 +105,13 @@ index 9b6a3d0f87a1..8c4d3d56f2df 100644 ...@@ -105,13 +105,13 @@ index 9b6a3d0f87a1..8c4d3d56f2df 100644
/* /*
* vfsmount lock must be held for write * vfsmount lock must be held for write
@@ -1842,6 +1844,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, @@ -1886,6 +1888,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
} }
return 0; return 0;
} }
+EXPORT_SYMBOL_GPL(iterate_mounts); +EXPORT_SYMBOL_GPL(iterate_mounts);
static void cleanup_group_ids(struct mount *mnt, struct mount *end) 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 c03b83662876..94d210ca384a 100644
...@@ -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 d2dd16cb5989..cf709b7d611a 100644 index 22acb0a79b53..a38381e57490 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)
...@@ -161,7 +161,7 @@ index d2dd16cb5989..cf709b7d611a 100644 ...@@ -161,7 +161,7 @@ index d2dd16cb5989..cf709b7d611a 100644
/* /*
* Sorting function for lists of fsnotify marks. * Sorting function for lists of fsnotify marks.
@@ -658,6 +660,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp, @@ -685,6 +687,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp,
mutex_unlock(&group->mark_mutex); mutex_unlock(&group->mark_mutex);
return ret; return ret;
} }
...@@ -169,16 +169,16 @@ index d2dd16cb5989..cf709b7d611a 100644 ...@@ -169,16 +169,16 @@ index d2dd16cb5989..cf709b7d611a 100644
/* /*
* Given a list of marks, find the mark associated with given group. If found * Given a list of marks, find the mark associated with given group. If found
@@ -781,6 +784,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, @@ -809,6 +812,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
fsnotify_get_group(group);
mark->group = group; mark->group = group;
WRITE_ONCE(mark->connector, NULL);
} }
+EXPORT_SYMBOL_GPL(fsnotify_init_mark); +EXPORT_SYMBOL_GPL(fsnotify_init_mark);
/* /*
* 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 0285ce7dbd51..cb81623a8b09 100644 index a00350018a47..fc17a6a34071 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 0285ce7dbd51..cb81623a8b09 100644 ...@@ -190,7 +190,7 @@ index 0285ce7dbd51..cb81623a8b09 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 5c18a9e51f37..542e59cd8d27 100644 index 8979e01e9bf0..50fb9b2d1418 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,10 +226,10 @@ index 5c18a9e51f37..542e59cd8d27 100644 ...@@ -226,10 +226,10 @@ index 5c18a9e51f37..542e59cd8d27 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 5dcf77b8e1b2..63fe2652c67d 100644 index 9629564ee8f2..f277bda5f717 100644
--- a/fs/splice.c --- a/fs/splice.c
+++ b/fs/splice.c +++ b/fs/splice.c
@@ -850,6 +850,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,
return splice_write(pipe, out, ppos, len, flags); return splice_write(pipe, out, ppos, len, flags);
} }
...@@ -237,7 +237,7 @@ index 5dcf77b8e1b2..63fe2652c67d 100644 ...@@ -237,7 +237,7 @@ index 5dcf77b8e1b2..63fe2652c67d 100644
/* /*
* Attempt to initiate a splice from a file to a pipe. * Attempt to initiate a splice from a file to a pipe.
@@ -879,6 +880,7 @@ long do_splice_to(struct file *in, loff_t *ppos, @@ -875,6 +876,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return splice_read(in, ppos, pipe, len, flags); return splice_read(in, ppos, pipe, len, flags);
} }
...@@ -270,10 +270,10 @@ index 0d6a6a4af861..7ce4701b7289 100644 ...@@ -270,10 +270,10 @@ 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 516ab7da26fb..c4f72e461d28 100644 index c738ac7c3a46..92de98d9c634 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -154,6 +154,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)
} }
return lock_classes + hlock->class_idx - 1; return lock_classes + hlock->class_idx - 1;
} }
...@@ -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 cd97929fac66..20c59b2e3b26 100644 index dc28914fa72e..c2ddfea2b280 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,10 +300,10 @@ index cd97929fac66..20c59b2e3b26 100644 ...@@ -300,10 +300,10 @@ index cd97929fac66..20c59b2e3b26 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 55bc49027ba9..463d09840532 100644 index 23cbb1a295a3..72b2c47ef649 100644
--- a/security/security.c --- a/security/security.c
+++ b/security/security.c +++ b/security/security.c
@@ -566,6 +566,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)
return 0; return 0;
return call_int_hook(path_rmdir, 0, dir, dentry); return call_int_hook(path_rmdir, 0, dir, dentry);
} }
...@@ -311,7 +311,7 @@ index 55bc49027ba9..463d09840532 100644 ...@@ -311,7 +311,7 @@ index 55bc49027ba9..463d09840532 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry) int security_path_unlink(const struct path *dir, struct dentry *dentry)
{ {
@@ -582,6 +583,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, @@ -1008,6 +1009,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return 0; return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name); return call_int_hook(path_symlink, 0, dir, dentry, old_name);
} }
...@@ -319,7 +319,7 @@ index 55bc49027ba9..463d09840532 100644 ...@@ -319,7 +319,7 @@ index 55bc49027ba9..463d09840532 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir, int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry) struct dentry *new_dentry)
@@ -590,6 +592,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, @@ -1016,6 +1018,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
return 0; return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry); return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
} }
...@@ -327,7 +327,7 @@ index 55bc49027ba9..463d09840532 100644 ...@@ -327,7 +327,7 @@ index 55bc49027ba9..463d09840532 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry, const struct path *new_dir, struct dentry *new_dentry,
@@ -617,6 +620,7 @@ int security_path_truncate(const struct path *path) @@ -1043,6 +1046,7 @@ int security_path_truncate(const struct path *path)
return 0; return 0;
return call_int_hook(path_truncate, 0, path); return call_int_hook(path_truncate, 0, path);
} }
...@@ -335,7 +335,7 @@ index 55bc49027ba9..463d09840532 100644 ...@@ -335,7 +335,7 @@ index 55bc49027ba9..463d09840532 100644
int security_path_chmod(const struct path *path, umode_t mode) int security_path_chmod(const struct path *path, umode_t mode)
{ {
@@ -624,6 +628,7 @@ int security_path_chmod(const struct path *path, umode_t mode) @@ -1050,6 +1054,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0; return 0;
return call_int_hook(path_chmod, 0, path, mode); return call_int_hook(path_chmod, 0, path, mode);
} }
...@@ -343,7 +343,7 @@ index 55bc49027ba9..463d09840532 100644 ...@@ -343,7 +343,7 @@ index 55bc49027ba9..463d09840532 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{ {
@@ -631,6 +636,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) @@ -1057,6 +1062,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
return 0; return 0;
return call_int_hook(path_chown, 0, path, uid, gid); return call_int_hook(path_chown, 0, path, uid, gid);
} }
...@@ -351,7 +351,7 @@ index 55bc49027ba9..463d09840532 100644 ...@@ -351,7 +351,7 @@ index 55bc49027ba9..463d09840532 100644
int security_path_chroot(const struct path *path) int security_path_chroot(const struct path *path)
{ {
@@ -731,6 +737,7 @@ int security_inode_permission(struct inode *inode, int mask) @@ -1157,6 +1163,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0; return 0;
return call_int_hook(inode_permission, 0, inode, mask); return call_int_hook(inode_permission, 0, inode, mask);
} }
...@@ -359,7 +359,7 @@ index 55bc49027ba9..463d09840532 100644 ...@@ -359,7 +359,7 @@ index 55bc49027ba9..463d09840532 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr) int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{ {
@@ -902,6 +909,7 @@ int security_file_permission(struct file *file, int mask) @@ -1328,6 +1335,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask); return fsnotify_perm(file, mask);
} }
......
include/uapi/linux/aufs_type.h
View file @ 51a0d3a9
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <linux/limits.h> #include <linux/limits.h>
#define AUFS_VERSION "5.x-rcN-20190311" #define AUFS_VERSION "5.x-rcN-20190520"
/* 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 @ 51a0d3a9
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN lockdep patch aufs5.x-rcN 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 4e48a5059536..a49002622451 100644 index 470795d9f4a2..42bf321d9181 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;
...@@ -14,157 +14,23 @@ index 4e48a5059536..a49002622451 100644 ...@@ -14,157 +14,23 @@ index 4e48a5059536..a49002622451 100644
#include <linux/types.h> #include <linux/types.h>
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index e91ec9ddcd30..7c63916d235d 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -132,6 +132,16 @@ static inline void list_del_rcu(struct list_head *entry)
}
/**
+ * list_del_init_rcu - deletes entry from list with re-initialization
+ * @entry: the element to delete from the list.
+*/
+static inline void list_del_init_rcu(struct list_head *entry)
+{
+ __list_del_entry(entry);
+ INIT_LIST_HEAD(entry);
+}
+
+/**
* hlist_del_init_rcu - deletes entry from hash list with re-initialization
* @n: the element to delete from the hash list.
*
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 c4f72e461d28..53979dd893e0 100644 index 92de98d9c634..0d2eeaa651e4 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -737,6 +739,58 @@ static bool assign_lock_key(struct lockdep_map *lock) @@ -4495,6 +4501,7 @@ void lockdep_reset(void)
return true;
}
+static bool unused_lock_class_test(unsigned long u)
+{
+ struct lock_class *class;
+
+ /* cf. zap_class() */
+ class = lock_classes + u;
+ return !rcu_access_pointer(class->name)
+ && !rcu_access_pointer(class->key)
+ && list_empty(&class->lock_entry)
+ && hlist_unhashed(&class->hash_entry);
+}
+
+static struct lock_class *unused_lock_class(void)
+{
+ struct lock_class *class;
+ unsigned long u;
+ static unsigned long lastu;
+
+ /* uncomment if you want to confirm */
+ /*
+ * DEBUG_LOCKS_WARN_ON(debug_locks
+ * && !arch_spin_is_locked(&lockdep_lock));
+ */
+
+ /* slow linear search */
+ class = NULL;
+ for (u = lastu; u < MAX_LOCKDEP_KEYS; u++)
+ if (unused_lock_class_test(u)) {
+ /* pr_debug("%s:%d: u %lu\n", __func__, __LINE__, u); */
+ class = lock_classes + u;
+ break;
+ }
+ if (!class && lastu)
+ for (u = 0; u < lastu; u++) {
+ if (unused_lock_class_test(u)) {
+ /*
+ * pr_debug("%s:%d: u %lu\n",
+ * __func__, __LINE__, u);
+ */
+ class = lock_classes + u;
+ break;
+ }
+ }
+ if (class) {
+ class->name = ""; /* mark reserved */
+ lastu = u + 1;
+ } else
+ lastu = 0;
+
+ return class;
+}
+
/*
* Register a lock's class in the hash-table, if the class is not present
* yet. Otherwise we look it up. We cache the result in the lock object
@@ -781,16 +835,22 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
* Allocate a new key from the static array, and add it to
* the hash:
*/
- if (nr_lock_classes >= MAX_LOCKDEP_KEYS) {
- if (!debug_locks_off_graph_unlock()) {
+ if (nr_lock_classes < MAX_LOCKDEP_KEYS)
+ class = lock_classes + nr_lock_classes++;
+ else {
+ class = unused_lock_class();
+ if (class)
+ class->usage_mask = 0;
+ else {
+ if (!debug_locks_off_graph_unlock()) {
+ return NULL;
+ }
+
+ print_lockdep_off("BUG: MAX_LOCKDEP_KEYS too low!");
+ dump_stack();
return NULL;
}
-
- print_lockdep_off("BUG: MAX_LOCKDEP_KEYS too low!");
- dump_stack();
- return NULL;
}
- class = lock_classes + nr_lock_classes++;
debug_atomic_inc(nr_unused_locks);
class->key = key;
class->name = lock->name;
@@ -4124,6 +4188,7 @@ void lockdep_reset(void)
INIT_HLIST_HEAD(chainhash_table + i); INIT_HLIST_HEAD(chainhash_table + i);
raw_local_irq_restore(flags); raw_local_irq_restore(flags);
} }
+/* EXPORT_SYMBOL_GPL(lock_reset); */ +/* EXPORT_SYMBOL_GPL(lock_reset); */
/* /* Remove a class from a lock chain. Must be called with the graph lock held. */
* Remove all references to a lock class. The caller must hold the graph lock. static void remove_class_from_lock_chain(struct pending_free *pf,
@@ -4132,19 +4197,20 @@ static void zap_class(struct lock_class *class)
{
int i;
+ /* pr_debug("%s:%d: %lu\n", __func__, __LINE__, class - lock_classes); */
/*
* Remove all dependencies this lock is
* involved in:
*/
for (i = 0; i < nr_list_entries; i++) {
if (list_entries[i].class == class)
- list_del_rcu(&list_entries[i].entry);
+ list_del_init_rcu(&list_entries[i].entry);
}
/*
* Unhash the class and remove it from the all_lock_classes list:
*/
- hlist_del_rcu(&class->hash_entry);
- list_del(&class->lock_entry);
+ hlist_del_init_rcu(&class->hash_entry);
+ list_del_init(&class->lock_entry);
RCU_INIT_POINTER(class->key, NULL);
RCU_INIT_POINTER(class->name, NULL);
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 88c847a41c8a..c671d55b71bf 100644 index d4c197425f68..a103700a63bd 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
@@ -67,15 +67,15 @@ enum { @@ -71,15 +71,15 @@ enum {
#define MAX_LOCKDEP_CHAINS_BITS 15 #define MAX_LOCKDEP_CHAINS_BITS 15
#define MAX_STACK_TRACE_ENTRIES 262144UL #define MAX_STACK_TRACE_ENTRIES 262144UL
#else #else
......
tmpfs-idr.patch
View file @ 51a0d3a9
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index f155dc607112..ed9ec5b43f7b 100644 index 20d815a33145..64354e89a701 100644
--- a/include/linux/shmem_fs.h --- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h
@@ -25,10 +25,13 @@ struct shmem_inode_info { @@ -26,10 +26,13 @@ struct shmem_inode_info {
}; };
struct shmem_sb_info { struct shmem_sb_info {
...@@ -20,10 +20,10 @@ index f155dc607112..ed9ec5b43f7b 100644 ...@@ -20,10 +20,10 @@ index f155dc607112..ed9ec5b43f7b 100644
umode_t mode; /* Mount mode for root directory */ umode_t mode; /* Mount mode for root directory */
unsigned char huge; /* Whether to try for hugepages */ unsigned char huge; /* Whether to try for hugepages */
diff --git a/mm/shmem.c b/mm/shmem.c diff --git a/mm/shmem.c b/mm/shmem.c
index 2c012eee133d..278df4da4d65 100644 index 2275a0ff7c30..0d0105d2d208 100644
--- a/mm/shmem.c --- a/mm/shmem.c
+++ b/mm/shmem.c +++ b/mm/shmem.c
@@ -112,11 +112,14 @@ static unsigned long shmem_default_max_blocks(void) @@ -113,11 +113,14 @@ static unsigned long shmem_default_max_blocks(void)
return totalram_pages() / 2; return totalram_pages() / 2;
} }
...@@ -40,7 +40,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -40,7 +40,7 @@ index 2c012eee133d..278df4da4d65 100644
} }
#endif #endif
@@ -1085,6 +1088,11 @@ static void shmem_evict_inode(struct inode *inode) @@ -1095,6 +1098,11 @@ static void shmem_evict_inode(struct inode *inode)
simple_xattrs_free(&info->xattrs); simple_xattrs_free(&info->xattrs);
WARN_ON(inode->i_blocks); WARN_ON(inode->i_blocks);
...@@ -52,7 +52,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -52,7 +52,7 @@ index 2c012eee133d..278df4da4d65 100644
shmem_free_inode(inode->i_sb); shmem_free_inode(inode->i_sb);
clear_inode(inode); clear_inode(inode);
} }
@@ -2141,13 +2149,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode @@ -2219,13 +2227,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
struct inode *inode; struct inode *inode;
struct shmem_inode_info *info; struct shmem_inode_info *info;
struct shmem_sb_info *sbinfo = SHMEM_SB(sb); struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
...@@ -67,7 +67,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -67,7 +67,7 @@ index 2c012eee133d..278df4da4d65 100644
inode_init_owner(inode, dir, mode); inode_init_owner(inode, dir, mode);
inode->i_blocks = 0; inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
@@ -2190,6 +2198,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode @@ -2269,6 +2277,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
break; break;
} }
...@@ -93,7 +93,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -93,7 +93,7 @@ index 2c012eee133d..278df4da4d65 100644
lockdep_annotate_inode_mutex_key(inode); lockdep_annotate_inode_mutex_key(inode);
} else } else
shmem_free_inode(sb); shmem_free_inode(sb);
@@ -3194,8 +3221,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) @@ -3274,8 +3301,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
static int shmem_match(struct inode *ino, void *vfh) static int shmem_match(struct inode *ino, void *vfh)
{ {
__u32 *fh = vfh; __u32 *fh = vfh;
...@@ -103,7 +103,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -103,7 +103,7 @@ index 2c012eee133d..278df4da4d65 100644
return ino->i_ino == inum && fh[0] == ino->i_generation; return ino->i_ino == inum && fh[0] == ino->i_generation;
} }
@@ -3215,14 +3241,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3295,14 +3321,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL; struct dentry *dentry = NULL;
u64 inum; u64 inum;
...@@ -121,7 +121,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -121,7 +121,7 @@ index 2c012eee133d..278df4da4d65 100644
if (inode) { if (inode) {
dentry = shmem_find_alias(inode); dentry = shmem_find_alias(inode);
iput(inode); iput(inode);
@@ -3234,30 +3257,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3314,30 +3337,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len, static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len,
struct inode *parent) struct inode *parent)
{ {
...@@ -155,7 +155,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -155,7 +155,7 @@ index 2c012eee133d..278df4da4d65 100644
return 1; return 1;
} }
@@ -3321,7 +3329,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo, @@ -3401,7 +3409,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
goto bad_val; goto bad_val;
} else if (!strcmp(this_char,"nr_inodes")) { } else if (!strcmp(this_char,"nr_inodes")) {
sbinfo->max_inodes = memparse(value, &rest); sbinfo->max_inodes = memparse(value, &rest);
...@@ -164,7 +164,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -164,7 +164,7 @@ index 2c012eee133d..278df4da4d65 100644
goto bad_val; goto bad_val;
} else if (!strcmp(this_char,"mode")) { } else if (!strcmp(this_char,"mode")) {
if (remount) if (remount)
@@ -3386,7 +3394,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data) @@ -3466,7 +3474,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
{ {
struct shmem_sb_info *sbinfo = SHMEM_SB(sb); struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
struct shmem_sb_info config = *sbinfo; struct shmem_sb_info config = *sbinfo;
...@@ -173,7 +173,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -173,7 +173,7 @@ index 2c012eee133d..278df4da4d65 100644
int error = -EINVAL; int error = -EINVAL;
config.mpol = NULL; config.mpol = NULL;
@@ -3435,7 +3443,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) @@ -3515,7 +3523,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
seq_printf(seq, ",size=%luk", seq_printf(seq, ",size=%luk",
sbinfo->max_blocks << (PAGE_SHIFT - 10)); sbinfo->max_blocks << (PAGE_SHIFT - 10));
if (sbinfo->max_inodes != shmem_default_max_inodes()) if (sbinfo->max_inodes != shmem_default_max_inodes())
...@@ -182,7 +182,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -182,7 +182,7 @@ index 2c012eee133d..278df4da4d65 100644
if (sbinfo->mode != (0777 | S_ISVTX)) if (sbinfo->mode != (0777 | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode); seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID)) if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -3459,6 +3467,8 @@ static void shmem_put_super(struct super_block *sb) @@ -3539,6 +3547,8 @@ static void shmem_put_super(struct super_block *sb)
{ {
struct shmem_sb_info *sbinfo = SHMEM_SB(sb); struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
...@@ -191,7 +191,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -191,7 +191,7 @@ index 2c012eee133d..278df4da4d65 100644
percpu_counter_destroy(&sbinfo->used_blocks); percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol); mpol_put(sbinfo->mpol);
kfree(sbinfo); kfree(sbinfo);
@@ -3477,6 +3487,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) @@ -3557,6 +3567,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
if (!sbinfo) if (!sbinfo)
return -ENOMEM; return -ENOMEM;
...@@ -200,7 +200,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -200,7 +200,7 @@ index 2c012eee133d..278df4da4d65 100644
sbinfo->mode = 0777 | S_ISVTX; sbinfo->mode = 0777 | S_ISVTX;
sbinfo->uid = current_fsuid(); sbinfo->uid = current_fsuid();
sbinfo->gid = current_fsgid(); sbinfo->gid = current_fsgid();
@@ -3584,6 +3596,15 @@ static void shmem_destroy_inodecache(void) @@ -3664,6 +3676,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep); kmem_cache_destroy(shmem_inode_cachep);
} }
...@@ -216,7 +216,7 @@ index 2c012eee133d..278df4da4d65 100644 ...@@ -216,7 +216,7 @@ index 2c012eee133d..278df4da4d65 100644
static const struct address_space_operations shmem_aops = { static const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage, .writepage = shmem_writepage,
.set_page_dirty = __set_page_dirty_no_writeback, .set_page_dirty = __set_page_dirty_no_writeback,
@@ -3714,6 +3735,7 @@ int __init shmem_init(void) @@ -3794,6 +3815,7 @@ int __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n"); pr_err("Could not kern_mount tmpfs\n");
goto out1; goto out1;
} }
......
vfs-ino.patch
View file @ 51a0d3a9
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
diff --git a/fs/inode.c b/fs/inode.c diff --git a/fs/inode.c b/fs/inode.c
index 73432e64f874..c1503fbadde0 100644 index 9a453f3637f8..d6887a6ad79f 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -869,6 +869,8 @@ unsigned int get_next_ino(void) @@ -869,6 +869,8 @@ unsigned int get_next_ino(void)
......
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