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

aufs5.x-rcN 20190909


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 774a2870
......@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index e81e60bd7c26..b9167b5d7574 100644
index 9cbcf167bdd0..5a9cee826a8f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2822,6 +2822,19 @@ F: include/linux/audit.h
......@@ -120,7 +120,7 @@ index d28d30b13043..34c8093ddb1d 100644
* vfsmount lock must be held for write
*/
diff --git a/fs/read_write.c b/fs/read_write.c
index 1f5088dec566..f84e1d9c2434 100644
index 5bbf587f5bc1..3265bb84f152 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -498,6 +498,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
......
......@@ -105,10 +105,10 @@ index 0334ca97c584..3bdae823daee 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 3a37a89eb7a7..cb5e5ebe4dcf 100644
index 6a7a1083b6fb..461db8843e32 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -253,6 +253,7 @@ struct vm_region {
@@ -262,6 +262,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 3a37a89eb7a7..cb5e5ebe4dcf 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
@@ -327,6 +328,7 @@ struct vm_area_struct {
@@ -336,6 +337,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). */
......
......@@ -190,7 +190,7 @@ index a59abe3c669a..78809163ba03 100644
long vfs_truncate(const struct path *path, loff_t length)
{
diff --git a/fs/read_write.c b/fs/read_write.c
index f84e1d9c2434..967469cfaa47 100644
index 3265bb84f152..5b2dbddb0efe 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
......
......@@ -40,7 +40,7 @@
#include <linux/limits.h>
#define AUFS_VERSION "5.x-rcN-20190902"
#define AUFS_VERSION "5.x-rcN-20190909"
/* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
......@@ -20,7 +20,7 @@ index 20d815a33145..64354e89a701 100644
umode_t mode; /* Mount mode for root directory */
unsigned char huge; /* Whether to try for hugepages */
diff --git a/mm/shmem.c b/mm/shmem.c
index 626d8c74b973..7115bcfeefc8 100644
index 2bed4761f279..ec240c1e4f96 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -113,11 +113,14 @@ static unsigned long shmem_default_max_blocks(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