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

aufs5.x-rcN 20190715


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 56bb9853
...@@ -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 a6954776a37e..c30c2d323711 100644 index 677ef41cb012..c2a7491ddc68 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2769,6 +2769,19 @@ F: include/linux/audit.h @@ -2769,6 +2769,19 @@ F: include/linux/audit.h
...@@ -90,7 +90,7 @@ index 3d40771e8e7c..d62303c5472a 100644 ...@@ -90,7 +90,7 @@ index 3d40771e8e7c..d62303c5472a 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 df6542ec3b88..407d7b45e2ee 100644 index 2bf21e2c90fc..9b908c37971f 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -1670,7 +1670,7 @@ EXPORT_SYMBOL(generic_update_time); @@ -1670,7 +1670,7 @@ EXPORT_SYMBOL(generic_update_time);
...@@ -103,7 +103,7 @@ index df6542ec3b88..407d7b45e2ee 100644 ...@@ -103,7 +103,7 @@ index df6542ec3b88..407d7b45e2ee 100644
int (*update_time)(struct inode *, struct timespec64 *, int); int (*update_time)(struct inode *, struct timespec64 *, int);
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index b26778bdc236..b460383a4228 100644 index 6fbc9126367a..101dda59f39c 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt) @@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
......
...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN kbuild patch aufs5.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig diff --git a/fs/Kconfig b/fs/Kconfig
index f1046cf6ad85..95c957c2e2c3 100644 index bfb1c6095c7a..bddba5bb307e 100644
--- a/fs/Kconfig --- a/fs/Kconfig
+++ b/fs/Kconfig +++ b/fs/Kconfig
@@ -262,6 +262,7 @@ source "fs/romfs/Kconfig" @@ -261,6 +261,7 @@ source "fs/romfs/Kconfig"
source "fs/pstore/Kconfig" source "fs/pstore/Kconfig"
source "fs/sysv/Kconfig" source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig" source "fs/ufs/Kconfig"
......
...@@ -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 9c8ca6cd3ce4..2ae2c94aceca 100644 index 255f6754c70d..2c009be14898 100644
--- a/fs/proc/base.c --- a/fs/proc/base.c
+++ b/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) @@ -2014,7 +2014,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
...@@ -72,10 +72,10 @@ index 36bf0f2e102e..8df6cbc58756 100644 ...@@ -72,10 +72,10 @@ index 36bf0f2e102e..8df6cbc58756 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 0e8834ac32b7..b3f42f01aaf0 100644 index dd0b5f4e1e45..22030c24191e 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1542,6 +1542,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -1553,6 +1553,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);
} }
...@@ -125,10 +125,10 @@ index 8ec38b11b361..d3f5492a2611 100644 ...@@ -125,10 +125,10 @@ index 8ec38b11b361..d3f5492a2611 100644
atomic_long_t swap_readahead_info; atomic_long_t swap_readahead_info;
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index 75675b9bf6df..dc333a5e6926 100644 index fe83343da24b..1ef95aa1dc6e 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -549,7 +549,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -553,7 +553,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;
...@@ -151,10 +151,10 @@ index ac5e5ba78874..5decb22d13a0 100644 ...@@ -151,10 +151,10 @@ index ac5e5ba78874..5decb22d13a0 100644
# 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 df2006ba0cfa..d5221dedfe56 100644 index 6dd9a2274c80..ede6d4892a9c 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -2671,7 +2671,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) @@ -2701,7 +2701,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(inode->i_sb);
......
...@@ -74,7 +74,7 @@ index b07b53f24ff5..34b9bbf4c556 100644 ...@@ -74,7 +74,7 @@ index b07b53f24ff5..34b9bbf4c556 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 407d7b45e2ee..b4d3e100abd0 100644 index 9b908c37971f..ed54d3759219 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -1679,6 +1679,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags) @@ -1679,6 +1679,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
...@@ -86,7 +86,7 @@ index 407d7b45e2ee..b4d3e100abd0 100644 ...@@ -86,7 +86,7 @@ index 407d7b45e2ee..b4d3e100abd0 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 b460383a4228..b74d15701ed7 100644 index 101dda59f39c..6cb11bd6ff9a 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -436,6 +436,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -436,6 +436,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
...@@ -142,7 +142,7 @@ index 0391190305cc..0b9f7f6d8390 100644 ...@@ -142,7 +142,7 @@ index 0391190305cc..0b9f7f6d8390 100644
int fsnotify_fasync(int fd, struct file *file, int on) int fsnotify_fasync(int fd, struct file *file, int on)
{ {
diff --git a/fs/notify/mark.c b/fs/notify/mark.c diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 25eb247ea85a..6a2a2f722eae 100644 index 99ddd126f6f0..2154d69a2c7a 100644
--- a/fs/notify/mark.c --- a/fs/notify/mark.c
+++ b/fs/notify/mark.c +++ b/fs/notify/mark.c
@@ -276,6 +276,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) @@ -276,6 +276,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
...@@ -161,7 +161,7 @@ index 25eb247ea85a..6a2a2f722eae 100644 ...@@ -161,7 +161,7 @@ index 25eb247ea85a..6a2a2f722eae 100644
/* /*
* Sorting function for lists of fsnotify marks. * Sorting function for lists of fsnotify marks.
@@ -677,6 +679,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp, @@ -685,6 +687,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp,
mutex_unlock(&group->mark_mutex); mutex_unlock(&group->mark_mutex);
return ret; return ret;
} }
...@@ -169,7 +169,7 @@ index 25eb247ea85a..6a2a2f722eae 100644 ...@@ -169,7 +169,7 @@ index 25eb247ea85a..6a2a2f722eae 100644
/* /*
* Given a list of marks, find the mark associated with given group. If found * Given a list of marks, find the mark associated with given group. If found
@@ -801,6 +804,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, @@ -809,6 +812,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
mark->group = group; mark->group = group;
WRITE_ONCE(mark->connector, NULL); WRITE_ONCE(mark->connector, NULL);
} }
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <linux/limits.h> #include <linux/limits.h>
#define AUFS_VERSION "5.x-rcN-20190610" #define AUFS_VERSION "5.x-rcN-20190715"
/* 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')
......
...@@ -15,7 +15,7 @@ index 6250de544760..29abfea2db50 100644 ...@@ -15,7 +15,7 @@ index 6250de544760..29abfea2db50 100644
extern const struct seq_operations mounts_op; extern const struct seq_operations mounts_op;
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index b26778bdc236..6478bf650177 100644 index 6fbc9126367a..36d8b8ac5be5 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -1260,46 +1260,78 @@ struct vfsmount *mnt_clone_internal(const struct path *path) @@ -1260,46 +1260,78 @@ struct vfsmount *mnt_clone_internal(const struct path *path)
......
...@@ -20,7 +20,7 @@ index 20d815a33145..64354e89a701 100644 ...@@ -20,7 +20,7 @@ index 20d815a33145..64354e89a701 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 1bb3b8dc8bb2..fa8f3dfa77c1 100644 index f4dce9c8670d..f3aa3ba78635 100644
--- a/mm/shmem.c --- a/mm/shmem.c
+++ b/mm/shmem.c +++ b/mm/shmem.c
@@ -113,11 +113,14 @@ static unsigned long shmem_default_max_blocks(void) @@ -113,11 +113,14 @@ static unsigned long shmem_default_max_blocks(void)
......
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 df6542ec3b88..f3a27241b366 100644 index 2bf21e2c90fc..bf30ceee482d 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -882,6 +882,8 @@ unsigned int get_next_ino(void) @@ -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