Skip to content

GitLab

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

aufs5.x-rcN 20190805 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 200d30c0
Hide whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ 3326ef69
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index 677ef41cb012..c2a7491ddc68 100644
index 6426db5198f0..332a330a8614 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2769,6 +2769,19 @@ F: include/linux/audit.h
@@ -2818,6 +2818,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
......@@ -26,10 +26,10 @@ index 677ef41cb012..c2a7491ddc68 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 f11b7dc16e9d..1b723737592b 100644
index 44c9985f352a..fc0584d8b8fd 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -746,6 +746,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,
return error;
}
......@@ -55,10 +55,10 @@ index f11b7dc16e9d..1b723737592b 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
index c435398f2c81..a688a042d022 100644
index e88cf0554e65..7ce4ccf5a51c 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1247,7 +1247,7 @@ enum d_walk_ret {
@@ -1264,7 +1264,7 @@ enum d_walk_ret {
*
* The @enter() callbacks are called with d_lock held.
*/
......@@ -90,7 +90,7 @@ index 3d40771e8e7c..d62303c5472a 100644
return error;
diff --git a/fs/inode.c b/fs/inode.c
index 2bf21e2c90fc..9b908c37971f 100644
index 0f1e3b563c47..43df8452f97d 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1670,7 +1670,7 @@ EXPORT_SYMBOL(generic_update_time);
......@@ -103,10 +103,10 @@ index 2bf21e2c90fc..9b908c37971f 100644
int (*update_time)(struct inode *, struct timespec64 *, int);
diff --git a/fs/namespace.c b/fs/namespace.c
index 6fbc9126367a..101dda59f39c 100644
index d28d30b13043..34c8093ddb1d 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -776,6 +776,12 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns;
}
......@@ -120,7 +120,7 @@ index 6fbc9126367a..101dda59f39c 100644
* vfsmount lock must be held for write
*/
diff --git a/fs/read_write.c b/fs/read_write.c
index c543d965e288..35ab54e0a994 100644
index 1f5088dec566..f84e1d9c2434 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,
......@@ -153,7 +153,7 @@ index c543d965e288..35ab54e0a994 100644
{
mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c
index 14cb602d9a2f..58d2692c5f30 100644
index 98412721f056..75b489fcb66f 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -834,8 +834,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 f7fdfe93e25d..28593b894e7b 100644
index 56b8e358af5c..5e914b18a5a2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1333,6 +1333,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -1331,6 +1331,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 f7fdfe93e25d..28593b894e7b 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);
@@ -1812,6 +1813,7 @@ struct file_operations {
@@ -1810,6 +1811,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 f7fdfe93e25d..28593b894e7b 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);
@@ -1882,6 +1884,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
@@ -1880,6 +1882,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 f7fdfe93e25d..28593b894e7b 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 *);
@@ -2315,6 +2323,7 @@ extern int current_umask(void);
@@ -2298,6 +2306,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 f7fdfe93e25d..28593b894e7b 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
@@ -2603,6 +2612,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
@@ -2586,6 +2595,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false;
}
#endif
......@@ -243,10 +243,10 @@ index f7fdfe93e25d..28593b894e7b 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 6e2377e6c1d6..5a945d18a72a 100644
index 0b0d7259276d..12d18e180348 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -325,6 +325,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
@@ -334,6 +334,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key;
}
......@@ -255,7 +255,7 @@ index 6e2377e6c1d6..5a945d18a72a 100644
/*
* Acquire a lock.
*
@@ -463,6 +465,7 @@ struct lockdep_map { };
@@ -476,6 +478,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0)
......@@ -298,21 +298,21 @@ index 74b4911ac16d..19789fbea567 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index c47788fa85f9..3c35a1059890 100644
index 4861cf8e274b..ec87ccf82025 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -152,7 +152,7 @@ static
#endif
@@ -153,7 +153,7 @@ static
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
-static inline struct lock_class *hlock_class(struct held_lock *hlock)
+inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
{
if (!hlock->class_idx) {
/*
@@ -163,6 +163,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
}
return lock_classes + hlock->class_idx - 1;
unsigned int class_idx = hlock->class_idx;
@@ -174,6 +174,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
+#define hlock_class(hlock) lockdep_hlock_class(hlock)
......
aufs5-kbuild.patch
View file @ 3326ef69
......@@ -14,7 +14,7 @@ index bfb1c6095c7a..bddba5bb307e 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
index c9aea23aba56..57c6f47b0185 100644
index d60089fd689b..924c16a40b00 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -130,3 +130,4 @@ obj-$(CONFIG_F2FS_FS) += f2fs/
......
aufs5-loopback.patch
View file @ 3326ef69
......@@ -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 1b723737592b..16561a96019c 100644
index fc0584d8b8fd..07e358fffcdb 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -633,6 +633,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)
lo->use_dio);
}
......@@ -21,7 +21,7 @@ index 1b723737592b..16561a96019c 100644
static void loop_reread_partitions(struct loop_device *lo,
struct block_device *bdev)
{
@@ -686,6 +695,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -678,6 +687,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
unsigned int arg)
{
struct file *file = NULL, *old_file;
......@@ -29,7 +29,7 @@ index 1b723737592b..16561a96019c 100644
int error;
bool partscan;
@@ -705,12 +715,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -697,12 +707,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 1b723737592b..16561a96019c 100644
error = -EINVAL;
@@ -722,6 +739,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -714,6 +731,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 1b723737592b..16561a96019c 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));
@@ -735,6 +753,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -727,6 +745,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
......@@ -66,7 +66,7 @@ index 1b723737592b..16561a96019c 100644
if (partscan)
loop_reread_partitions(lo, bdev);
return 0;
@@ -743,6 +763,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -735,6 +755,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 1b723737592b..16561a96019c 100644
return error;
}
@@ -947,7 +969,7 @@ static void loop_update_rotational(struct loop_device *lo)
@@ -939,7 +961,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 1b723737592b..16561a96019c 100644
struct inode *inode;
struct address_space *mapping;
int lo_flags = 0;
@@ -962,6 +984,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -954,6 +976,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 1b723737592b..16561a96019c 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
@@ -1009,6 +1037,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -1001,6 +1029,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 1b723737592b..16561a96019c 100644
lo->transfer = NULL;
lo->ioctl = NULL;
lo->lo_sizelimit = 0;
@@ -1052,6 +1081,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
@@ -1044,6 +1073,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
blkdev_put(bdev, mode | FMODE_EXCL);
out_putf:
fput(file);
......@@ -114,7 +114,7 @@ index 1b723737592b..16561a96019c 100644
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
@@ -1098,6 +1129,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
@@ -1090,6 +1121,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 1b723737592b..16561a96019c 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
@@ -1121,6 +1153,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1113,6 +1145,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 1b723737592b..16561a96019c 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
@@ -1203,6 +1236,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1195,6 +1228,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
......@@ -228,10 +228,10 @@ index a97e2921cb09..f74eb6962684 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 28593b894e7b..bdc2611787df 100644
index 5e914b18a5a2..22213471e105 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1947,6 +1947,10 @@ struct super_operations {
@@ -1948,6 +1948,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
......
aufs5-mmap.patch
View file @ 3326ef69
......@@ -2,11 +2,11 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 255f6754c70d..2c009be14898 100644
index ebea9501afb8..dc7edc5f7267 100644
--- a/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)
down_read(&mm->mmap_sem);
@@ -2037,7 +2037,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) {
- *path = vma->vm_file->f_path;
......@@ -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 01d4eb0e6bd1..fedfaa012768 100644
index 731642e0f5a0..e8d6259de65b 100644
--- a/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)
@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
const char *name = NULL;
if (file) {
......@@ -46,7 +46,7 @@ index 01d4eb0e6bd1..fedfaa012768 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1761,7 +1764,7 @@ static int show_numa_map(struct seq_file *m, void *v)
@@ -1807,7 +1810,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;
......@@ -56,7 +56,7 @@ index 01d4eb0e6bd1..fedfaa012768 100644
struct mm_walk walk = {
.hugetlb_entry = gather_hugetlb_stats,
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 36bf0f2e102e..8df6cbc58756 100644
index 7907e6419e57..d17209cf52bc 100644
--- a/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)
......@@ -72,10 +72,10 @@ index 36bf0f2e102e..8df6cbc58756 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 dd0b5f4e1e45..22030c24191e 100644
index 0334ca97c584..3bdae823daee 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1553,6 +1553,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -1538,6 +1538,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
......@@ -105,7 +105,7 @@ index dd0b5f4e1e45..22030c24191e 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 8ec38b11b361..d3f5492a2611 100644
index 3a37a89eb7a7..cb5e5ebe4dcf 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -253,6 +253,7 @@ struct vm_region {
......@@ -123,9 +123,9 @@ index 8ec38b11b361..d3f5492a2611 100644
+ struct file *vm_prfile; /* shadow of vm_file */
void * vm_private_data; /* was vm_pte (shared mem) */
atomic_long_t swap_readahead_info;
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
index fe83343da24b..1ef95aa1dc6e 100644
index 2852d0e76ea3..7b7f676b6465 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -553,7 +553,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
......@@ -138,23 +138,23 @@ index fe83343da24b..1ef95aa1dc6e 100644
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
index ac5e5ba78874..5decb22d13a0 100644
index 338e528ad436..ee91e8c78606 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -39,7 +39,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 \
- debug.o $(mmu-y)
+ prfile.o debug.o $(mmu-y)
- debug.o gup.o $(mmu-y)
+ prfile.o debug.o gup.o $(mmu-y)
# 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 6dd9a2274c80..ede6d4892a9c 100644
index d0cf700bf201..5cac93e7bf67 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2701,7 +2701,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -2721,7 +2721,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
......@@ -261,10 +261,10 @@ index 7e8c3e8ae75f..d8a903f61262 100644
new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c
index d8c02fbe03b5..22dae8b7216a 100644
index fed1b6e9c89b..0d43b248ed54 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -640,7 +640,7 @@ static void __put_nommu_region(struct vm_region *region)
@@ -552,7 +552,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);
if (region->vm_file)
......@@ -273,7 +273,7 @@ index d8c02fbe03b5..22dae8b7216a 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
@@ -778,7 +778,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
@@ -690,7 +690,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
......@@ -282,7 +282,7 @@ index d8c02fbe03b5..22dae8b7216a 100644
put_nommu_region(vma->vm_region);
vm_area_free(vma);
}
@@ -1301,7 +1301,7 @@ unsigned long do_mmap(struct file *file,
@@ -1213,7 +1213,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
......@@ -291,7 +291,7 @@ index d8c02fbe03b5..22dae8b7216a 100644
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
@@ -1376,10 +1376,10 @@ unsigned long do_mmap(struct file *file,
@@ -1290,10 +1290,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem);
error:
if (region->vm_file)
......
aufs5-standalone.patch
View file @ 3326ef69
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
index a688a042d022..3fc74e471924 100644
index 7ce4ccf5a51c..00d7e6a08026 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1352,6 +1352,7 @@ void d_walk(struct dentry *parent, void *data,
@@ -1369,6 +1369,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
......@@ -13,7 +13,7 @@ index a688a042d022..3fc74e471924 100644
struct check_mount {
struct vfsmount *mnt;
@@ -2850,6 +2851,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
@@ -2914,6 +2915,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock);
}
......@@ -22,7 +22,7 @@ index a688a042d022..3fc74e471924 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
index 89a500bb897a..1a722915ed77 100644
index f7f6a140856a..1a740f3c42ba 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -110,6 +110,7 @@ bool path_noexec(const struct path *path)
......@@ -74,7 +74,7 @@ index b07b53f24ff5..34b9bbf4c556 100644
void __init files_init(void)
{
diff --git a/fs/inode.c b/fs/inode.c
index 9b908c37971f..ed54d3759219 100644
index 43df8452f97d..8a5c14630ff0 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1679,6 +1679,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
......@@ -86,10 +86,10 @@ index 9b908c37971f..ed54d3759219 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index 101dda59f39c..6cb11bd6ff9a 100644
index 34c8093ddb1d..2b64af58b643 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -436,6 +436,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
mnt_dec_writers(real_mount(mnt));
preempt_enable();
}
......@@ -97,7 +97,7 @@ index 101dda59f39c..6cb11bd6ff9a 100644
/**
* mnt_drop_write - give up write access to a mount
@@ -775,6 +776,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
@@ -781,6 +782,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
{
return check_mnt(real_mount(mnt));
}
......@@ -105,7 +105,7 @@ index 101dda59f39c..6cb11bd6ff9a 100644
/*
* vfsmount lock must be held for write
@@ -1908,6 +1910,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
@@ -1900,6 +1902,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
......@@ -178,7 +178,7 @@ index 99ddd126f6f0..2154d69a2c7a 100644
/*
* Destroy all marks in destroy_list, waits for SRCU period to finish before
diff --git a/fs/open.c b/fs/open.c
index b5b80469b93d..eb818f6b9519 100644
index a59abe3c669a..78809163ba03 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,
......@@ -190,7 +190,7 @@ index b5b80469b93d..eb818f6b9519 100644
long vfs_truncate(const struct path *path, loff_t length)
{
diff --git a/fs/read_write.c b/fs/read_write.c
index 35ab54e0a994..9da238d64ea4 100644
index f84e1d9c2434..967469cfaa47 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)
......@@ -226,7 +226,7 @@ index 35ab54e0a994..9da238d64ea4 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 58d2692c5f30..4fe4afa7f6b1 100644
index 75b489fcb66f..0a1f7498c22b 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -847,6 +847,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
......@@ -270,12 +270,12 @@ 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 3c35a1059890..67dccde036a2 100644
index ec87ccf82025..739d1c8a81f5 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -163,6 +163,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
}
return lock_classes + hlock->class_idx - 1;
@@ -174,6 +174,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
+EXPORT_SYMBOL_GPL(lockdep_hlock_class);
#define hlock_class(hlock) lockdep_hlock_class(hlock)
......@@ -291,7 +291,7 @@ index 0fef395662a6..83fb1ecfc33d 100644
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index dc28914fa72e..c2ddfea2b280 100644
index 725674f3276d..83f6494c52a2 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -824,3 +824,4 @@ int __devcgroup_check_permission(short type, u32 major, u32 minor,
......@@ -300,10 +300,10 @@ index dc28914fa72e..c2ddfea2b280 100644
}
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c
index f493db0bf62a..96f118be469f 100644
index 250ee2d76406..2765042d4846 100644
--- a/security/security.c
+++ b/security/security.c
@@ -993,6 +993,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
@@ -996,6 +996,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
}
......@@ -311,7 +311,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry)
{
@@ -1009,6 +1010,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
@@ -1012,6 +1013,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);
}
......@@ -319,7 +319,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
@@ -1017,6 +1019,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
@@ -1020,6 +1022,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);
}
......@@ -327,7 +327,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
@@ -1044,6 +1047,7 @@ int security_path_truncate(const struct path *path)
@@ -1047,6 +1050,7 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
......@@ -335,7 +335,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_chmod(const struct path *path, umode_t mode)
{
@@ -1051,6 +1055,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
@@ -1054,6 +1058,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
......@@ -343,7 +343,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
@@ -1058,6 +1063,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
@@ -1061,6 +1066,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);
}
......@@ -351,7 +351,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_chroot(const struct path *path)
{
@@ -1158,6 +1164,7 @@ int security_inode_permission(struct inode *inode, int mask)
@@ -1161,6 +1167,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return call_int_hook(inode_permission, 0, inode, mask);
}
......@@ -359,7 +359,7 @@ index f493db0bf62a..96f118be469f 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
@@ -1335,6 +1342,7 @@ int security_file_permission(struct file *file, int mask)
@@ -1338,6 +1345,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
......
include/uapi/linux/aufs_type.h
View file @ 3326ef69
......@@ -40,7 +40,7 @@
#include <linux/limits.h>
#define AUFS_VERSION "5.x-rcN-20190715"
#define AUFS_VERSION "5.x-rcN-20190805"
/* 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 @ 3326ef69
......@@ -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 5a945d18a72a..c6def416ec11 100644
index 12d18e180348..2dec42066e7a 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -17,7 +17,7 @@ struct lockdep_map;
......@@ -15,10 +15,10 @@ index 5a945d18a72a..c6def416ec11 100644
#include <linux/types.h>
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 67dccde036a2..7344fb25a11f 100644
index 739d1c8a81f5..f147a14a977c 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4587,6 +4593,7 @@ void lockdep_reset(void)
@@ -4692,6 +4698,7 @@ void lockdep_reset(void)
INIT_HLIST_HEAD(chainhash_table + i);
raw_local_irq_restore(flags);
}
......@@ -27,7 +27,7 @@ index 67dccde036a2..7344fb25a11f 100644
/* Remove a class from a lock chain. Must be called with the graph lock held. */
static void remove_class_from_lock_chain(struct pending_free *pf,
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index 150ec3f0c5b5..e65c1d0b1ac1 100644
index cc83568d5012..68a74964daa1 100644
--- a/kernel/locking/lockdep_internals.h
+++ b/kernel/locking/lockdep_internals.h
@@ -93,15 +93,15 @@ static const unsigned long LOCKF_USED_IN_IRQ_READ =
......
proc_mounts.patch
View file @ 3326ef69
SPDX-License-Identifier: GPL-2.0
diff --git a/fs/mount.h b/fs/mount.h
index 6250de544760..29abfea2db50 100644
index 711a4093e475..e8eae71ade24 100644
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -131,9 +131,7 @@ struct proc_mounts {
@@ -133,9 +133,7 @@ struct proc_mounts {
struct mnt_namespace *ns;
struct path root;
int (*show)(struct seq_file *, struct vfsmount *);
......@@ -15,10 +15,10 @@ index 6250de544760..29abfea2db50 100644
extern const struct seq_operations mounts_op;
diff --git a/fs/namespace.c b/fs/namespace.c
index 6fbc9126367a..36d8b8ac5be5 100644
index d28d30b13043..0f4bbbdb137d 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1260,46 +1260,78 @@ struct vfsmount *mnt_clone_internal(const struct path *path)
@@ -1246,46 +1246,78 @@ struct vfsmount *mnt_clone_internal(const struct path *path)
#ifdef CONFIG_PROC_FS
/* iterator; we want it to have access to namespace_sem, thus here... */
......
tmpfs-idr.patch
View file @ 3326ef69
......@@ -20,7 +20,7 @@ index 20d815a33145..64354e89a701 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 f4dce9c8670d..f3aa3ba78635 100644
index 626d8c74b973..7115bcfeefc8 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -113,11 +113,14 @@ static unsigned long shmem_default_max_blocks(void)
......@@ -40,7 +40,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
}
#endif
@@ -1095,6 +1098,11 @@ static void shmem_evict_inode(struct inode *inode)
@@ -1097,6 +1100,11 @@ static void shmem_evict_inode(struct inode *inode)
simple_xattrs_free(&info->xattrs);
WARN_ON(inode->i_blocks);
......@@ -52,7 +52,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
shmem_free_inode(inode->i_sb);
clear_inode(inode);
}
@@ -2219,13 +2227,13 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
@@ -2221,13 +2229,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);
......@@ -67,7 +67,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
inode_init_owner(inode, dir, mode);
inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
@@ -2269,6 +2277,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
@@ -2271,6 +2279,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
break;
}
......@@ -93,7 +93,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
lockdep_annotate_inode_mutex_key(inode);
} else
shmem_free_inode(sb);
@@ -3274,8 +3301,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
@@ -3276,8 +3303,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
static int shmem_match(struct inode *ino, void *vfh)
{
__u32 *fh = vfh;
......@@ -103,7 +103,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
return ino->i_ino == inum && fh[0] == ino->i_generation;
}
@@ -3295,14 +3321,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3297,14 +3323,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL;
u64 inum;
......@@ -121,7 +121,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
if (inode) {
dentry = shmem_find_alias(inode);
iput(inode);
@@ -3314,30 +3337,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3316,30 +3339,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)
{
......@@ -155,7 +155,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
return 1;
}
@@ -3401,7 +3409,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
@@ -3403,7 +3411,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
goto bad_val;
} else if (!strcmp(this_char,"nr_inodes")) {
sbinfo->max_inodes = memparse(value, &rest);
......@@ -164,7 +164,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
goto bad_val;
} else if (!strcmp(this_char,"mode")) {
if (remount)
@@ -3466,7 +3474,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
@@ -3468,7 +3476,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 config = *sbinfo;
......@@ -173,7 +173,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
int error = -EINVAL;
config.mpol = NULL;
@@ -3515,7 +3523,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
@@ -3517,7 +3525,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())
......@@ -182,7 +182,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
if (sbinfo->mode != (0777 | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -3539,6 +3547,8 @@ static void shmem_put_super(struct super_block *sb)
@@ -3541,6 +3549,8 @@ static void shmem_put_super(struct super_block *sb)
{
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
......@@ -191,7 +191,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol);
kfree(sbinfo);
@@ -3557,6 +3567,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
@@ -3559,6 +3569,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
if (!sbinfo)
return -ENOMEM;
......@@ -200,7 +200,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
sbinfo->mode = 0777 | S_ISVTX;
sbinfo->uid = current_fsuid();
sbinfo->gid = current_fsgid();
@@ -3662,6 +3674,15 @@ static void shmem_destroy_inodecache(void)
@@ -3664,6 +3676,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep);
}
......@@ -216,7 +216,7 @@ index f4dce9c8670d..f3aa3ba78635 100644
static const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage,
.set_page_dirty = __set_page_dirty_no_writeback,
@@ -3793,6 +3814,7 @@ int __init shmem_init(void)
@@ -3791,6 +3812,7 @@ int __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n");
goto out1;
}
......
vfs-ino.patch
View file @ 3326ef69
SPDX-License-Identifier: GPL-2.0
diff --git a/fs/inode.c b/fs/inode.c
index 2bf21e2c90fc..bf30ceee482d 100644
index 0f1e3b563c47..b3154d597a9c 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -882,6 +882,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