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

5.0 20200127


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent bc8e5fa4
...@@ -153,7 +153,7 @@ index af75a5ee4094..1d847cb194ff 100644 ...@@ -153,7 +153,7 @@ index af75a5ee4094..1d847cb194ff 100644
void *key_data; void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
index 240509add504..ae374ce4ded7 100644 index 6fb4a4ed8cc7..ba9a959f2db2 100644
--- a/fs/aufs/f_op.c --- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c +++ b/fs/aufs/f_op.c
@@ -359,7 +359,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter) @@ -359,7 +359,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
...@@ -166,7 +166,7 @@ index 240509add504..ae374ce4ded7 100644 ...@@ -166,7 +166,7 @@ index 240509add504..ae374ce4ded7 100644
if (file->f_mapping != h_file->f_mapping) { if (file->f_mapping != h_file->f_mapping) {
file->f_mapping = h_file->f_mapping; file->f_mapping = h_file->f_mapping;
diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
index f05887d612fd..6f0505723cb4 100644 index 50e80bd1d589..d0f9777267f9 100644
--- a/fs/aufs/loop.c --- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c +++ b/fs/aufs/loop.c
@@ -133,3 +133,19 @@ void au_loopback_fin(void) @@ -133,3 +133,19 @@ void au_loopback_fin(void)
...@@ -190,7 +190,7 @@ index f05887d612fd..6f0505723cb4 100644 ...@@ -190,7 +190,7 @@ index f05887d612fd..6f0505723cb4 100644
+ return f; + return f;
+} +}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
index f31e40aff267..e13fb1a0717a 100644 index 94f4f80ae33b..ca1194354aff 100644
--- a/fs/aufs/loop.h --- a/fs/aufs/loop.h
+++ b/fs/aufs/loop.h +++ b/fs/aufs/loop.h
@@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb); @@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
...@@ -212,7 +212,7 @@ index f31e40aff267..e13fb1a0717a 100644 ...@@ -212,7 +212,7 @@ index f31e40aff267..e13fb1a0717a 100644
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c diff --git a/fs/aufs/super.c b/fs/aufs/super.c
index 97e1401359d8..514678aa1af3 100644 index e3b81808a78a..eff4f475de06 100644
--- a/fs/aufs/super.c --- a/fs/aufs/super.c
+++ b/fs/aufs/super.c +++ b/fs/aufs/super.c
@@ -846,7 +846,10 @@ static const struct super_operations aufs_sop = { @@ -846,7 +846,10 @@ static const struct super_operations aufs_sop = {
......
...@@ -306,7 +306,7 @@ index 749276beb109..c7957f06fbc4 100644 ...@@ -306,7 +306,7 @@ index 749276beb109..c7957f06fbc4 100644
diff --git a/mm/prfile.c b/mm/prfile.c diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644 new file mode 100644
index 000000000000..024cdcfae1b1 index 000000000000..00d51187c325
--- /dev/null --- /dev/null
+++ b/mm/prfile.c +++ b/mm/prfile.c
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
...@@ -318,7 +318,7 @@ index 000000000000..024cdcfae1b1 ...@@ -318,7 +318,7 @@ index 000000000000..024cdcfae1b1
+ * + *
+ * See Documentation/filesystems/aufs/design/06mmap.txt + * See Documentation/filesystems/aufs/design/06mmap.txt
+ * + *
+ * Copyright (c) 2014-2019 Junjro R. Okajima + * Copyright (c) 2014-2020 Junjro R. Okajima
+ * Copyright (c) 2014 Ian Campbell + * Copyright (c) 2014 Ian Campbell
+ */ + */
+ +
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.0-20200120" #define AUFS_VERSION "5.0-20200127"
/* 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')
......
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
diff --git a/fs/mount.h b/fs/mount.h diff --git a/fs/mount.h b/fs/mount.h
index f39bc9da4d73..dc6ed85500b8 100644 index f39bc9da4d73..dc6ed85500b8 100644
--- a/fs/mount.h --- a/fs/mount.h
......
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 f155dc607112..ed9ec5b43f7b 100644 index f155dc607112..ed9ec5b43f7b 100644
--- a/include/linux/shmem_fs.h --- a/include/linux/shmem_fs.h
......
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 73432e64f874..c1503fbadde0 100644 index 73432e64f874..c1503fbadde0 100644
--- a/fs/inode.c --- a/fs/inode.c
......
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