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
56721a30
Commit
56721a30
authored
Feb 14, 2021
by
J. R. Okajima
Browse files
5.x-rcN 20210215
Signed-off-by:
J. R. Okajima
<
hooanon05g@gmail.com
>
parent
165189b7
Changes
5
Hide whitespace changes
Inline
Side-by-side
aufs5-base.patch
View file @
56721a30
...
...
@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index 6
eff4f720c721..7565ff817bef
8 100644
index 6
67d03852191f..752948aa5d7c
8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -301
9
,6 +301
9
,19 @@
F: include/linux/audit.h
@@ -301
7
,6 +301
7
,19 @@
F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
...
...
@@ -103,7 +103,7 @@ index 6442d97d9a4ab..e4a25c3fa9e55 100644
if (inode->i_op->update_time)
return inode->i_op->update_time(inode, time, flags);
diff --git a/fs/namespace.c b/fs/namespace.c
index
d2db7dfe232b3..6c617ee06d723
100644
index
9d33909d0f9e3..3e16fc64df8b8
100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -792,6 +792,12 @@
static inline int check_mnt(struct mount *mnt)
...
...
@@ -245,7 +245,7 @@ index a55179fd60fc3..8e21c53cf8831 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index
c1418b47f625a..7f006a47790cf
100644
index
bdaf4829098c0..5c3bff75de111
100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -188,7 +188,7 @@
static
...
...
aufs5-mmap.patch
View file @
56721a30
...
...
@@ -31,7 +31,7 @@ index 13452b32e2bd5..38acccfef9d49 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index
ee5a235b30562..80a46dcede7be
100644
index
602e3a52884d8..a36614b84de16
100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -280,7 +280,10 @@
show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
...
...
@@ -46,7 +46,7 @@ index ee5a235b30562..80a46dcede7be 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -18
55
,7 +185
8
,7 @@
static int show_numa_map(struct seq_file *m, void *v)
@@ -18
62
,7 +18
6
5,7 @@
static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
...
...
@@ -125,7 +125,7 @@ index 07d9acb5b19c4..2f395ab624f38 100644
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
index
37720a6d04eaa..982a6863ec
fc
6
100644
index
d66cd1014211b..a2addc21d63
fc 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -555,7 +555,7 @@
static __latent_entropy int dup_mmap(struct mm_struct *mm,
...
...
@@ -151,10 +151,10 @@ index b6cd2fffa4922..784e2cebe1eac 100644
# Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c
index
5c9d564317a5c..40c4c2587e242
100644
index
aa0e0fb046700..d883a19f4237e
100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -29
8
9,7 +29
8
9,7 @@
vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -299
3
,7 +299
3
,7 @@
vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(mapping->host->i_sb);
...
...
aufs5-standalone.patch
View file @
56721a30
...
...
@@ -78,7 +78,7 @@ index e4a25c3fa9e55..497326faa1247 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index
6c617ee06d723..858efa314f61d
100644
index
3e16fc64df8b8..eed3453ec40a8
100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -431,6 +431,7 @@
void __mnt_drop_write(struct vfsmount *mnt)
...
...
@@ -97,7 +97,7 @@ index 6c617ee06d723..858efa314f61d 100644
/*
* vfsmount lock must be held for write
@@ -196
4
,6 +196
6
,7 @@
int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
@@ -196
7
,6 +196
9
,7 @@
int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
...
...
@@ -194,7 +194,7 @@ index fd57153b1f617..d8e9d0d6853ef 100644
ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index
7f006a47790cf..be002c3a3083
3 100644
index
5c3bff75de111..ff0003146262
3 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -209,6 +209,7 @@
inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
...
...
include/uapi/linux/aufs_type.h
View file @
56721a30
...
...
@@ -40,7 +40,7 @@
#include <limits.h>
#endif
/* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN-20210
111
"
#define AUFS_VERSION "5.x-rcN-20210
215
"
/* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
...
...
lockdep-debug.patch
View file @
56721a30
...
...
@@ -6,7 +6,7 @@ index e152c49cc3163..78d8963ba9a31 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index
be002c3a30833..38e997d6c0474
100644
index
ff00031462623..b76744a37ed28
100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
...
...
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