Skip to content

GitLab

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

5.x-rcN 20210719 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent ca0b422d
Hide whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ f8fa37ff
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index 0cce91cd56243..717b6a2402f9d 100644
index a61f4f3b78a91..10df06370b3ae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3040,6 +3040,19 @@ F: include/uapi/linux/audit.h
@@ -3088,6 +3088,19 @@ F: include/uapi/linux/audit.h
F: kernel/audit*
F: lib/*audit.c
......@@ -26,10 +26,10 @@ index 0cce91cd56243..717b6a2402f9d 100644
M: Miguel Ojeda <ojeda@kernel.org>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 76e12f3482a91..daa7ad5a35fd7 100644
index f37b9e3d833c2..95ee02f0581f8 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -762,6 +762,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -758,6 +758,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}
......@@ -103,7 +103,7 @@ index c93500d84264d..f24d21236ad01 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 c3f1a78ba3697..07e6c53964fc6 100644
index ab4174a3c802b..ef402e2779f27 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -807,6 +807,12 @@ static inline int check_mnt(struct mount *mnt)
......@@ -161,7 +161,7 @@ index 1373a610dc784..b7b5a0a0df6ff 100644
if (wait)
sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index c3c88fdb9b2a5..93eb43e002d97 100644
index 640574294216c..ffeed3ccd2d62 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1335,6 +1335,7 @@ extern void fasync_free(struct fasync_struct *);
......@@ -180,7 +180,7 @@ index c3c88fdb9b2a5..93eb43e002d97 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);
@@ -2565,6 +2567,7 @@ extern int current_umask(void);
@@ -2564,6 +2566,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);
......@@ -188,7 +188,7 @@ index c3c88fdb9b2a5..93eb43e002d97 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
@@ -2805,6 +2808,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
@@ -2810,6 +2813,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
}
void emergency_thaw_all(void);
......@@ -245,7 +245,7 @@ index a55179fd60fc3..8e21c53cf8831 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index e32313072506d..1fe4df55b20d1 100644
index bf1c00c881e48..e0aaf34974df5 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -189,7 +189,7 @@ static
......
aufs5-kbuild.patch
View file @ f8fa37ff
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index 141a856c50e71..6741d695b1df8 100644
index a7749c126b8e2..12fd57d4aa57e 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -292,6 +292,7 @@ source "fs/sysv/Kconfig"
@@ -307,6 +307,7 @@ source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/erofs/Kconfig"
source "fs/vboxsf/Kconfig"
......
aufs5-loopback.patch
View file @ f8fa37ff
......@@ -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 daa7ad5a35fd7..fdc6b69de5d75 100644
index 95ee02f0581f8..d6152d7580b7d 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -647,6 +647,15 @@ static inline void loop_update_dio(struct loop_device *lo)
@@ -644,6 +644,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio);
}
......@@ -18,10 +18,10 @@ index daa7ad5a35fd7..fdc6b69de5d75 100644
+ return f;
+}
+
static void loop_reread_partitions(struct loop_device *lo,
struct block_device *bdev)
static void loop_reread_partitions(struct loop_device *lo)
{
@@ -702,6 +711,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
int rc;
@@ -698,6 +707,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 daa7ad5a35fd7..fdc6b69de5d75 100644
int error;
bool partscan;
@@ -721,12 +731,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -717,12 +727,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 daa7ad5a35fd7..fdc6b69de5d75 100644
error = -EINVAL;
@@ -738,6 +755,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -734,6 +751,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,16 +57,16 @@ index daa7ad5a35fd7..fdc6b69de5d75 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));
@@ -751,6 +769,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -747,6 +765,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
+ if (old_virt_file)
+ fput(old_virt_file);
if (partscan)
loop_reread_partitions(lo, bdev);
loop_reread_partitions(lo);
return 0;
@@ -759,6 +779,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -755,6 +775,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
mutex_unlock(&lo->lo_mutex);
if (file)
fput(file);
......@@ -75,7 +75,7 @@ index daa7ad5a35fd7..fdc6b69de5d75 100644
return error;
}
@@ -1085,7 +1107,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1154,7 +1176,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
struct block_device *bdev,
const struct loop_config *config)
{
......@@ -84,7 +84,7 @@ index daa7ad5a35fd7..fdc6b69de5d75 100644
struct inode *inode;
struct address_space *mapping;
int error;
@@ -1100,6 +1122,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1169,6 +1191,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
file = fget(config->fd);
if (!file)
goto out;
......@@ -97,7 +97,7 @@ index daa7ad5a35fd7..fdc6b69de5d75 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
@@ -1154,6 +1182,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1234,6 +1262,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
lo->lo_device = bdev;
lo->lo_backing_file = file;
......@@ -105,7 +105,7 @@ index daa7ad5a35fd7..fdc6b69de5d75 100644
lo->old_gfp_mask = mapping_gfp_mask(mapping);
mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
@@ -1204,6 +1233,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1285,6 +1314,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
bd_abort_claiming(bdev, loop_configure);
out_putf:
fput(file);
......@@ -114,7 +114,7 @@ index daa7ad5a35fd7..fdc6b69de5d75 100644
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
@@ -1213,6 +1244,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
@@ -1294,6 +1325,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
static int __loop_clr_fd(struct loop_device *lo, bool release)
{
struct file *filp = NULL;
......@@ -122,7 +122,7 @@ index daa7ad5a35fd7..fdc6b69de5d75 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
@@ -1239,6 +1271,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1333,6 +1365,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 daa7ad5a35fd7..fdc6b69de5d75 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
@@ -1320,6 +1353,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1413,6 +1446,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
......@@ -140,10 +140,10 @@ index daa7ad5a35fd7..fdc6b69de5d75 100644
}
diff --git a/drivers/block/loop.h b/drivers/block/loop.h
index 5beb959b94d36..6dacad2b83147 100644
index 1988899db63ac..ff866d85aceac 100644
--- a/drivers/block/loop.h
+++ b/drivers/block/loop.h
@@ -47,7 +47,7 @@ struct loop_device {
@@ -46,7 +46,7 @@ struct loop_device {
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
......@@ -228,10 +228,10 @@ index d252963a87b53..ecfc5fc96ad8c 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 93eb43e002d97..8b392f6b36a62 100644
index ffeed3ccd2d62..6a8e599051b77 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2178,6 +2178,10 @@ struct super_operations {
@@ -2177,6 +2177,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
......
aufs5-mmap.patch
View file @ f8fa37ff
......@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 9cbd915025ad7..8a47b17c557e4 100644
index e5b5f7709d48f..4394d8c1bdad8 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2183,7 +2183,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
......@@ -31,7 +31,7 @@ index 13452b32e2bd5..38acccfef9d49 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index fc9784544b241..84ba06f5158e9 100644
index eb97468dfe4ca..570f1003a7dc6 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
......@@ -46,7 +46,7 @@ index fc9784544b241..84ba06f5158e9 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1864,7 +1867,7 @@ static int show_numa_map(struct seq_file *m, void *v)
@@ -1866,7 +1869,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 a6d21fc0033c6..02c2de31196e0 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 8ae31622deeff..2509428185f01 100644
index 57453dba41b94..74008c15418d4 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1801,6 +1801,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -1804,6 +1804,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
......@@ -105,10 +105,10 @@ index 8ae31622deeff..2509428185f01 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 8f0fb62e8975c..5043c0702c108 100644
index 52bbd2b7cb465..aeb888d448055 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -279,6 +279,7 @@ struct vm_region {
@@ -286,6 +286,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 8f0fb62e8975c..5043c0702c108 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
@@ -358,6 +359,7 @@ struct vm_area_struct {
@@ -365,6 +366,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,7 +125,7 @@ index 8f0fb62e8975c..5043c0702c108 100644
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
index a070caed5c8ed..0eae46741b79f 100644
index bc94b2cc59956..a99e566dc6c7c 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -559,7 +559,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
......@@ -138,7 +138,7 @@ index a070caed5c8ed..0eae46741b79f 100644
put_write_access(inode);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
index bf71e295e9f69..bd223b81c564c 100644
index e3436741d5391..0d1dc7789d640 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
......@@ -151,7 +151,7 @@ index bf71e295e9f69..bd223b81c564c 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 66f7e9fdfbc4f..f9a8ff48e697a 100644
index d1458ecf2f51e..6ab6b7d72466e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3240,7 +3240,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
......@@ -164,7 +164,7 @@ index 66f7e9fdfbc4f..f9a8ff48e697a 100644
if (page->mapping != mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
index 0584e540246e1..8b2f082002a9c 100644
index ca54d36d203ae..43a69a77914f5 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -185,7 +185,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
......@@ -185,7 +185,7 @@ index 0584e540246e1..8b2f082002a9c 100644
}
if (next->anon_vma)
anon_vma_merge(vma, next);
@@ -1901,7 +1901,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
@@ -1898,7 +1898,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
......@@ -194,7 +194,7 @@ index 0584e540246e1..8b2f082002a9c 100644
vma->vm_file = NULL;
/* Undo any partial mapping done by a device driver. */
@@ -2761,7 +2761,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2758,7 +2758,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
......@@ -203,7 +203,7 @@ index 0584e540246e1..8b2f082002a9c 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -2780,7 +2780,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2777,7 +2777,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)
......@@ -212,7 +212,7 @@ index 0584e540246e1..8b2f082002a9c 100644
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
@@ -2973,7 +2973,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -2972,7 +2972,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;
......@@ -221,7 +221,7 @@ index 0584e540246e1..8b2f082002a9c 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid);
@@ -3032,10 +3032,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -3031,10 +3031,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
if (vma->vm_flags & VM_LOCKED)
flags |= MAP_LOCKED;
......@@ -250,7 +250,7 @@ index 0584e540246e1..8b2f082002a9c 100644
out:
mmap_write_unlock(mm);
if (populate)
@@ -3322,7 +3339,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
@@ -3315,7 +3332,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)
......@@ -260,7 +260,7 @@ index 0584e540246e1..8b2f082002a9c 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 85a3a68dffb68..a2bee44172ccc 100644
index 3a93d40548104..501a874fedcb0 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -523,7 +523,7 @@ static void __put_nommu_region(struct vm_region *region)
......
aufs5-standalone.patch
View file @ f8fa37ff
......@@ -22,10 +22,10 @@ index bc5095b734f58..9508bd57a3bc0 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
index 18594f11c31fe..ac38c0424d2a3 100644
index 38f63451b9282..7710637ed0bc9 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -114,6 +114,7 @@ bool path_noexec(const struct path *path)
@@ -111,6 +111,7 @@ bool path_noexec(const struct path *path)
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
}
......@@ -78,7 +78,7 @@ index f24d21236ad01..78de5b5dc0840 100644
/**
* atime_needs_update - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index 07e6c53964fc6..df3e9a94be95b 100644
index ef402e2779f27..30164020f906e 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -438,6 +438,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
......@@ -118,7 +118,7 @@ index fb89c351295d6..460ad19c2570a 100644
/*
* Drop a reference to a group. Free it if it's through.
diff --git a/fs/open.c b/fs/open.c
index e53af13b5835f..f37da065e6544 100644
index 94bef26ff1b61..33412587d76dd 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -65,6 +65,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,
......@@ -194,7 +194,7 @@ index 5c8c5175b385c..ff7e9ff774b73 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 1fe4df55b20d1..ba35f874d8edf 100644
index e0aaf34974df5..d7b737731d4ef 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -210,6 +210,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
......@@ -215,7 +215,7 @@ index 1698fbe6f0e13..081b05acadf82 100644
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c
index b38155b2de83f..386c2741886ce 100644
index 09533cbb7221d..b35b18913e4be 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1146,6 +1146,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
......
include/uapi/linux/aufs_type.h
View file @ f8fa37ff
......@@ -40,7 +40,7 @@
#include <limits.h>
#endif /* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN-20210705"
#define AUFS_VERSION "5.x-rcN-20210719"
/* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
tmpfs-idr.patch
View file @ f8fa37ff
SPDX-License-Identifier: GPL-2.0
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index d82b6f396588..ff9c7acfedc8 100644
index 8e775ce517bb..87eb813edef3 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 d82b6f396588..ff9c7acfedc8 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 5d46611cba8d..e6d048473d25 100644
index 70d9ce294bb4..cb2796c7223e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -109,7 +109,7 @@ struct shmem_falloc {
......@@ -62,7 +62,7 @@ index 5d46611cba8d..e6d048473d25 100644
shmem_free_inode(inode->i_sb);
clear_inode(inode);
}
@@ -2334,6 +2342,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
@@ -2356,6 +2364,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
break;
}
......@@ -88,7 +88,7 @@ index 5d46611cba8d..e6d048473d25 100644
lockdep_annotate_inode_mutex_key(inode);
} else
shmem_free_inode(sb);
@@ -3279,8 +3306,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
@@ -3247,8 +3274,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
static int shmem_match(struct inode *ino, void *vfh)
{
__u32 *fh = vfh;
......@@ -98,7 +98,7 @@ index 5d46611cba8d..e6d048473d25 100644
return ino->i_ino == inum && fh[0] == ino->i_generation;
}
@@ -3300,14 +3326,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3268,14 +3294,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL;
u64 inum;
......@@ -116,7 +116,7 @@ index 5d46611cba8d..e6d048473d25 100644
if (inode) {
dentry = shmem_find_alias(inode);
iput(inode);
@@ -3319,30 +3342,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
@@ -3287,30 +3310,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)
{
......@@ -150,7 +150,7 @@ index 5d46611cba8d..e6d048473d25 100644
return 1;
}
@@ -3421,7 +3429,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
@@ -3389,7 +3397,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);
......@@ -159,7 +159,7 @@ index 5d46611cba8d..e6d048473d25 100644
goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES;
break;
@@ -3531,7 +3539,7 @@ static int shmem_reconfigure(struct fs_context *fc)
@@ -3499,7 +3507,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);
......@@ -168,7 +168,7 @@ index 5d46611cba8d..e6d048473d25 100644
const char *err;
spin_lock(&sbinfo->stat_lock);
@@ -3598,7 +3606,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
@@ -3566,7 +3574,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())
......@@ -177,7 +177,7 @@ index 5d46611cba8d..e6d048473d25 100644
if (sbinfo->mode != (0777 | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -3645,6 +3653,8 @@ static void shmem_put_super(struct super_block *sb)
@@ -3613,6 +3621,8 @@ static void shmem_put_super(struct super_block *sb)
{
struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
......@@ -186,7 +186,7 @@ index 5d46611cba8d..e6d048473d25 100644
free_percpu(sbinfo->ino_batch);
percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol);
@@ -3688,6 +3698,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
@@ -3656,6 +3666,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
#else
sb->s_flags |= SB_NOUSER;
#endif
......@@ -195,7 +195,7 @@ index 5d46611cba8d..e6d048473d25 100644
sbinfo->max_blocks = ctx->blocks;
sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes;
if (sb->s_flags & SB_KERNMOUNT) {
@@ -3805,6 +3817,15 @@ static void shmem_destroy_inodecache(void)
@@ -3773,6 +3785,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep);
}
......@@ -211,7 +211,7 @@ index 5d46611cba8d..e6d048473d25 100644
const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage,
.set_page_dirty = __set_page_dirty_no_writeback,
@@ -3946,6 +3967,7 @@ int __init shmem_init(void)
@@ -3914,6 +3935,7 @@ int __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n");
goto out1;
}
......
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