Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Aufs5 Standalone
Commits
32eca435
Commit
32eca435
authored
Jan 22, 2020
by
J. R. Okajima
Browse files
5.4.3 20200127
Signed-off-by:
J. R. Okajima
<
hooanon05g@gmail.com
>
parent
0ffde8c9
Changes
6
Hide whitespace changes
Inline
Side-by-side
aufs5-loopback.patch
View file @
32eca435
...
@@ -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
9ba35a878ecd..4ed0ff03d5ab
100644
index
a8b63acc6204..9d97c3af5686
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 9ba35a878ecd..4ed0ff03d5ab 100644
...
@@ -190,7 +190,7 @@ index 9ba35a878ecd..4ed0ff03d5ab 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
95df083a5888..2db407f441fe
100644
index
589dd0122020..801e0a7faec5
100644
--- a/fs/aufs/super.c
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
+++ b/fs/aufs/super.c
@@ -844,7 +844,10 @@
static const struct super_operations aufs_sop = {
@@ -844,7 +844,10 @@
static const struct super_operations aufs_sop = {
...
...
aufs5-mmap.patch
View file @
32eca435
...
@@ -306,7 +306,7 @@ index 99b7ec318824..de5b6cd162fe 100644
...
@@ -306,7 +306,7 @@ index 99b7ec318824..de5b6cd162fe 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..0
24cdcfae1b1
index 000000000000..0
0d51187c325
--- /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-20
19
Junjro R. Okajima
+ * Copyright (c) 2014-20
20
Junjro R. Okajima
+ * Copyright (c) 2014 Ian Campbell
+ * Copyright (c) 2014 Ian Campbell
+ */
+ */
+
+
...
...
include/uapi/linux/aufs_type.h
View file @
32eca435
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
#include <limits.h>
#include <limits.h>
#endif
/* __KERNEL__ */
#endif
/* __KERNEL__ */
#define AUFS_VERSION "5.4.3-2020012
0
"
#define AUFS_VERSION "5.4.3-2020012
7
"
/* 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')
...
...
proc_mounts.patch
View file @
32eca435
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 711a4093e475..a5703d5c7205 100644
index 711a4093e475..a5703d5c7205 100644
--- a/fs/mount.h
--- a/fs/mount.h
...
...
tmpfs-idr.patch
View file @
32eca435
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 de8e4b71e3ba..ae8c9fcaea91 100644
index de8e4b71e3ba..ae8c9fcaea91 100644
--- a/include/linux/shmem_fs.h
--- a/include/linux/shmem_fs.h
...
...
vfs-ino.patch
View file @
32eca435
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 fef457a42882..466c685248c2 100644
index fef457a42882..466c685248c2 100644
--- a/fs/inode.c
--- a/fs/inode.c
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment