diff options
Diffstat (limited to 'sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch')
| -rw-r--r-- | sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch b/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch index 47edb847d0ab..bc2ca933bf4c 100644 --- a/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch +++ b/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch @@ -1,7 +1,7 @@ aufs3.x-rcN standalone patch diff --git a/fs/file_table.c b/fs/file_table.c -index 701985e..a9fe741 100644 +index dac6792..e3f2c15 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -37,6 +37,7 @@ struct files_stat_struct files_stat = { @@ -12,7 +12,7 @@ index 701985e..a9fe741 100644 /* SLAB cache for file structures */ static struct kmem_cache *filp_cachep __read_mostly; -@@ -509,6 +510,8 @@ void file_sb_list_del(struct file *file) +@@ -403,6 +404,8 @@ void file_sb_list_del(struct file *file) } } @@ -42,7 +42,7 @@ index 7b2c8fa..0c4318d 100644 /** * touch_atime - update the access time diff --git a/fs/namespace.c b/fs/namespace.c -index 4d31f73..fe1eca1 100644 +index 7bdf790..5b85c4c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj); @@ -123,7 +123,7 @@ index f104d56..54f36db 100644 static int fsnotify_mark_destroy(void *ignored) { diff --git a/fs/open.c b/fs/open.c -index bc132e1..00c1fac 100644 +index 44da0fe..d4f8157 100644 --- a/fs/open.c +++ b/fs/open.c @@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, @@ -135,7 +135,7 @@ index bc132e1..00c1fac 100644 static long do_sys_truncate(const char __user *pathname, loff_t length) { diff --git a/fs/splice.c b/fs/splice.c -index 663b402..51e1deb 100644 +index f185c6c..f3d89da 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1117,6 +1117,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, @@ -171,7 +171,7 @@ index 6dbae46..9f4f29a 100644 } +EXPORT_SYMBOL(cap_mmap_file); diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 442204c..e644a1c 100644 +index 44dfc41..15b21e0 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -7,6 +7,7 @@ @@ -182,19 +182,19 @@ index 442204c..e644a1c 100644 #include <linux/list.h> #include <linux/uaccess.h> #include <linux/seq_file.h> -@@ -493,6 +494,7 @@ found: - - return -EPERM; +@@ -573,6 +574,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask) + return __devcgroup_check_permission(dev_cgroup, type, imajor(inode), + iminor(inode), access); } +EXPORT_SYMBOL(__devcgroup_inode_permission); int devcgroup_inode_mknod(int mode, dev_t dev) { diff --git a/security/security.c b/security/security.c -index 860aeb3..ffb57bf 100644 +index 3724029..5464c76 100644 --- a/security/security.c +++ b/security/security.c -@@ -384,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) +@@ -396,6 +396,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) return 0; return security_ops->path_rmdir(dir, dentry); } @@ -202,7 +202,7 @@ index 860aeb3..ffb57bf 100644 int security_path_unlink(struct path *dir, struct dentry *dentry) { -@@ -400,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, +@@ -412,6 +413,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, return 0; return security_ops->path_symlink(dir, dentry, old_name); } @@ -210,7 +210,7 @@ index 860aeb3..ffb57bf 100644 int security_path_link(struct dentry *old_dentry, struct path *new_dir, struct dentry *new_dentry) -@@ -408,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, +@@ -420,6 +422,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, return 0; return security_ops->path_link(old_dentry, new_dir, new_dentry); } @@ -218,7 +218,7 @@ index 860aeb3..ffb57bf 100644 int security_path_rename(struct path *old_dir, struct dentry *old_dentry, struct path *new_dir, struct dentry *new_dentry) -@@ -426,6 +429,7 @@ int security_path_truncate(struct path *path) +@@ -438,6 +441,7 @@ int security_path_truncate(struct path *path) return 0; return security_ops->path_truncate(path); } @@ -226,15 +226,15 @@ index 860aeb3..ffb57bf 100644 int security_path_chmod(struct path *path, umode_t mode) { -@@ -433,6 +437,7 @@ int security_path_chmod(struct path *path, umode_t mode) +@@ -445,6 +449,7 @@ int security_path_chmod(struct path *path, umode_t mode) return 0; return security_ops->path_chmod(path, mode); } +EXPORT_SYMBOL(security_path_chmod); - int security_path_chown(struct path *path, uid_t uid, gid_t gid) + int security_path_chown(struct path *path, kuid_t uid, kgid_t gid) { -@@ -440,6 +445,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) +@@ -452,6 +457,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid) return 0; return security_ops->path_chown(path, uid, gid); } @@ -242,7 +242,7 @@ index 860aeb3..ffb57bf 100644 int security_path_chroot(struct path *path) { -@@ -516,6 +522,7 @@ int security_inode_readlink(struct dentry *dentry) +@@ -528,6 +534,7 @@ int security_inode_readlink(struct dentry *dentry) return 0; return security_ops->inode_readlink(dentry); } @@ -250,7 +250,7 @@ index 860aeb3..ffb57bf 100644 int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) { -@@ -530,6 +537,7 @@ int security_inode_permission(struct inode *inode, int mask) +@@ -542,6 +549,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return security_ops->inode_permission(inode, mask); } @@ -258,7 +258,7 @@ index 860aeb3..ffb57bf 100644 int security_inode_setattr(struct dentry *dentry, struct iattr *attr) { -@@ -645,6 +653,7 @@ int security_file_permission(struct file *file, int mask) +@@ -663,6 +671,7 @@ int security_file_permission(struct file *file, int mask) return fsnotify_perm(file, mask); } @@ -266,7 +266,7 @@ index 860aeb3..ffb57bf 100644 int security_file_alloc(struct file *file) { -@@ -705,6 +714,7 @@ int security_mmap_file(struct file *file, unsigned long prot, +@@ -723,6 +732,7 @@ int security_mmap_file(struct file *file, unsigned long prot, return ret; return ima_file_mmap(file, prot); } |