Skip to content

GitLab

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

5.x-rcN 20210705 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 315117dc
Hide whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ fc5bed3e
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ 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 bd7aff0c120f2..7c4bc08596e0b 100644 index 0cce91cd56243..717b6a2402f9d 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -3040,6 +3040,19 @@ F: include/uapi/linux/audit.h @@ -3040,6 +3040,19 @@ F: include/uapi/linux/audit.h
...@@ -26,7 +26,7 @@ index bd7aff0c120f2..7c4bc08596e0b 100644 ...@@ -26,7 +26,7 @@ index bd7aff0c120f2..7c4bc08596e0b 100644
M: Miguel Ojeda <ojeda@kernel.org> M: Miguel Ojeda <ojeda@kernel.org>
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 d58d68f3c7cd0..794a8a1341989 100644 index 76e12f3482a91..daa7ad5a35fd7 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/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, @@ -762,6 +762,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
...@@ -103,7 +103,7 @@ index c93500d84264d..f24d21236ad01 100644 ...@@ -103,7 +103,7 @@ index c93500d84264d..f24d21236ad01 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 f63337828e1c4..099e89c81af7c 100644 index c3f1a78ba3697..07e6c53964fc6 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -807,6 +807,12 @@ static inline int check_mnt(struct mount *mnt) @@ -807,6 +807,12 @@ static inline int check_mnt(struct mount *mnt)
...@@ -245,7 +245,7 @@ index a55179fd60fc3..8e21c53cf8831 100644 ...@@ -245,7 +245,7 @@ index a55179fd60fc3..8e21c53cf8831 100644
+ unsigned int flags); + unsigned int flags);
#endif #endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 48d736aa03b24..dce278159546c 100644 index e32313072506d..1fe4df55b20d1 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -189,7 +189,7 @@ static @@ -189,7 +189,7 @@ static
......
aufs5-loopback.patch
View file @ fc5bed3e
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN loopback patch aufs5.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 794a8a1341989..0e5664a6753e5 100644 index daa7ad5a35fd7..fdc6b69de5d75 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -647,6 +647,15 @@ static inline void loop_update_dio(struct loop_device *lo) @@ -647,6 +647,15 @@ static inline void loop_update_dio(struct loop_device *lo)
...@@ -140,10 +140,10 @@ index 794a8a1341989..0e5664a6753e5 100644 ...@@ -140,10 +140,10 @@ index 794a8a1341989..0e5664a6753e5 100644
} }
diff --git a/drivers/block/loop.h b/drivers/block/loop.h diff --git a/drivers/block/loop.h b/drivers/block/loop.h
index a3c04f310672e..161c3c5d1c22b 100644 index 5beb959b94d36..6dacad2b83147 100644
--- a/drivers/block/loop.h --- a/drivers/block/loop.h
+++ b/drivers/block/loop.h +++ b/drivers/block/loop.h
@@ -46,7 +46,7 @@ struct loop_device { @@ -47,7 +47,7 @@ struct loop_device {
int (*ioctl)(struct loop_device *, int cmd, int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg); unsigned long arg);
......
aufs5-mmap.patch
View file @ fc5bed3e
...@@ -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 3851bfcdba56e..d632ddd5f5ee8 100644 index 9cbd915025ad7..8a47b17c557e4 100644
--- a/fs/proc/base.c --- a/fs/proc/base.c
+++ b/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) @@ -2183,7 +2183,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 322ec61d0da79..ae6f0584e4c98 100644 index 8ae31622deeff..2509428185f01 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1798,6 +1798,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -1801,6 +1801,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,7 +105,7 @@ index 322ec61d0da79..ae6f0584e4c98 100644 ...@@ -105,7 +105,7 @@ index 322ec61d0da79..ae6f0584e4c98 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 6613b26a88946..e94df45b5483a 100644 index 8f0fb62e8975c..5043c0702c108 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
@@ -279,6 +279,7 @@ struct vm_region { @@ -279,6 +279,7 @@ struct vm_region {
...@@ -125,7 +125,7 @@ index 6613b26a88946..e94df45b5483a 100644 ...@@ -125,7 +125,7 @@ index 6613b26a88946..e94df45b5483a 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 dc06afd725cbd..66f1486e63e35 100644 index a070caed5c8ed..0eae46741b79f 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -559,7 +559,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -559,7 +559,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
......
aufs5-standalone.patch
View file @ fc5bed3e
...@@ -78,7 +78,7 @@ index f24d21236ad01..78de5b5dc0840 100644 ...@@ -78,7 +78,7 @@ index f24d21236ad01..78de5b5dc0840 100644
/** /**
* atime_needs_update - update the access time * atime_needs_update - 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 099e89c81af7c..3e46b53795b1e 100644 index 07e6c53964fc6..df3e9a94be95b 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -438,6 +438,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -438,6 +438,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
...@@ -194,7 +194,7 @@ index 5c8c5175b385c..ff7e9ff774b73 100644 ...@@ -194,7 +194,7 @@ index 5c8c5175b385c..ff7e9ff774b73 100644
ssize_t ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index dce278159546c..5b0c571dbca2f 100644 index 1fe4df55b20d1..ba35f874d8edf 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -210,6 +210,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) @@ -210,6 +210,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
......
include/uapi/linux/aufs_type.h
View file @ fc5bed3e
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN-20210517" #define AUFS_VERSION "5.x-rcN-20210705"
/* 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')
......
tmpfs-idr.patch
View file @ fc5bed3e
...@@ -21,7 +21,7 @@ index d82b6f396588..ff9c7acfedc8 100644 ...@@ -21,7 +21,7 @@ index d82b6f396588..ff9c7acfedc8 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 a08cedefbfaa..24c068fd3af2 100644 index 5d46611cba8d..e6d048473d25 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 {
...@@ -62,7 +62,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -62,7 +62,7 @@ index a08cedefbfaa..24c068fd3af2 100644
shmem_free_inode(inode->i_sb); shmem_free_inode(inode->i_sb);
clear_inode(inode); clear_inode(inode);
} }
@@ -2348,6 +2356,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode @@ -2334,6 +2342,25 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
break; break;
} }
...@@ -88,7 +88,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -88,7 +88,7 @@ index a08cedefbfaa..24c068fd3af2 100644
lockdep_annotate_inode_mutex_key(inode); lockdep_annotate_inode_mutex_key(inode);
} else } else
shmem_free_inode(sb); shmem_free_inode(sb);
@@ -3283,8 +3310,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) @@ -3279,8 +3306,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;
...@@ -98,7 +98,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -98,7 +98,7 @@ index a08cedefbfaa..24c068fd3af2 100644
return ino->i_ino == inum && fh[0] == ino->i_generation; return ino->i_ino == inum && fh[0] == ino->i_generation;
} }
@@ -3304,14 +3330,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3300,14 +3326,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL; struct dentry *dentry = NULL;
u64 inum; u64 inum;
...@@ -116,7 +116,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -116,7 +116,7 @@ index a08cedefbfaa..24c068fd3af2 100644
if (inode) { if (inode) {
dentry = shmem_find_alias(inode); dentry = shmem_find_alias(inode);
iput(inode); iput(inode);
@@ -3323,30 +3346,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3319,30 +3342,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)
{ {
...@@ -150,7 +150,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -150,7 +150,7 @@ index a08cedefbfaa..24c068fd3af2 100644
return 1; return 1;
} }
@@ -3425,7 +3433,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) @@ -3421,7 +3429,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);
...@@ -159,7 +159,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -159,7 +159,7 @@ index a08cedefbfaa..24c068fd3af2 100644
goto bad_value; goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES; ctx->seen |= SHMEM_SEEN_INODES;
break; break;
@@ -3535,7 +3543,7 @@ static int shmem_reconfigure(struct fs_context *fc) @@ -3531,7 +3539,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);
...@@ -168,7 +168,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -168,7 +168,7 @@ index a08cedefbfaa..24c068fd3af2 100644
const char *err; const char *err;
spin_lock(&sbinfo->stat_lock); spin_lock(&sbinfo->stat_lock);
@@ -3602,7 +3610,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) @@ -3598,7 +3606,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())
...@@ -177,7 +177,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -177,7 +177,7 @@ index a08cedefbfaa..24c068fd3af2 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))
@@ -3649,6 +3657,8 @@ static void shmem_put_super(struct super_block *sb) @@ -3645,6 +3653,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);
...@@ -186,7 +186,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -186,7 +186,7 @@ index a08cedefbfaa..24c068fd3af2 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);
@@ -3692,6 +3702,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) @@ -3688,6 +3698,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
...@@ -195,7 +195,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -195,7 +195,7 @@ index a08cedefbfaa..24c068fd3af2 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) {
@@ -3809,6 +3821,15 @@ static void shmem_destroy_inodecache(void) @@ -3805,6 +3817,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep); kmem_cache_destroy(shmem_inode_cachep);
} }
...@@ -211,7 +211,7 @@ index a08cedefbfaa..24c068fd3af2 100644 ...@@ -211,7 +211,7 @@ index a08cedefbfaa..24c068fd3af2 100644
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,
@@ -3950,6 +3971,7 @@ int __init shmem_init(void) @@ -3946,6 +3967,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;
} }
......
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