Skip to content

GitLab

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

5.x-rcN 20210111 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent b61ab560
Show whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ ccc52023
...@@ -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 281de213ef478..ffc3c1c539ea2 100644 index 6eff4f720c721..7565ff817bef8 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -3009,6 +3009,19 @@ F: include/linux/audit.h @@ -3019,6 +3019,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,10 +26,10 @@ index 281de213ef478..ffc3c1c539ea2 100644 ...@@ -26,10 +26,10 @@ index 281de213ef478..ffc3c1c539ea2 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 a58084c2ed7ce..7be7ca3f54547 100644 index e5ff328f09175..39d539df0349d 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -765,6 +765,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -761,6 +761,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error; return error;
} }
...@@ -55,10 +55,10 @@ index a58084c2ed7ce..7be7ca3f54547 100644 ...@@ -55,10 +55,10 @@ index a58084c2ed7ce..7be7ca3f54547 100644
static ssize_t loop_attr_show(struct device *dev, char *page, static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index ea0485861d937..ddca6240e0db4 100644 index 97e81a844a966..a7522ebbca659 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -1285,7 +1285,7 @@ enum d_walk_ret { @@ -1292,7 +1292,7 @@ enum d_walk_ret {
* *
* The @enter() callbacks are called with d_lock held. * The @enter() callbacks are called with d_lock held.
*/ */
...@@ -68,7 +68,7 @@ index ea0485861d937..ddca6240e0db4 100644 ...@@ -68,7 +68,7 @@ index ea0485861d937..ddca6240e0db4 100644
{ {
struct dentry *this_parent; struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index 19ac5baad50fd..073ca6af500f3 100644 index 05b36b28f2e87..e747a47a97da4 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
...@@ -90,10 +90,10 @@ index 19ac5baad50fd..073ca6af500f3 100644 ...@@ -90,10 +90,10 @@ index 19ac5baad50fd..073ca6af500f3 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 9d78c37b00b81..e7f0c614a58f3 100644 index 6442d97d9a4ab..e4a25c3fa9e55 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -1770,7 +1770,7 @@ EXPORT_SYMBOL(generic_update_time); @@ -1769,7 +1769,7 @@ EXPORT_SYMBOL(generic_update_time);
* This does the actual work of updating an inodes time or version. Must have * This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this. * had called mnt_want_write() before calling this.
*/ */
...@@ -103,7 +103,7 @@ index 9d78c37b00b81..e7f0c614a58f3 100644 ...@@ -103,7 +103,7 @@ index 9d78c37b00b81..e7f0c614a58f3 100644
if (inode->i_op->update_time) if (inode->i_op->update_time)
return inode->i_op->update_time(inode, time, flags); return inode->i_op->update_time(inode, time, flags);
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index cebaa3e817940..451dee24a546a 100644 index d2db7dfe232b3..6c617ee06d723 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -792,6 +792,12 @@ static inline int check_mnt(struct mount *mnt) @@ -792,6 +792,12 @@ static inline int check_mnt(struct mount *mnt)
...@@ -161,10 +161,10 @@ index 1373a610dc784..b7b5a0a0df6ff 100644 ...@@ -161,10 +161,10 @@ index 1373a610dc784..b7b5a0a0df6ff 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 8667d0cdc71e7..837dd6e727e45 100644 index fd47deea7c176..91f3fbe5b57ff 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1332,6 +1332,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1330,6 +1330,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);
...@@ -172,7 +172,7 @@ index 8667d0cdc71e7..837dd6e727e45 100644 ...@@ -172,7 +172,7 @@ index 8667d0cdc71e7..837dd6e727e45 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);
@@ -1843,6 +1844,7 @@ struct file_operations { @@ -1841,6 +1842,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);
...@@ -180,7 +180,7 @@ index 8667d0cdc71e7..837dd6e727e45 100644 ...@@ -180,7 +180,7 @@ index 8667d0cdc71e7..837dd6e727e45 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);
@@ -2328,6 +2330,7 @@ extern int current_umask(void); @@ -2326,6 +2328,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);
...@@ -188,7 +188,7 @@ index 8667d0cdc71e7..837dd6e727e45 100644 ...@@ -188,7 +188,7 @@ index 8667d0cdc71e7..837dd6e727e45 100644
/* /sys/fs */ /* /sys/fs */
extern struct kobject *fs_kobj; extern struct kobject *fs_kobj;
@@ -2564,6 +2567,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) @@ -2562,6 +2565,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
} }
void emergency_thaw_all(void); void emergency_thaw_all(void);
...@@ -197,7 +197,7 @@ index 8667d0cdc71e7..837dd6e727e45 100644 ...@@ -197,7 +197,7 @@ index 8667d0cdc71e7..837dd6e727e45 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 f5594879175a6..93bb861981675 100644 index b9e9adec73e8b..e152c49cc3163 100644
--- a/include/linux/lockdep.h --- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h +++ b/include/linux/lockdep.h
@@ -241,6 +241,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, @@ -241,6 +241,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
...@@ -209,14 +209,6 @@ index f5594879175a6..93bb861981675 100644 ...@@ -209,14 +209,6 @@ index f5594879175a6..93bb861981675 100644
/* /*
* Acquire a lock. * Acquire a lock.
* *
@@ -375,6 +377,7 @@ static inline void lockdep_unregister_key(struct lock_class_key *key)
#define lockdep_depth(tsk) (0)
+#define lockdep_is_held(lock) (1)
#define lockdep_is_held_type(l, r) (1)
#define lockdep_assert_held(l) do { (void)(l); } while (0)
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
index 8f882f5881e87..6b9808f098435 100644 index 8f882f5881e87..6b9808f098435 100644
--- a/include/linux/mnt_namespace.h --- a/include/linux/mnt_namespace.h
......
aufs5-loopback.patch
View file @ ccc52023
...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,10 +2,10 @@ 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 7be7ca3f54547..a163aeade6148 100644 index 39d539df0349d..4109efe2f6a3a 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -650,6 +650,15 @@ static inline void loop_update_dio(struct loop_device *lo) @@ -646,6 +646,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio); lo->use_dio);
} }
...@@ -21,7 +21,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -21,7 +21,7 @@ index 7be7ca3f54547..a163aeade6148 100644
static void loop_reread_partitions(struct loop_device *lo, static void loop_reread_partitions(struct loop_device *lo,
struct block_device *bdev) struct block_device *bdev)
{ {
@@ -705,6 +714,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -701,6 +710,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
unsigned int arg) unsigned int arg)
{ {
struct file *file = NULL, *old_file; struct file *file = NULL, *old_file;
...@@ -29,7 +29,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -29,7 +29,7 @@ index 7be7ca3f54547..a163aeade6148 100644
int error; int error;
bool partscan; bool partscan;
@@ -724,12 +734,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -720,12 +730,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
file = fget(arg); file = fget(arg);
if (!file) if (!file)
goto out_err; goto out_err;
...@@ -49,7 +49,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -49,7 +49,7 @@ index 7be7ca3f54547..a163aeade6148 100644
error = -EINVAL; error = -EINVAL;
@@ -741,6 +758,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -737,6 +754,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
blk_mq_freeze_queue(lo->lo_queue); blk_mq_freeze_queue(lo->lo_queue);
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask); mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
lo->lo_backing_file = file; lo->lo_backing_file = file;
...@@ -57,7 +57,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -57,7 +57,7 @@ index 7be7ca3f54547..a163aeade6148 100644
lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping); lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
mapping_set_gfp_mask(file->f_mapping, mapping_set_gfp_mask(file->f_mapping,
lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS)); lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
@@ -754,6 +772,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -750,6 +768,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency. * dependency.
*/ */
fput(old_file); fput(old_file);
...@@ -66,7 +66,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -66,7 +66,7 @@ index 7be7ca3f54547..a163aeade6148 100644
if (partscan) if (partscan)
loop_reread_partitions(lo, bdev); loop_reread_partitions(lo, bdev);
return 0; return 0;
@@ -762,6 +782,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -758,6 +778,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
mutex_unlock(&loop_ctl_mutex); mutex_unlock(&loop_ctl_mutex);
if (file) if (file)
fput(file); fput(file);
...@@ -75,7 +75,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -75,7 +75,7 @@ index 7be7ca3f54547..a163aeade6148 100644
return error; return error;
} }
@@ -1090,7 +1112,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, @@ -1084,7 +1106,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
struct block_device *bdev, struct block_device *bdev,
const struct loop_config *config) const struct loop_config *config)
{ {
...@@ -83,8 +83,8 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -83,8 +83,8 @@ index 7be7ca3f54547..a163aeade6148 100644
+ struct file *file, *f, *virt_file = NULL; + struct file *file, *f, *virt_file = NULL;
struct inode *inode; struct inode *inode;
struct address_space *mapping; struct address_space *mapping;
struct block_device *claimed_bdev = NULL; int error;
@@ -1106,6 +1128,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, @@ -1099,6 +1121,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
file = fget(config->fd); file = fget(config->fd);
if (!file) if (!file)
goto out; goto out;
...@@ -97,7 +97,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -97,7 +97,7 @@ index 7be7ca3f54547..a163aeade6148 100644
/* /*
* If we don't hold exclusive handle for the device, upgrade to it * If we don't hold exclusive handle for the device, upgrade to it
@@ -1161,6 +1189,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, @@ -1153,6 +1181,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO; lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
lo->lo_device = bdev; lo->lo_device = bdev;
lo->lo_backing_file = file; lo->lo_backing_file = file;
...@@ -105,8 +105,8 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -105,8 +105,8 @@ index 7be7ca3f54547..a163aeade6148 100644
lo->old_gfp_mask = mapping_gfp_mask(mapping); lo->old_gfp_mask = mapping_gfp_mask(mapping);
mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS)); mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
@@ -1214,6 +1243,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, @@ -1203,6 +1232,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
bd_abort_claiming(bdev, claimed_bdev, loop_configure); bd_abort_claiming(bdev, loop_configure);
out_putf: out_putf:
fput(file); fput(file);
+ if (virt_file) + if (virt_file)
...@@ -114,7 +114,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -114,7 +114,7 @@ index 7be7ca3f54547..a163aeade6148 100644
out: out:
/* This is safe: open() is still holding a reference. */ /* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE); module_put(THIS_MODULE);
@@ -1223,6 +1254,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, @@ -1212,6 +1243,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
static int __loop_clr_fd(struct loop_device *lo, bool release) static int __loop_clr_fd(struct loop_device *lo, bool release)
{ {
struct file *filp = NULL; struct file *filp = NULL;
...@@ -122,7 +122,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -122,7 +122,7 @@ index 7be7ca3f54547..a163aeade6148 100644
gfp_t gfp = lo->old_gfp_mask; gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device; struct block_device *bdev = lo->lo_device;
int err = 0; int err = 0;
@@ -1246,6 +1278,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) @@ -1235,6 +1267,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock); spin_lock_irq(&lo->lo_lock);
lo->lo_backing_file = NULL; lo->lo_backing_file = NULL;
...@@ -130,7 +130,7 @@ index 7be7ca3f54547..a163aeade6148 100644 ...@@ -130,7 +130,7 @@ index 7be7ca3f54547..a163aeade6148 100644
spin_unlock_irq(&lo->lo_lock); spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo); loop_release_xfer(lo);
@@ -1329,6 +1362,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) @@ -1317,6 +1350,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/ */
if (filp) if (filp)
fput(filp); fput(filp);
...@@ -228,10 +228,10 @@ index 589dd01220201..801e0a7faec59 100644 ...@@ -228,10 +228,10 @@ index 589dd01220201..801e0a7faec59 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 837dd6e727e45..0a05534f8582f 100644 index 91f3fbe5b57ff..ad1b2e44d538b 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1967,6 +1967,10 @@ struct super_operations { @@ -1965,6 +1965,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 @ ccc52023
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ 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 b362523a9829a..669448bb8a738 100644 index b3422cda2a91e..bda8e8ece7208 100644
--- a/fs/proc/base.c --- a/fs/proc/base.c
+++ b/fs/proc/base.c +++ b/fs/proc/base.c
@@ -2184,7 +2184,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) @@ -2184,7 +2184,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
...@@ -72,10 +72,10 @@ index a6d21fc0033c6..02c2de31196e0 100644 ...@@ -72,10 +72,10 @@ index a6d21fc0033c6..02c2de31196e0 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 db6ae4d3fb4ed..1a632192d9d9f 100644 index ecdf8a8cd6aeb..d9b3ec02ecbef 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1712,6 +1712,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -1715,6 +1715,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 db6ae4d3fb4ed..1a632192d9d9f 100644 ...@@ -105,10 +105,10 @@ index db6ae4d3fb4ed..1a632192d9d9f 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 5a9238f6caad9..ad387c3cb14fc 100644 index 07d9acb5b19c4..2f395ab624f38 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
@@ -280,6 +280,7 @@ struct vm_region { @@ -278,6 +278,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 5a9238f6caad9..ad387c3cb14fc 100644 ...@@ -116,7 +116,7 @@ index 5a9238f6caad9..ad387c3cb14fc 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
@@ -359,6 +360,7 @@ struct vm_area_struct { @@ -357,6 +358,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 5a9238f6caad9..ad387c3cb14fc 100644 ...@@ -125,10 +125,10 @@ index 5a9238f6caad9..ad387c3cb14fc 100644
#ifdef CONFIG_SWAP #ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index 6d266388d3804..dd7f13c3bee7d 100644 index 37720a6d04eaa..982a6863ecfc6 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -554,7 +554,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -555,7 +555,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;
...@@ -138,33 +138,33 @@ index 6d266388d3804..dd7f13c3bee7d 100644 ...@@ -138,33 +138,33 @@ index 6d266388d3804..dd7f13c3bee7d 100644
put_write_access(inode); put_write_access(inode);
i_mmap_lock_write(mapping); i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile diff --git a/mm/Makefile b/mm/Makefile
index d73aed0fc99c1..93076a66ad6a5 100644 index b6cd2fffa4922..784e2cebe1eac 100644
--- a/mm/Makefile --- a/mm/Makefile
+++ b/mm/Makefile +++ b/mm/Makefile
@@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ @@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
mm_init.o percpu.o slab_common.o \ mm_init.o percpu.o slab_common.o \
compaction.o vmacache.o \ compaction.o vmacache.o \
interval_tree.o list_lru.o workingset.o \ interval_tree.o list_lru.o workingset.o \
- debug.o gup.o $(mmu-y) - debug.o gup.o mmap_lock.o $(mmu-y)
+ prfile.o debug.o gup.o $(mmu-y) + prfile.o debug.o gup.o mmap_lock.o $(mmu-y)
# Give 'page_alloc' its own module-parameter namespace # Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c diff --git a/mm/filemap.c b/mm/filemap.c
index 0b2067b3c3283..3334207431c79 100644 index 5c9d564317a5c..40c4c2587e242 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -2909,7 +2909,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) @@ -2989,7 +2989,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(mapping->host->i_sb);
- file_update_time(vmf->vma->vm_file); - file_update_time(vmf->vma->vm_file);
+ vma_file_update_time(vmf->vma); + vma_file_update_time(vmf->vma);
lock_page(page); lock_page(page);
if (page->mapping != inode->i_mapping) { if (page->mapping != 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 5c8b4485860de..59f2f758d77e5 100644 index dc7206032387c..09b10e20c097c 100644
--- a/mm/mmap.c --- a/mm/mmap.c
+++ b/mm/mmap.c +++ b/mm/mmap.c
@@ -179,7 +179,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)
...@@ -185,16 +185,15 @@ index 5c8b4485860de..59f2f758d77e5 100644 ...@@ -185,16 +185,15 @@ index 5c8b4485860de..59f2f758d77e5 100644
} }
if (next->anon_vma) if (next->anon_vma)
anon_vma_merge(vma, next); anon_vma_merge(vma, next);
@@ -1897,8 +1897,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, @@ -1897,7 +1897,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr; return addr;
unmap_and_free_vma: unmap_and_free_vma:
- fput(vma->vm_file);
+ vma_fput(vma); + vma_fput(vma);
vma->vm_file = NULL; vma->vm_file = NULL;
- fput(file);
/* 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);
@@ -2757,7 +2757,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, @@ -2757,7 +2757,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol; goto out_free_mpol;
...@@ -261,7 +260,7 @@ index 5c8b4485860de..59f2f758d77e5 100644 ...@@ -261,7 +260,7 @@ index 5c8b4485860de..59f2f758d77e5 100644
new_vma->vm_ops->open(new_vma); new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent); vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c diff --git a/mm/nommu.c b/mm/nommu.c
index 0faf39b32cdb9..78ecad7204c86 100644 index 870fea12823e6..edbc99eee5b6b 100644
--- a/mm/nommu.c --- a/mm/nommu.c
+++ b/mm/nommu.c +++ b/mm/nommu.c
@@ -533,7 +533,7 @@ static void __put_nommu_region(struct vm_region *region) @@ -533,7 +533,7 @@ static void __put_nommu_region(struct vm_region *region)
......
aufs5-standalone.patch
View file @ ccc52023
...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN standalone patch aufs5.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index ddca6240e0db4..30dec552278dc 100644 index a7522ebbca659..d429c984133ca 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -1390,6 +1390,7 @@ void d_walk(struct dentry *parent, void *data, @@ -1397,6 +1397,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1; seq = 1;
goto again; goto again;
} }
...@@ -13,7 +13,7 @@ index ddca6240e0db4..30dec552278dc 100644 ...@@ -13,7 +13,7 @@ index ddca6240e0db4..30dec552278dc 100644
struct check_mount { struct check_mount {
struct vfsmount *mnt; struct vfsmount *mnt;
@@ -2935,6 +2936,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2) @@ -2942,6 +2943,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock); write_sequnlock(&rename_lock);
} }
...@@ -22,10 +22,10 @@ index ddca6240e0db4..30dec552278dc 100644 ...@@ -22,10 +22,10 @@ index ddca6240e0db4..30dec552278dc 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 547a2390baf54..18d51d0face68 100644 index 5d4d52039105c..adc75877cdee7 100644
--- a/fs/exec.c --- a/fs/exec.c
+++ b/fs/exec.c +++ b/fs/exec.c
@@ -113,6 +113,7 @@ bool path_noexec(const struct path *path) @@ -114,6 +114,7 @@ bool path_noexec(const struct path *path)
return (path->mnt->mnt_flags & MNT_NOEXEC) || return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC); (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
} }
...@@ -34,7 +34,7 @@ index 547a2390baf54..18d51d0face68 100644 ...@@ -34,7 +34,7 @@ index 547a2390baf54..18d51d0face68 100644
#ifdef CONFIG_USELIB #ifdef CONFIG_USELIB
/* /*
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index 073ca6af500f3..b18afdf81e762 100644 index e747a47a97da4..d6211ff25c9a4 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg) @@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
...@@ -46,10 +46,10 @@ index 073ca6af500f3..b18afdf81e762 100644 ...@@ -46,10 +46,10 @@ index 073ca6af500f3..b18afdf81e762 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 709ada3151da5..27a3e3c9f2a82 100644 index 45437f8e1003e..786af52904fcf 100644
--- a/fs/file_table.c --- a/fs/file_table.c
+++ b/fs/file_table.c +++ b/fs/file_table.c
@@ -162,6 +162,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)
} }
return ERR_PTR(-ENFILE); return ERR_PTR(-ENFILE);
} }
...@@ -57,7 +57,7 @@ index 709ada3151da5..27a3e3c9f2a82 100644 ...@@ -57,7 +57,7 @@ index 709ada3151da5..27a3e3c9f2a82 100644
/* /*
* Variant of alloc_empty_file() that doesn't check and modify nr_files. * Variant of alloc_empty_file() that doesn't check and modify nr_files.
@@ -376,6 +377,7 @@ void __fput_sync(struct file *file) @@ -375,6 +376,7 @@ void __fput_sync(struct file *file)
} }
EXPORT_SYMBOL(fput); EXPORT_SYMBOL(fput);
...@@ -66,10 +66,10 @@ index 709ada3151da5..27a3e3c9f2a82 100644 ...@@ -66,10 +66,10 @@ index 709ada3151da5..27a3e3c9f2a82 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 e7f0c614a58f3..6fe0a92a4c93c 100644 index e4a25c3fa9e55..497326faa1247 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -1776,6 +1776,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags) @@ -1775,6 +1775,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
return inode->i_op->update_time(inode, time, flags); return inode->i_op->update_time(inode, time, flags);
return generic_update_time(inode, time, flags); return generic_update_time(inode, time, flags);
} }
...@@ -78,7 +78,7 @@ index e7f0c614a58f3..6fe0a92a4c93c 100644 ...@@ -78,7 +78,7 @@ index e7f0c614a58f3..6fe0a92a4c93c 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 451dee24a546a..38078cbede431 100644 index 6c617ee06d723..858efa314f61d 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
...@@ -97,7 +97,7 @@ index 451dee24a546a..38078cbede431 100644 ...@@ -97,7 +97,7 @@ index 451dee24a546a..38078cbede431 100644
/* /*
* vfsmount lock must be held for write * vfsmount lock must be held for write
@@ -1961,6 +1963,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, @@ -1964,6 +1966,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
} }
return 0; return 0;
} }
...@@ -118,7 +118,7 @@ index a4a4b1c64d32a..86dc2efb1850c 100644 ...@@ -118,7 +118,7 @@ index a4a4b1c64d32a..86dc2efb1850c 100644
/* /*
* Drop a reference to a group. Free it if it's through. * Drop a reference to a group. Free it if it's through.
diff --git a/fs/open.c b/fs/open.c diff --git a/fs/open.c b/fs/open.c
index 9af548fb841b0..2ff09b709f7bf 100644 index 1e06e443a5651..c3bbb8aafcd1a 100644
--- a/fs/open.c --- a/fs/open.c
+++ b/fs/open.c +++ b/fs/open.c
@@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, @@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
...@@ -182,10 +182,10 @@ index b7b5a0a0df6ff..fa5c7fba7f1ba 100644 ...@@ -182,10 +182,10 @@ index b7b5a0a0df6ff..fa5c7fba7f1ba 100644
/* /*
* Write out and wait upon all dirty data associated with this * Write out and wait upon all dirty data associated with this
diff --git a/fs/xattr.c b/fs/xattr.c diff --git a/fs/xattr.c b/fs/xattr.c
index cd7a563e8bcd4..7d989d57b0f0d 100644 index fd57153b1f617..d8e9d0d6853ef 100644
--- a/fs/xattr.c --- a/fs/xattr.c
+++ b/fs/xattr.c +++ b/fs/xattr.c
@@ -360,6 +360,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value, @@ -371,6 +371,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
*xattr_value = value; *xattr_value = value;
return error; return error;
} }
...@@ -206,19 +206,19 @@ index 7f006a47790cf..be002c3a30833 100644 ...@@ -206,19 +206,19 @@ index 7f006a47790cf..be002c3a30833 100644
#ifdef CONFIG_LOCK_STAT #ifdef CONFIG_LOCK_STAT
diff --git a/kernel/task_work.c b/kernel/task_work.c diff --git a/kernel/task_work.c b/kernel/task_work.c
index 8d6e1217c451c..0e73637adda86 100644 index 9cde961875c0a..ac8c79dc81813 100644
--- a/kernel/task_work.c --- a/kernel/task_work.c
+++ b/kernel/task_work.c +++ b/kernel/task_work.c
@@ -154,3 +154,4 @@ void task_work_run(void) @@ -143,3 +143,4 @@ void task_work_run(void)
} while (work); } while (work);
} }
} }
+EXPORT_SYMBOL_GPL(task_work_run); +EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c diff --git a/security/security.c b/security/security.c
index a28045dc9e7f6..310cf38efeec7 100644 index 7b09cfbae94f7..3e060cc948262 100644
--- a/security/security.c --- a/security/security.c
+++ b/security/security.c +++ b/security/security.c
@@ -1093,6 +1093,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) @@ -1094,6 +1094,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);
} }
...@@ -226,7 +226,7 @@ index a28045dc9e7f6..310cf38efeec7 100644 ...@@ -226,7 +226,7 @@ index a28045dc9e7f6..310cf38efeec7 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry) int security_path_unlink(const struct path *dir, struct dentry *dentry)
{ {
@@ -1109,6 +1110,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, @@ -1110,6 +1111,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);
} }
...@@ -234,7 +234,7 @@ index a28045dc9e7f6..310cf38efeec7 100644 ...@@ -234,7 +234,7 @@ index a28045dc9e7f6..310cf38efeec7 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)
@@ -1117,6 +1119,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, @@ -1118,6 +1120,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);
} }
...@@ -242,7 +242,7 @@ index a28045dc9e7f6..310cf38efeec7 100644 ...@@ -242,7 +242,7 @@ index a28045dc9e7f6..310cf38efeec7 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,
@@ -1144,6 +1147,7 @@ int security_path_truncate(const struct path *path) @@ -1145,6 +1148,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);
} }
...@@ -250,7 +250,7 @@ index a28045dc9e7f6..310cf38efeec7 100644 ...@@ -250,7 +250,7 @@ index a28045dc9e7f6..310cf38efeec7 100644
int security_path_chmod(const struct path *path, umode_t mode) int security_path_chmod(const struct path *path, umode_t mode)
{ {
@@ -1151,6 +1155,7 @@ int security_path_chmod(const struct path *path, umode_t mode) @@ -1152,6 +1156,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);
} }
...@@ -258,7 +258,7 @@ index a28045dc9e7f6..310cf38efeec7 100644 ...@@ -258,7 +258,7 @@ index a28045dc9e7f6..310cf38efeec7 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)
{ {
@@ -1158,6 +1163,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) @@ -1159,6 +1164,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);
} }
...@@ -266,7 +266,7 @@ index a28045dc9e7f6..310cf38efeec7 100644 ...@@ -266,7 +266,7 @@ index a28045dc9e7f6..310cf38efeec7 100644
int security_path_chroot(const struct path *path) int security_path_chroot(const struct path *path)
{ {
@@ -1258,6 +1264,7 @@ int security_inode_permission(struct inode *inode, int mask) @@ -1259,6 +1265,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);
} }
...@@ -274,7 +274,7 @@ index a28045dc9e7f6..310cf38efeec7 100644 ...@@ -274,7 +274,7 @@ index a28045dc9e7f6..310cf38efeec7 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr) int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{ {
@@ -1450,6 +1457,7 @@ int security_file_permission(struct file *file, int mask) @@ -1451,6 +1458,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 @ ccc52023
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN-20210104" #define AUFS_VERSION "5.x-rcN-20210111"
/* 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 @ ccc52023
...@@ -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 93bb861981675..acde7be2848cf 100644 index e152c49cc3163..78d8963ba9a31 100644
--- a/include/linux/lockdep.h --- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h +++ b/include/linux/lockdep.h
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
......
tmpfs-idr.patch
View file @ ccc52023
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 a5a5d1d4d7b1..390c6fc194a9 100644 index d82b6f396588..ff9c7acfedc8 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
@@ -27,10 +27,13 @@ struct shmem_inode_info { @@ -27,10 +27,13 @@ struct shmem_inode_info {
...@@ -21,7 +21,7 @@ index a5a5d1d4d7b1..390c6fc194a9 100644 ...@@ -21,7 +21,7 @@ index a5a5d1d4d7b1..390c6fc194a9 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 537c137698f8..705b3029a000 100644 index 7c6b6d8f6c39..2990e627cf6c 100644
--- a/mm/shmem.c --- a/mm/shmem.c
+++ b/mm/shmem.c +++ b/mm/shmem.c
@@ -109,7 +109,7 @@ struct shmem_falloc { @@ -109,7 +109,7 @@ struct shmem_falloc {
...@@ -96,7 +96,7 @@ index 537c137698f8..705b3029a000 100644 ...@@ -96,7 +96,7 @@ index 537c137698f8..705b3029a000 100644
lockdep_annotate_inode_mutex_key(inode); lockdep_annotate_inode_mutex_key(inode);
} else } else
shmem_free_inode(sb); shmem_free_inode(sb);
@@ -3339,8 +3365,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) @@ -3334,8 +3360,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;
...@@ -106,7 +106,7 @@ index 537c137698f8..705b3029a000 100644 ...@@ -106,7 +106,7 @@ index 537c137698f8..705b3029a000 100644
return ino->i_ino == inum && fh[0] == ino->i_generation; return ino->i_ino == inum && fh[0] == ino->i_generation;
} }
@@ -3360,14 +3385,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3355,14 +3380,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL; struct dentry *dentry = NULL;
u64 inum; u64 inum;
...@@ -124,7 +124,7 @@ index 537c137698f8..705b3029a000 100644 ...@@ -124,7 +124,7 @@ index 537c137698f8..705b3029a000 100644
if (inode) { if (inode) {
dentry = shmem_find_alias(inode); dentry = shmem_find_alias(inode);
iput(inode); iput(inode);
@@ -3379,30 +3401,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3374,30 +3396,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)
{ {
...@@ -158,7 +158,7 @@ index 537c137698f8..705b3029a000 100644 ...@@ -158,7 +158,7 @@ index 537c137698f8..705b3029a000 100644
return 1; return 1;
} }
@@ -3481,7 +3488,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) @@ -3476,7 +3483,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
break; break;
case Opt_nr_inodes: case Opt_nr_inodes:
ctx->inodes = memparse(param->string, &rest); ctx->inodes = memparse(param->string, &rest);
...@@ -167,7 +167,7 @@ index 537c137698f8..705b3029a000 100644 ...@@ -167,7 +167,7 @@ index 537c137698f8..705b3029a000 100644
goto bad_value; goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES; ctx->seen |= SHMEM_SEEN_INODES;
break; break;
@@ -3591,7 +3598,7 @@ static int shmem_reconfigure(struct fs_context *fc) @@ -3586,7 +3593,7 @@ static int shmem_reconfigure(struct fs_context *fc)
{ {
struct shmem_options *ctx = fc->fs_private; struct shmem_options *ctx = fc->fs_private;
struct shmem_sb_info *sbinfo = SHMEM_SB(fc->root->d_sb); struct shmem_sb_info *sbinfo = SHMEM_SB(fc->root->d_sb);
...@@ -176,7 +176,7 @@ index 537c137698f8..705b3029a000 100644 ...@@ -176,7 +176,7 @@ index 537c137698f8..705b3029a000 100644
const char *err; const char *err;
spin_lock(&sbinfo->stat_lock); spin_lock(&sbinfo->stat_lock);
@@ -3658,7 +3665,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) @@ -3653,7 +3660,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())
...@@ -185,7 +185,7 @@ index 537c137698f8..705b3029a000 100644 ...@@ -185,7 +185,7 @@ index 537c137698f8..705b3029a000 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))
@@ -3705,6 +3712,8 @@ static void shmem_put_super(struct super_block *sb) @@ -3700,6 +3707,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);
...@@ -194,7 +194,7 @@ index 537c137698f8..705b3029a000 100644 ...@@ -194,7 +194,7 @@ index 537c137698f8..705b3029a000 100644
free_percpu(sbinfo->ino_batch); free_percpu(sbinfo->ino_batch);
percpu_counter_destroy(&sbinfo->used_blocks); percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol); mpol_put(sbinfo->mpol);
@@ -3748,6 +3757,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) @@ -3743,6 +3752,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
#else #else
sb->s_flags |= SB_NOUSER; sb->s_flags |= SB_NOUSER;
#endif #endif
...@@ -203,7 +203,7 @@ index 537c137698f8..705b3029a000 100644 ...@@ -203,7 +203,7 @@ index 537c137698f8..705b3029a000 100644
sbinfo->max_blocks = ctx->blocks; sbinfo->max_blocks = ctx->blocks;
sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes; sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes;
if (sb->s_flags & SB_KERNMOUNT) { if (sb->s_flags & SB_KERNMOUNT) {
@@ -3865,6 +3876,15 @@ static void shmem_destroy_inodecache(void) @@ -3860,6 +3871,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep); kmem_cache_destroy(shmem_inode_cachep);
} }
...@@ -216,10 +216,10 @@ index 537c137698f8..705b3029a000 100644 ...@@ -216,10 +216,10 @@ index 537c137698f8..705b3029a000 100644
+ idr_destroy(&sbinfo->idr); + idr_destroy(&sbinfo->idr);
+} +}
+ +
static const struct address_space_operations shmem_aops = { 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,
@@ -4005,6 +4025,7 @@ int __init shmem_init(void) @@ -4001,6 +4021,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 @ ccc52023
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 9d78c37b00b8..8e81cd8ab4aa 100644 index 6442d97d9a4a..6fc78882550e 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -896,6 +896,8 @@ unsigned int get_next_ino(void) @@ -893,6 +893,8 @@ unsigned int get_next_ino(void)
unsigned int *p = &get_cpu_var(last_ino); unsigned int *p = &get_cpu_var(last_ino);
unsigned int res = *p; unsigned int res = *p;
...@@ -13,7 +13,7 @@ index 9d78c37b00b8..8e81cd8ab4aa 100644 ...@@ -13,7 +13,7 @@ index 9d78c37b00b8..8e81cd8ab4aa 100644
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) { if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
static atomic_t shared_last_ino; static atomic_t shared_last_ino;
@@ -908,7 +910,7 @@ unsigned int get_next_ino(void) @@ -905,7 +907,7 @@ unsigned int get_next_ino(void)
res++; res++;
/* get_next_ino should not provide a 0 inode number */ /* get_next_ino should not provide a 0 inode number */
if (unlikely(!res)) if (unlikely(!res))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment