diff options
Diffstat (limited to 'kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch')
| -rw-r--r-- | kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch b/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch index ae897f388..584d592ef 100644 --- a/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch +++ b/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch @@ -1,7 +1,7 @@ -aufs3.2 standalone patch +aufs3.3 standalone patch diff --git a/fs/file_table.c b/fs/file_table.c -index c322794..2aad244 100644 +index 20002e3..6d792ad 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) @@ -14,10 +14,10 @@ index c322794..2aad244 100644 /* diff --git a/fs/inode.c b/fs/inode.c -index ee4e66b..728042b 100644 +index 83ab215..45242cd 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly; +@@ -66,6 +66,7 @@ static struct hlist_head *inode_hashtable __read_mostly; static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); @@ -26,10 +26,10 @@ index ee4e66b..728042b 100644 /* * Empty aops. Can be used for the cases where the user does not diff --git a/fs/namei.c b/fs/namei.c -index 4cc94cf..af19e30 100644 +index f2dcf8d..bcccefd 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd) +@@ -1785,6 +1785,7 @@ struct dentry *lookup_hash(struct nameidata *nd) { return __lookup_hash(&nd->last, nd->path.dentry, nd); } @@ -38,16 +38,16 @@ index 4cc94cf..af19e30 100644 /** * lookup_one_len - filesystem helper to lookup single pathname component diff --git a/fs/namespace.c b/fs/namespace.c -index cfc6d44..173d15a 100644 +index e608199..38fcc2e 100644 --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, +@@ -1339,6 +1339,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, } return 0; } +EXPORT_SYMBOL(iterate_mounts); - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) + static void cleanup_group_ids(struct mount *mnt, struct mount *end) { diff --git a/fs/notify/group.c b/fs/notify/group.c index 63fc294..6f4adca 100644 @@ -75,7 +75,7 @@ index 63fc294..6f4adca 100644 } +EXPORT_SYMBOL(fsnotify_alloc_group); diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index e14587d..be6533b 100644 +index f104d56..54f36db 100644 --- a/fs/notify/mark.c +++ b/fs/notify/mark.c @@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) @@ -86,7 +86,7 @@ index e14587d..be6533b 100644 /* * Any time a mark is getting freed we end up here. -@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) +@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) if (unlikely(atomic_dec_and_test(&group->num_marks))) fsnotify_final_destroy_group(group); } @@ -94,7 +94,7 @@ index e14587d..be6533b 100644 void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) { -@@ -276,6 +278,7 @@ err: +@@ -278,6 +280,7 @@ err: return ret; } @@ -102,7 +102,7 @@ index e14587d..be6533b 100644 /* * clear any marks in a group in which mark->flags & flags is true -@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, +@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, atomic_set(&mark->refcnt, 1); mark->free_mark = free_mark; } @@ -111,7 +111,7 @@ index e14587d..be6533b 100644 static int fsnotify_mark_destroy(void *ignored) { diff --git a/fs/open.c b/fs/open.c -index 22c41b5..33b4033 100644 +index 77becc0..f634f02 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, @@ -123,10 +123,10 @@ index 22c41b5..33b4033 100644 static long do_sys_truncate(const char __user *pathname, loff_t length) { diff --git a/fs/splice.c b/fs/splice.c -index e3569b0..9dc07b7 100644 +index c599f73..00303ba 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, return splice_write(pipe, out, ppos, len, flags); } @@ -134,7 +134,7 @@ index e3569b0..9dc07b7 100644 /* * Attempt to initiate a splice from a file to a pipe. -@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, +@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos, return splice_read(in, ppos, pipe, len, flags); } @@ -143,16 +143,16 @@ index e3569b0..9dc07b7 100644 /** * splice_direct_to_actor - splices data directly between two non-pipes diff --git a/security/commoncap.c b/security/commoncap.c -index ee4f848..611fd70 100644 +index 7ce191e..19a95be 100644 --- a/security/commoncap.c +++ b/security/commoncap.c -@@ -975,3 +975,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, +@@ -965,3 +965,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, } return ret; } +EXPORT_SYMBOL(cap_file_mmap); diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 4450fbe..bc94175 100644 +index 8b5b5d8..911850c 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -7,6 +7,7 @@ @@ -163,7 +163,7 @@ index 4450fbe..bc94175 100644 #include <linux/list.h> #include <linux/uaccess.h> #include <linux/seq_file.h> -@@ -500,6 +501,7 @@ found: +@@ -501,6 +502,7 @@ found: return -EPERM; } @@ -172,10 +172,10 @@ index 4450fbe..bc94175 100644 int devcgroup_inode_mknod(int mode, dev_t dev) { diff --git a/security/security.c b/security/security.c -index e2f684a..892000c 100644 +index d754249..1aa6154 100644 --- a/security/security.c +++ b/security/security.c -@@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) +@@ -392,6 +392,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) return 0; return security_ops->path_rmdir(dir, dentry); } @@ -183,7 +183,7 @@ index e2f684a..892000c 100644 int security_path_unlink(struct path *dir, struct dentry *dentry) { -@@ -427,6 +428,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, +@@ -408,6 +409,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, return 0; return security_ops->path_symlink(dir, dentry, old_name); } @@ -191,7 +191,7 @@ index e2f684a..892000c 100644 int security_path_link(struct dentry *old_dentry, struct path *new_dir, struct dentry *new_dentry) -@@ -435,6 +437,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, +@@ -416,6 +418,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); } @@ -199,23 +199,23 @@ index e2f684a..892000c 100644 int security_path_rename(struct path *old_dir, struct dentry *old_dentry, struct path *new_dir, struct dentry *new_dentry) -@@ -453,6 +456,7 @@ int security_path_truncate(struct path *path) +@@ -434,6 +437,7 @@ int security_path_truncate(struct path *path) return 0; return security_ops->path_truncate(path); } +EXPORT_SYMBOL(security_path_truncate); - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -461,6 +465,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, + int security_path_chmod(struct path *path, umode_t mode) + { +@@ -441,6 +445,7 @@ int security_path_chmod(struct path *path, umode_t mode) return 0; - return security_ops->path_chmod(dentry, mnt, mode); + 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) { -@@ -468,6 +473,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) +@@ -448,6 +453,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) return 0; return security_ops->path_chown(path, uid, gid); } @@ -223,7 +223,7 @@ index e2f684a..892000c 100644 int security_path_chroot(struct path *path) { -@@ -544,6 +550,7 @@ int security_inode_readlink(struct dentry *dentry) +@@ -524,6 +530,7 @@ int security_inode_readlink(struct dentry *dentry) return 0; return security_ops->inode_readlink(dentry); } @@ -231,7 +231,7 @@ index e2f684a..892000c 100644 int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) { -@@ -558,6 +565,7 @@ int security_inode_permission(struct inode *inode, int mask) +@@ -538,6 +545,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return security_ops->inode_permission(inode, mask); } @@ -239,7 +239,7 @@ index e2f684a..892000c 100644 int security_inode_setattr(struct dentry *dentry, struct iattr *attr) { -@@ -673,6 +681,7 @@ int security_file_permission(struct file *file, int mask) +@@ -653,6 +661,7 @@ int security_file_permission(struct file *file, int mask) return fsnotify_perm(file, mask); } @@ -247,7 +247,7 @@ index e2f684a..892000c 100644 int security_file_alloc(struct file *file) { -@@ -700,6 +709,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, +@@ -680,6 +689,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, return ret; return ima_file_mmap(file, prot); } |