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

5.2 20200127


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 4abe9c58
......@@ -153,7 +153,7 @@ index af75a5ee4094..1d847cb194ff 100644
void *key_data;
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
+++ b/fs/aufs/f_op.c
@@ -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
if (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
index 9ba35a878ecd..4ed0ff03d5ab 100644
index a8b63acc6204..9d97c3af5686 100644
--- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c
@@ -133,3 +133,19 @@ void au_loopback_fin(void)
......@@ -190,7 +190,7 @@ index 9ba35a878ecd..4ed0ff03d5ab 100644
+ return f;
+}
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
+++ b/fs/aufs/loop.h
@@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
......@@ -212,7 +212,7 @@ index f31e40aff267..e13fb1a0717a 100644
#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
index 95df083a5888..2db407f441fe 100644
index 589dd0122020..801e0a7faec5 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
@@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {
......
......@@ -306,7 +306,7 @@ index d8c02fbe03b5..22dae8b7216a 100644
diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644
index 000000000000..024cdcfae1b1
index 000000000000..00d51187c325
--- /dev/null
+++ b/mm/prfile.c
@@ -0,0 +1,86 @@
......@@ -318,7 +318,7 @@ index 000000000000..024cdcfae1b1
+ *
+ * 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
+ */
+
......
......@@ -40,7 +40,7 @@
#include <limits.h>
#endif /* __KERNEL__ */
#define AUFS_VERSION "5.2-20200120"
#define AUFS_VERSION "5.2-20200127"
/* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
SPDX-License-Identifier: GPL-2.0
diff --git a/fs/mount.h b/fs/mount.h
index 6250de544760..20895d9e4371 100644
--- a/fs/mount.h
......
SPDX-License-Identifier: GPL-2.0
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index 20d815a33145..64354e89a701 100644
--- a/include/linux/shmem_fs.h
......
SPDX-License-Identifier: GPL-2.0
diff --git a/fs/inode.c b/fs/inode.c
index 2bf21e2c90fc..bf30ceee482d 100644
--- 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