Skip to content

GitLab

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

aufs5.x-rcN 20190610 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 5a7ee5bc
Hide whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ 1dbb5c86
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index 429c6c624861..382d5a5edd7e 100644
index a6954776a37e..c30c2d323711 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2758,6 +2758,19 @@ F: include/linux/audit.h
@@ -2769,6 +2769,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
......@@ -26,7 +26,7 @@ index 429c6c624861..382d5a5edd7e 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 102d79575895..0d62fd56648d 100644
index f11b7dc16e9d..1b723737592b 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -746,6 +746,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
......@@ -103,7 +103,7 @@ index df6542ec3b88..407d7b45e2ee 100644
int (*update_time)(struct inode *, struct timespec64 *, int);
diff --git a/fs/namespace.c b/fs/namespace.c
index ffb13f0562b0..4a9b8c3a70d2 100644
index b26778bdc236..b460383a4228 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
......
aufs5-loopback.patch
View file @ 1dbb5c86
......@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 0d62fd56648d..c5543376c6b2 100644
index 1b723737592b..16561a96019c 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -633,6 +633,15 @@ static inline void loop_update_dio(struct loop_device *lo)
......@@ -95,9 +95,9 @@ index 0d62fd56648d..c5543376c6b2 100644
+ get_file(file);
+ }
error = mutex_lock_killable(&loop_ctl_mutex);
if (error)
@@ -998,6 +1026,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
/*
* If we don't hold exclusive handle for the device, upgrade to it
@@ -1009,6 +1037,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
lo->lo_backing_file = file;
......@@ -105,8 +105,8 @@ index 0d62fd56648d..c5543376c6b2 100644
lo->transfer = NULL;
lo->ioctl = NULL;
lo->lo_sizelimit = 0;
@@ -1036,6 +1065,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
mutex_unlock(&loop_ctl_mutex);
@@ -1052,6 +1081,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
blkdev_put(bdev, mode | FMODE_EXCL);
out_putf:
fput(file);
+ if (virt_file)
......@@ -114,7 +114,7 @@ index 0d62fd56648d..c5543376c6b2 100644
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
@@ -1082,6 +1113,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
@@ -1098,6 +1129,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
static int __loop_clr_fd(struct loop_device *lo, bool release)
{
struct file *filp = NULL;
......@@ -122,7 +122,7 @@ index 0d62fd56648d..c5543376c6b2 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
@@ -1105,6 +1137,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1121,6 +1153,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock);
lo->lo_backing_file = NULL;
......@@ -130,7 +130,7 @@ index 0d62fd56648d..c5543376c6b2 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
@@ -1187,6 +1220,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
@@ -1203,6 +1236,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
......
aufs5-mmap.patch
View file @ 1dbb5c86
......@@ -15,10 +15,10 @@ index 9c8ca6cd3ce4..2ae2c94aceca 100644
rc = 0;
}
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index 3b63be64e436..fb9913bf3d10 100644
index 14c2badb8fd9..65afe5287e43 100644
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
@@ -41,7 +41,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
file = region->vm_file;
if (file) {
......@@ -125,7 +125,7 @@ index 8ec38b11b361..d3f5492a2611 100644
atomic_long_t swap_readahead_info;
diff --git a/kernel/fork.c b/kernel/fork.c
index b2b87d450b80..c97d53f7c49a 100644
index 75675b9bf6df..dc333a5e6926 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -549,7 +549,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
......
aufs5-standalone.patch
View file @ 1dbb5c86
......@@ -86,7 +86,7 @@ index 407d7b45e2ee..b4d3e100abd0 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index 4a9b8c3a70d2..64e82b22d55e 100644
index b460383a4228..b74d15701ed7 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -436,6 +436,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
......@@ -300,10 +300,10 @@ index dc28914fa72e..c2ddfea2b280 100644
}
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c
index 613a5c00e602..7ebb58f218a0 100644
index f493db0bf62a..96f118be469f 100644
--- a/security/security.c
+++ b/security/security.c
@@ -997,6 +997,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
@@ -993,6 +993,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
}
......@@ -311,7 +311,7 @@ index 613a5c00e602..7ebb58f218a0 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry)
{
@@ -1013,6 +1014,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
@@ -1009,6 +1010,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name);
}
......@@ -319,7 +319,7 @@ index 613a5c00e602..7ebb58f218a0 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
@@ -1021,6 +1023,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
@@ -1017,6 +1019,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
}
......@@ -327,7 +327,7 @@ index 613a5c00e602..7ebb58f218a0 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
@@ -1048,6 +1051,7 @@ int security_path_truncate(const struct path *path)
@@ -1044,6 +1047,7 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
......@@ -335,7 +335,7 @@ index 613a5c00e602..7ebb58f218a0 100644
int security_path_chmod(const struct path *path, umode_t mode)
{
@@ -1055,6 +1059,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
@@ -1051,6 +1055,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
......@@ -343,7 +343,7 @@ index 613a5c00e602..7ebb58f218a0 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
@@ -1062,6 +1067,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
@@ -1058,6 +1063,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
return 0;
return call_int_hook(path_chown, 0, path, uid, gid);
}
......@@ -351,7 +351,7 @@ index 613a5c00e602..7ebb58f218a0 100644
int security_path_chroot(const struct path *path)
{
@@ -1162,6 +1168,7 @@ int security_inode_permission(struct inode *inode, int mask)
@@ -1158,6 +1164,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return call_int_hook(inode_permission, 0, inode, mask);
}
......@@ -359,7 +359,7 @@ index 613a5c00e602..7ebb58f218a0 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
@@ -1339,6 +1346,7 @@ int security_file_permission(struct file *file, int mask)
@@ -1335,6 +1342,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
......
include/uapi/linux/aufs_type.h
View file @ 1dbb5c86
......@@ -40,7 +40,7 @@
#include <linux/limits.h>
#define AUFS_VERSION "5.x-rcN-20190603"
#define AUFS_VERSION "5.x-rcN-20190610"
/* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
proc_mounts.patch
View file @ 1dbb5c86
......@@ -15,7 +15,7 @@ index 6250de544760..29abfea2db50 100644
extern const struct seq_operations mounts_op;
diff --git a/fs/namespace.c b/fs/namespace.c
index ffb13f0562b0..674517838ee1 100644
index b26778bdc236..6478bf650177 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1260,46 +1260,78 @@ struct vfsmount *mnt_clone_internal(const struct path *path)
......
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