Skip to content

GitLab

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

5.x-rcN 20200518 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 69ec3b39
Show whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ 49f8d6ff
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index 5a5332b3591d..51301c0ab275 100644
index 091ec22c1a23..63a2784eaf01 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2919,6 +2919,19 @@ F: include/linux/audit.h
@@ -2946,6 +2946,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
......@@ -26,10 +26,10 @@ index 5a5332b3591d..51301c0ab275 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 739b372a5112..872e3b3a7693 100644
index da693e6a834e..0479902a0cd5 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -750,6 +750,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -753,6 +753,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}
......@@ -103,7 +103,7 @@ index 93d9252a00ab..7700c5e4783b 100644
if (inode->i_op->update_time)
return inode->i_op->update_time(inode, time, flags);
diff --git a/fs/namespace.c b/fs/namespace.c
index 85b5f7bea82e..c742051ba969 100644
index a28e4db075ed..12e725e34c6c 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -776,6 +776,12 @@ static inline int check_mnt(struct mount *mnt)
......@@ -120,10 +120,10 @@ index 85b5f7bea82e..c742051ba969 100644
* vfsmount lock must be held for write
*/
diff --git a/fs/read_write.c b/fs/read_write.c
index 59d819c5b92e..bcb853105beb 100644
index bbfa9b12b15e..5d684d7d2920 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -498,6 +498,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
@@ -499,6 +499,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
return -EINVAL;
}
......@@ -153,7 +153,7 @@ index 59d819c5b92e..bcb853105beb 100644
{
mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c
index d671936d0aad..b1f536d03c09 100644
index fd0a1e7e5959..15936ede85d3 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -849,8 +849,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
......@@ -194,10 +194,10 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644
if (wait)
sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index abedbffe2c9e..944485ac54b4 100644
index 45cc10cdf6dd..916efd7e612b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1350,6 +1350,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -1355,6 +1355,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int);
......@@ -205,7 +205,7 @@ index abedbffe2c9e..944485ac54b4 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp);
@@ -1842,6 +1843,7 @@ struct file_operations {
@@ -1847,6 +1848,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
......@@ -213,7 +213,7 @@ index abedbffe2c9e..944485ac54b4 100644
int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -1912,6 +1914,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
@@ -1917,6 +1919,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
......@@ -226,7 +226,7 @@ index abedbffe2c9e..944485ac54b4 100644
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
@@ -2344,6 +2352,7 @@ extern int current_umask(void);
@@ -2349,6 +2357,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode);
extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int);
......@@ -234,7 +234,7 @@ index abedbffe2c9e..944485ac54b4 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
@@ -2628,6 +2637,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
@@ -2633,6 +2642,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false;
}
#endif
......@@ -243,10 +243,10 @@ index abedbffe2c9e..944485ac54b4 100644
extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops;
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 664f52c6dd4c..f2208851f527 100644
index 206774ac6946..e5eda5226fbc 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -331,6 +331,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
@@ -376,6 +376,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key;
}
......@@ -255,7 +255,7 @@ index 664f52c6dd4c..f2208851f527 100644
/*
* Acquire a lock.
*
@@ -472,6 +474,7 @@ struct lockdep_map { };
@@ -521,6 +523,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0)
......@@ -283,10 +283,10 @@ index 35942084cd40..24f5fd1a789d 100644
extern const struct file_operations proc_mountinfo_operations;
extern const struct file_operations proc_mountstats_operations;
diff --git a/include/linux/splice.h b/include/linux/splice.h
index 74b4911ac16d..19789fbea567 100644
index ebbbfea48aa0..d68d57425028 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
@@ -90,4 +90,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
extern const struct pipe_buf_operations default_pipe_buf_ops;
......@@ -298,10 +298,10 @@ index 74b4911ac16d..19789fbea567 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 32406ef0d6a2..e52169c2086b 100644
index ac10db66cc63..837a3358e77c 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -153,7 +153,7 @@ static
@@ -169,7 +169,7 @@ static
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
......@@ -310,7 +310,7 @@ index 32406ef0d6a2..e52169c2086b 100644
{
unsigned int class_idx = hlock->class_idx;
@@ -174,6 +174,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
@@ -190,6 +190,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
......
aufs5-kbuild.patch
View file @ 49f8d6ff
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index 708ba336e689..84eedbf8654e 100644
index f08fbbfafd9a..1c597cddc351 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -266,6 +266,7 @@ source "fs/sysv/Kconfig"
@@ -267,6 +267,7 @@ source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/erofs/Kconfig"
source "fs/vboxsf/Kconfig"
......@@ -14,10 +14,10 @@ index 708ba336e689..84eedbf8654e 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
index 505e51166973..d53a5678fd7d 100644
index 2ce5112b02c8..d9b4a5198553 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -135,3 +135,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
@@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_EROFS_FS) += erofs/
obj-$(CONFIG_VBOXSF_FS) += vboxsf/
obj-$(CONFIG_ZONEFS_FS) += zonefs/
......
aufs5-loopback.patch
View file @ 49f8d6ff
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 872e3b3a7693..768100025129 100644
index 0479902a0cd5..758c8ee4d4e6 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -635,6 +635,15 @@ static inline void loop_update_dio(struct loop_device *lo)
@@ -638,6 +638,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio);
}
......@@ -21,7 +21,7 @@ index 872e3b3a7693..768100025129 100644
static void loop_reread_partitions(struct loop_device *lo,
struct block_device *bdev)
{
@@ -690,6 +699,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -693,6 +702,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
unsigned int arg)
{
struct file *file = NULL, *old_file;
......@@ -29,7 +29,7 @@ index 872e3b3a7693..768100025129 100644
int error;
bool partscan;
@@ -709,12 +719,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -712,12 +722,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
file = fget(arg);
if (!file)
goto out_err;
......@@ -49,7 +49,7 @@ index 872e3b3a7693..768100025129 100644
error = -EINVAL;
@@ -726,6 +743,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -729,6 +746,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
blk_mq_freeze_queue(lo->lo_queue);
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
lo->lo_backing_file = file;
......@@ -57,7 +57,7 @@ index 872e3b3a7693..768100025129 100644
lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
mapping_set_gfp_mask(file->f_mapping,
lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
@@ -739,6 +757,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -742,6 +760,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
......@@ -66,7 +66,7 @@ index 872e3b3a7693..768100025129 100644
if (partscan)
loop_reread_partitions(lo, bdev);
return 0;
@@ -747,6 +767,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -750,6 +770,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
mutex_unlock(&loop_ctl_mutex);
if (file)
fput(file);
......@@ -75,7 +75,7 @@ index 872e3b3a7693..768100025129 100644
return error;
}
@@ -951,7 +973,7 @@ static void loop_update_rotational(struct loop_device *lo)
@@ -973,7 +995,7 @@ static void loop_update_rotational(struct loop_device *lo)
static int loop_set_fd(struct loop_device *lo, fmode_t mode,
struct block_device *bdev, unsigned int arg)
{
......@@ -84,7 +84,7 @@ index 872e3b3a7693..768100025129 100644
struct inode *inode;
struct address_space *mapping;
struct block_device *claimed_bdev = NULL;
@@ -967,6 +989,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -989,6 +1011,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
file = fget(arg);
if (!file)
goto out;
......@@ -97,7 +97,7 @@ index 872e3b3a7693..768100025129 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
@@ -1015,6 +1043,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -1037,6 +1065,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
lo->lo_backing_file = file;
......@@ -105,7 +105,7 @@ index 872e3b3a7693..768100025129 100644
lo->transfer = NULL;
lo->ioctl = NULL;
lo->lo_sizelimit = 0;
@@ -1068,6 +1097,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -1090,6 +1119,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
bd_abort_claiming(bdev, claimed_bdev, loop_set_fd);
out_putf:
fput(file);
......@@ -114,7 +114,7 @@ index 872e3b3a7693..768100025129 100644
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
@@ -1114,6 +1145,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
@@ -1136,6 +1167,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
static int __loop_clr_fd(struct loop_device *lo, bool release)
{
struct file *filp = NULL;
......@@ -122,7 +122,7 @@ index 872e3b3a7693..768100025129 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
@@ -1137,6 +1169,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1159,6 +1191,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock);
lo->lo_backing_file = NULL;
......@@ -130,7 +130,7 @@ index 872e3b3a7693..768100025129 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
@@ -1220,6 +1253,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1242,6 +1275,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
......@@ -228,10 +228,10 @@ index 589dd0122020..801e0a7faec5 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 944485ac54b4..eccc62765e95 100644
index 916efd7e612b..68f536f42b2a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1980,6 +1980,10 @@ struct super_operations {
@@ -1985,6 +1985,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
......
aufs5-mmap.patch
View file @ 49f8d6ff
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
index c7c64272b0fa..76d99aea5ae2 100644
index eb2255e95f62..92f6062423c0 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2128,7 +2128,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
@@ -2162,7 +2162,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
rc = -ENOENT;
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
......@@ -31,10 +31,10 @@ index 14c2badb8fd9..65afe5287e43 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 3ba9ae83bff5..397c33e0acbe 100644
index 8d382d4ec067..93a768f754c9 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
const char *name = NULL;
if (file) {
......@@ -46,7 +46,7 @@ index 3ba9ae83bff5..397c33e0acbe 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1819,7 +1822,7 @@ static int show_numa_map(struct seq_file *m, void *v)
@@ -1787,7 +1790,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
......@@ -72,10 +72,10 @@ index 7907e6419e57..d17209cf52bc 100644
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index c54fb96cb1e6..393304f0526d 100644
index 5a323422d783..b62bf044d668 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1487,6 +1487,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -1677,6 +1677,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
......@@ -105,10 +105,10 @@ index c54fb96cb1e6..393304f0526d 100644
void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index c28911c3afa8..23d069c0e171 100644
index 4aba6c0c2ba8..974802987f69 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -267,6 +267,7 @@ struct vm_region {
@@ -272,6 +272,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */
......@@ -116,7 +116,7 @@ index c28911c3afa8..23d069c0e171 100644
int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
@@ -346,6 +347,7 @@ struct vm_area_struct {
@@ -351,6 +352,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */
struct file * vm_file; /* File we map to (can be NULL). */
......@@ -125,10 +125,10 @@ index c28911c3afa8..23d069c0e171 100644
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
index d90af13431c7..01316a9e226f 100644
index 8c700f881d92..f76083fea4dc 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -565,7 +565,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -568,7 +568,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping;
......@@ -138,10 +138,10 @@ index d90af13431c7..01316a9e226f 100644
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
index 272e66039e70..c8ff3d955c27 100644
index fccd3756b25f..51485ceec650 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -43,7 +43,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
@@ -44,7 +44,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
mm_init.o mmu_context.o percpu.o slab_common.o \
compaction.o vmacache.o \
interval_tree.o list_lru.o workingset.o \
......@@ -151,10 +151,10 @@ index 272e66039e70..c8ff3d955c27 100644
# Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c
index 1784478270e1..fb03735cd00e 100644
index 23a051a7ef0f..e2fe9132feb2 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2653,7 +2653,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -2660,7 +2660,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
......@@ -164,10 +164,10 @@ index 1784478270e1..fb03735cd00e 100644
if (page->mapping != inode->i_mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
index d681a20eb4ea..36c80ae89cee 100644
index f609e9ec4a25..d554b349c653 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -176,7 +176,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
......@@ -176,7 +176,7 @@ index d681a20eb4ea..36c80ae89cee 100644
mpol_put(vma_policy(vma));
vm_area_free(vma);
return next;
@@ -907,7 +907,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
@@ -910,7 +910,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
if (remove_next) {
if (file) {
uprobe_munmap(next, next->vm_start, next->vm_end);
......@@ -185,7 +185,7 @@ index d681a20eb4ea..36c80ae89cee 100644
}
if (next->anon_vma)
anon_vma_merge(vma, next);
@@ -1829,8 +1829,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
@@ -1831,8 +1831,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
......@@ -195,7 +195,7 @@ index d681a20eb4ea..36c80ae89cee 100644
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
@@ -2659,7 +2659,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2683,7 +2683,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
......@@ -204,7 +204,7 @@ index d681a20eb4ea..36c80ae89cee 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -2678,7 +2678,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2702,7 +2702,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new);
if (new->vm_file)
......@@ -213,7 +213,7 @@ index d681a20eb4ea..36c80ae89cee 100644
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
@@ -2870,7 +2870,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -2894,7 +2894,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma;
unsigned long populate = 0;
unsigned long ret = -EINVAL;
......@@ -222,7 +222,7 @@ index d681a20eb4ea..36c80ae89cee 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid);
@@ -2945,10 +2945,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -2969,10 +2969,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
}
}
......@@ -251,7 +251,7 @@ index d681a20eb4ea..36c80ae89cee 100644
out:
up_write(&mm->mmap_sem);
if (populate)
@@ -3239,7 +3256,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
@@ -3263,7 +3280,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma))
goto out_free_mempol;
if (new_vma->vm_file)
......
aufs5-standalone.patch
View file @ 49f8d6ff
......@@ -22,7 +22,7 @@ index 046000653e4d..15aa871d1b45 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
index db17be51b112..4bb61917a29a 100644
index 06b4c550af5d..afb0213b0c2c 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
......@@ -78,7 +78,7 @@ index 7700c5e4783b..6284b41fcf3f 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index c742051ba969..e02a680b7fe9 100644
index 12e725e34c6c..fa17b9d5926b 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
......@@ -118,7 +118,7 @@ index 133f723aca07..0b9f7f6d8390 100644
/*
* Drop a reference to a group. Free it if it's through.
diff --git a/fs/open.c b/fs/open.c
index b69d6eed67e6..cb777a1888f7 100644
index 719b320ede52..f88ce55c1c99 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
......@@ -130,10 +130,10 @@ index b69d6eed67e6..cb777a1888f7 100644
long vfs_truncate(const struct path *path, loff_t length)
{
diff --git a/fs/read_write.c b/fs/read_write.c
index bcb853105beb..e54db6078e3f 100644
index 5d684d7d2920..6f61c0b6aa66 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
@@ -469,6 +469,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
return ret;
}
......@@ -141,7 +141,7 @@ index bcb853105beb..e54db6078e3f 100644
static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
{
@@ -508,6 +509,7 @@ vfs_readf_t vfs_readf(struct file *file)
@@ -509,6 +510,7 @@ vfs_readf_t vfs_readf(struct file *file)
return new_sync_read;
return ERR_PTR(-ENOSYS); /* doesn't have ->read(|_iter)() op */
}
......@@ -149,7 +149,7 @@ index bcb853105beb..e54db6078e3f 100644
vfs_writef_t vfs_writef(struct file *file)
{
@@ -519,6 +521,7 @@ vfs_writef_t vfs_writef(struct file *file)
@@ -520,6 +522,7 @@ vfs_writef_t vfs_writef(struct file *file)
return new_sync_write;
return ERR_PTR(-ENOSYS); /* doesn't have ->write(|_iter)() op */
}
......@@ -157,7 +157,7 @@ index bcb853105beb..e54db6078e3f 100644
ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
{
@@ -588,6 +591,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
@@ -589,6 +592,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
return ret;
}
......@@ -166,7 +166,7 @@ index bcb853105beb..e54db6078e3f 100644
/* file_ppos returns &file->f_pos or NULL if file is stream */
static inline loff_t *file_ppos(struct file *file)
diff --git a/fs/splice.c b/fs/splice.c
index b1f536d03c09..0872306175b4 100644
index 15936ede85d3..ad4b04977557 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -862,6 +862,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
......@@ -198,7 +198,7 @@ index 457f4e4a5cc1..67c66358f3fe 100644
/*
* Write out and wait upon all dirty data associated with this
diff --git a/fs/xattr.c b/fs/xattr.c
index 90dd78f0eb27..40b01dd1b14a 100644
index e13265e65871..204b47bb0542 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
......@@ -210,10 +210,10 @@ index 90dd78f0eb27..40b01dd1b14a 100644
ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index e52169c2086b..d9bc5cbe9078 100644
index 837a3358e77c..715ba9c1b91a 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -174,6 +174,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -190,6 +190,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
......@@ -222,19 +222,19 @@ index e52169c2086b..d9bc5cbe9078 100644
#ifdef CONFIG_LOCK_STAT
diff --git a/kernel/task_work.c b/kernel/task_work.c
index 0fef395662a6..83fb1ecfc33d 100644
index 825f28259a19..b77593b29c1a 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
@@ -116,3 +116,4 @@ void task_work_run(void)
@@ -126,3 +126,4 @@ void task_work_run(void)
} while (work);
}
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c
index 565bc9b67276..248a63945e9f 100644
index 7fed24b9d57e..b20a759ba8de 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1068,6 +1068,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
@@ -1087,6 +1087,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
}
......@@ -242,7 +242,7 @@ index 565bc9b67276..248a63945e9f 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry)
{
@@ -1084,6 +1085,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
@@ -1103,6 +1104,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name);
}
......@@ -250,7 +250,7 @@ index 565bc9b67276..248a63945e9f 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
@@ -1092,6 +1094,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
@@ -1111,6 +1113,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
}
......@@ -258,7 +258,7 @@ index 565bc9b67276..248a63945e9f 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
@@ -1119,6 +1122,7 @@ int security_path_truncate(const struct path *path)
@@ -1138,6 +1141,7 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
......@@ -266,7 +266,7 @@ index 565bc9b67276..248a63945e9f 100644
int security_path_chmod(const struct path *path, umode_t mode)
{
@@ -1126,6 +1130,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
@@ -1145,6 +1149,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
......@@ -274,7 +274,7 @@ index 565bc9b67276..248a63945e9f 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
@@ -1133,6 +1138,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
@@ -1152,6 +1157,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
return 0;
return call_int_hook(path_chown, 0, path, uid, gid);
}
......@@ -282,7 +282,7 @@ index 565bc9b67276..248a63945e9f 100644
int security_path_chroot(const struct path *path)
{
@@ -1233,6 +1239,7 @@ int security_inode_permission(struct inode *inode, int mask)
@@ -1252,6 +1258,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return call_int_hook(inode_permission, 0, inode, mask);
}
......@@ -290,7 +290,7 @@ index 565bc9b67276..248a63945e9f 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
@@ -1410,6 +1417,7 @@ int security_file_permission(struct file *file, int mask)
@@ -1429,6 +1436,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
......
include/uapi/linux/aufs_type.h
View file @ 49f8d6ff
......@@ -40,7 +40,7 @@
#include <limits.h>
#endif /* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN-20200413"
#define AUFS_VERSION "5.x-rcN-20200518"
/* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
lockdep-debug.patch
View file @ 49f8d6ff
......@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN lockdep patch
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index f2208851f527..81018ccaa94a 100644
index e5eda5226fbc..761f87256a9f 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -17,7 +17,7 @@ struct lockdep_map;
......@@ -15,11 +15,11 @@ index f2208851f527..81018ccaa94a 100644
#include <linux/types.h>
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index d9bc5cbe9078..30cdce225406 100644
index 715ba9c1b91a..9caea35fb957 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index 18d85aebbb57..1fe552a33fb1 100644
index baca699b94e9..11ebf13738f4 100644
--- a/kernel/locking/lockdep_internals.h
+++ b/kernel/locking/lockdep_internals.h
@@ -94,15 +94,15 @@ static const unsigned long LOCKF_USED_IN_IRQ_READ =
......
proc_mounts.patch
View file @ 49f8d6ff
......@@ -16,7 +16,7 @@ index 711a4093e475..a5703d5c7205 100644
extern const struct seq_operations mounts_op;
diff --git a/fs/namespace.c b/fs/namespace.c
index 85b5f7bea82e..ff398173c36f 100644
index a28e4db075ed..14fdd03edd0a 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1246,46 +1246,80 @@ struct vfsmount *mnt_clone_internal(const struct path *path)
......
tmpfs-idr.patch
View file @ 49f8d6ff
SPDX-License-Identifier: GPL-2.0
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index d56fefef8905..a02150911167 100644
index 7a35a6901221..b7af7d8bfa48 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -27,10 +27,13 @@ struct shmem_inode_info {
......@@ -21,7 +21,7 @@ index d56fefef8905..a02150911167 100644
umode_t mode; /* Mount mode for root directory */
unsigned char huge; /* Whether to try for hugepages */
diff --git a/mm/shmem.c b/mm/shmem.c
index aad3ba74b0e9..b03afb79fa59 100644
index bd8840082c94..7f29f8cb3921 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -110,7 +110,7 @@ struct shmem_falloc {
......@@ -50,7 +50,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
}
#endif
@@ -1112,6 +1115,11 @@ static void shmem_evict_inode(struct inode *inode)
@@ -1100,6 +1103,11 @@ static void shmem_evict_inode(struct inode *inode)
simple_xattrs_free(&info->xattrs);
WARN_ON(inode->i_blocks);
......@@ -62,7 +62,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
shmem_free_inode(inode->i_sb);
clear_inode(inode);
}
@@ -2242,13 +2250,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
@@ -2240,13 +2248,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
struct inode *inode;
struct shmem_inode_info *info;
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
......@@ -77,7 +77,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
inode_init_owner(inode, dir, mode);
inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
@@ -2292,6 +2300,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
@@ -2290,6 +2298,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
break;
}
......@@ -103,7 +103,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
lockdep_annotate_inode_mutex_key(inode);
} else
shmem_free_inode(sb);
@@ -3297,8 +3324,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
@@ -3292,8 +3319,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
static int shmem_match(struct inode *ino, void *vfh)
{
__u32 *fh = vfh;
......@@ -113,7 +113,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
return ino->i_ino == inum && fh[0] == ino->i_generation;
}
@@ -3318,14 +3344,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3313,14 +3339,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL;
u64 inum;
......@@ -131,7 +131,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
if (inode) {
dentry = shmem_find_alias(inode);
iput(inode);
@@ -3337,30 +3360,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3332,30 +3355,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len,
struct inode *parent)
{
......@@ -165,7 +165,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
return 1;
}
@@ -3435,7 +3443,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
@@ -3430,7 +3438,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
break;
case Opt_nr_inodes:
ctx->inodes = memparse(param->string, &rest);
......@@ -174,7 +174,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES;
break;
@@ -3533,7 +3541,7 @@ static int shmem_reconfigure(struct fs_context *fc)
@@ -3528,7 +3536,7 @@ static int shmem_reconfigure(struct fs_context *fc)
{
struct shmem_options *ctx = fc->fs_private;
struct shmem_sb_info *sbinfo = SHMEM_SB(fc->root->d_sb);
......@@ -183,7 +183,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
const char *err;
spin_lock(&sbinfo->stat_lock);
@@ -3592,7 +3600,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
@@ -3587,7 +3595,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
seq_printf(seq, ",size=%luk",
sbinfo->max_blocks << (PAGE_SHIFT - 10));
if (sbinfo->max_inodes != shmem_default_max_inodes())
......@@ -192,7 +192,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
if (sbinfo->mode != (0777 | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -3616,6 +3624,8 @@ static void shmem_put_super(struct super_block *sb)
@@ -3611,6 +3619,8 @@ static void shmem_put_super(struct super_block *sb)
{
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
......@@ -201,7 +201,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol);
kfree(sbinfo);
@@ -3656,6 +3666,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
@@ -3651,6 +3661,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
#else
sb->s_flags |= SB_NOUSER;
#endif
......@@ -210,7 +210,7 @@ index aad3ba74b0e9..b03afb79fa59 100644
sbinfo->max_blocks = ctx->blocks;
sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes;
sbinfo->uid = ctx->uid;
@@ -3767,6 +3779,15 @@ static void shmem_destroy_inodecache(void)
@@ -3762,6 +3774,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep);
}
......@@ -226,11 +226,11 @@ index aad3ba74b0e9..b03afb79fa59 100644
static const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage,
.set_page_dirty = __set_page_dirty_no_writeback,
@@ -3907,6 +3928,7 @@ int __init shmem_init(void)
@@ -3902,6 +3923,7 @@ int __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n");
goto out1;
}
+ shmem_no_idr(shm_mnt->mnt_sb);
#ifdef CONFIG_TRANSPARENT_HUGE_PAGECACHE
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
if (has_transparent_hugepage() && shmem_huge > SHMEM_HUGE_DENY)
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