sys-fs/aufs3: Add missing patches

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 338 insertions, 5 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 7c5efb31d0b2..96c01bedf7e1 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.15 2012/05/23 06:31:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.16 2012/05/23 06:37:25 jlec Exp $
+
+  23 May 2012; Justin Lecher <jlec@gentoo.org> +files/aufs3-base-4.patch,
+  +files/aufs3-standalone-4.patch:
+  Add missing patches
 
 *aufs3-3_p20120523 (23 May 2012)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 7827aa07f6e1..b33d0c5d16ef 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -6,12 +6,14 @@ AUX aufs3-base-0.patch 2711 RMD160 bf3995e925b25d97c02673dfad596ea35ee4f0f5 SHA1
 AUX aufs3-base-1.patch 2734 RMD160 cccc14c5711a120616d51573042ac32dfbf952f9 SHA1 5656c4f8728d9bad63a8c8652107e0b8e61b9273 SHA256 70c4c17b12ad6edb7e7f29f1643c0348fd8a961fc7f960740cb4d17f3e380e08
 AUX aufs3-base-2.patch 2734 RMD160 fcefe81d9b434818384c5be063d0e33c35dae122 SHA1 c3885798cd739fd233c6dc73358adef1048dfd2f SHA256 2635ca013f170d4381826ec5b3aba3c15bfabd567df435df2c522c8ccd07ccb4
 AUX aufs3-base-3.patch 2734 RMD160 0ab24baec94e800f1ccb46b036bbd656edb13156 SHA1 b975f3937b3082c38632172a4857df122e5fa0cd SHA256 60f619c05540a42115044ba5bc752c1a5a8be905c55fbad3fd839114578c69c5
+AUX aufs3-base-4.patch 2744 RMD160 0026f255aded97fd030caf7f6f7739661aba1518 SHA1 0d6ba5e845a10148ddb82c330c06e5c0d45b8604 SHA256 874493462520e2323b973cb330e527bd629907bf9cc9ed0f1cea575628b0011e
 AUX aufs3-base-x-rcN.patch 2748 RMD160 709acdea68f3c3c9d67e74ae84a005d1416b872e SHA1 92b3c21a3ddfa4628f12642334b99af5bd5bbac4 SHA256 f00ed4538b5ffbabdf659990c5dcaa452d088754ad5430d37ac8b2758c44e4cd
 AUX aufs3-fix-export-__devcgroup_inode_permission.patch 231 RMD160 d26cc80dd9d54429e4f244f51f54b7d6df074c55 SHA1 a588e94d58063faa3b239bf7a5eeff81b4963a25 SHA256 e2e18629401ecc1d8a89cc21f911c11c5e451161570cf36bff942a54ac523053
 AUX aufs3-standalone-0.patch 7666 RMD160 0ae360744503d5628d74e57b093738d0377c347d SHA1 919caef16a4c277633c6ab6e79e1167eefd3736d SHA256 53a2613f6da1d418d55e20e5b3f020c3382be0789260a312b7ce97334939f203
 AUX aufs3-standalone-1.patch 7510 RMD160 d227bb98522a39317f7e573f2667625282978af5 SHA1 20dd3049f775d8eb60aed1a70d85b35766312856 SHA256 63b08742aef9f34132fb7cc0caf107a9c7162665d24401573f12f8f96ad1407f
 AUX aufs3-standalone-2.patch 7722 RMD160 2199a16b50fa785798dc92a139ca010d75965a6e SHA1 e6a2434c50855e41d899698c0519cfa7c7b3d837 SHA256 eb7f414f2a9f07e09c2c0eae9972b21a51ada5718a17e978aea1f39dd32bb0b3
 AUX aufs3-standalone-3.patch 7671 RMD160 4487131557b3e34cf06bba6642b4aab3e397e611 SHA1 3b91044c58416cd24123ac5d767a66e7e1535559 SHA256 e450fa66ebf041d10db5a594c87f83e47a39e29f6054310d6e56b44e31ad0971
+AUX aufs3-standalone-4.patch 7671 RMD160 915310ac7f5bc13745e6473920f21c1d4c2b8ad7 SHA1 6dcd2780839d1271ccd2dab89cc81277f90c1256 SHA256 c9b3a8f32d429eb4ae9749c112e2fede084e64a148660ab146a820b846dcd7cc
 AUX aufs3-standalone-x-rcN.patch 7675 RMD160 548c928270fc1c0d1b0f4e0846431ccd5188bfcb SHA1 a703f5518fe7a5089018f9bfac1df04d101ce7d9 SHA256 444987216ef9bb757210c1bb33abf3c99fb2716a7fbf96aec026d3effeb7ecef
 AUX parallel.patch 725 RMD160 45b54727f87723174884d19adb708f3983afb44f SHA1 15022c8d1570be2281845b7a9abe664f80258728 SHA256 99f93cffb09a0d2ab14fb9cb68fea0f8e87d34d681db642a8a375e045853d8a6
 AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d7b01959a8ed5756c78d29255923287c6 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad
@@ -21,13 +23,13 @@ DIST aufs3-3_p20120523.tar.xz 1108480 RMD160 3b0db00430b934301b68fcf945856debe6c
 EBUILD aufs3-3_p20120109.ebuild 4610 RMD160 7ed8ef799abf3c03bf72b168fe260a7cd0968645 SHA1 c1861a26ae1aae3231fe77f21dc095be4a69a571 SHA256 46b13f9dbf9eb299fa1a6ed435aa72db6f0932a059a2570a349a9d4372ddfa89
 EBUILD aufs3-3_p20120430.ebuild 4517 RMD160 660cfb2604396bc276222673960994d2e1d80d6b SHA1 9dbac2d584ccf44364e8d4348d9b1fc1e27f710b SHA256 19d3975ecff600a5b938fee0fdb977e065f88a7411463391d86ab7748a1576b1
 EBUILD aufs3-3_p20120523.ebuild 4513 RMD160 95e47b51757d8eaca75b3065483a189fd77bae38 SHA1 3e7411159a639242c63f6bf93cdf4198bb2ac39a SHA256 0327bad42b3c8ed356069590c04c76fe763336ecd1a24e5d4157f8891bc6b3a1
-MISC ChangeLog 4326 RMD160 5efa706f6fc9f2ef0cf90711625686ccbb3dbb82 SHA1 65ca15511cbdbb3d67ada530027e2946cbce7ecd SHA256 5095b1df18b01a80461b1c2b40f1b4f762c776dae2298f89e7b90a5f12782d9a
+MISC ChangeLog 4458 RMD160 dd50f837406313ed5515a3aa139ec07be6ea6614 SHA1 40875a0687469fc548c4ef74a9c821d70e280a8c SHA256 38d49697c550b34e888fbbb5df65acaf1f1fbad846d471fd2790e4044f368de5
 MISC metadata.xml 758 RMD160 f05821007d4e2f7d58dd9b3c8aac840f85ddb9dc SHA1 988f050899dfed3593cc5d3f65caa02275c4bdb9 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk+8hEYACgkQgAnW8HDreRa/2ACfb9BPtsWVpDXIH5dXg408JSyY
-OPAAn1/GvB+4+pgtMZxXHWMKbwvY4fJE
-=1ALp
+iEYEAREKAAYFAk+8haoACgkQgAnW8HDreRZxOgCePKz0lo71nIegf3O5mSFgrFjh
+1FIAn3PUcvHFvZ8ripbJwuqs7UEVIAK3
+=cUbQ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/files/aufs3-base-4.patch b/sys-fs/aufs3/files/aufs3-base-4.patch
new file mode 100644
index 000000000000..d639d79bd228
--- /dev/null
+++ b/sys-fs/aufs3/files/aufs3-base-4.patch
@@ -0,0 +1,70 @@
+aufs3.4 base patch
+
+diff --git a/fs/namei.c b/fs/namei.c
+index c427919..7ff959b 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1831,7 +1831,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
+  * needs parent already locked. Doesn't follow mounts.
+  * SMP-safe.
+  */
+-static struct dentry *lookup_hash(struct nameidata *nd)
++struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
+diff --git a/fs/splice.c b/fs/splice.c
+index f847684..f871233 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+  * Attempt to initiate a splice from pipe to file.
+  */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+-			   loff_t *ppos, size_t len, unsigned int flags)
++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++		    loff_t *ppos, size_t len, unsigned int flags)
+ {
+ 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ 				loff_t *, size_t, unsigned int);
+@@ -1112,9 +1112,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+  */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+-			 struct pipe_inode_info *pipe, size_t len,
+-			 unsigned int flags)
++long do_splice_to(struct file *in, loff_t *ppos,
++		  struct pipe_inode_info *pipe, size_t len,
++		  unsigned int flags)
+ {
+ 	ssize_t (*splice_read)(struct file *, loff_t *,
+ 			       struct pipe_inode_info *, size_t, unsigned int);
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index ffc0213..ef35a31 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ 		int (*open)(struct inode *, struct file *));
+ 
++extern struct dentry *lookup_hash(struct nameidata *nd);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+ 
+ extern int follow_down_one(struct path *);
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 26e5b61..3ffef2f 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
+ extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
+ 
+ extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
++
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++			   loff_t *ppos, size_t len, unsigned int flags);
++extern long do_splice_to(struct file *in, loff_t *ppos,
++			 struct pipe_inode_info *pipe, size_t len,
++			 unsigned int flags);
+ #endif
diff --git a/sys-fs/aufs3/files/aufs3-standalone-4.patch b/sys-fs/aufs3/files/aufs3-standalone-4.patch
new file mode 100644
index 000000000000..67cd853bd87b
--- /dev/null
+++ b/sys-fs/aufs3/files/aufs3-standalone-4.patch
@@ -0,0 +1,257 @@
+aufs3.4 standalone patch
+
+diff --git a/fs/file_table.c b/fs/file_table.c
+index 70f2a0f..146a3d7 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -442,6 +442,8 @@ void file_sb_list_del(struct file *file)
+ 	}
+ }
+ 
++EXPORT_SYMBOL(file_sb_list_del);
++
+ #ifdef CONFIG_SMP
+ 
+ /*
+diff --git a/fs/inode.c b/fs/inode.c
+index 9f4f5fe..bb0f3ba 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -56,6 +56,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);
++EXPORT_SYMBOL(inode_sb_list_lock);
+ 
+ /*
+  * Empty aops. Can be used for the cases where the user does not
+diff --git a/fs/namei.c b/fs/namei.c
+index 7ff959b..b170167 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1835,6 +1835,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
++EXPORT_SYMBOL(lookup_hash);
+ 
+ /**
+  * lookup_one_len - filesystem helper to lookup single pathname component
+diff --git a/fs/namespace.c b/fs/namespace.c
+index e608199..38fcc2e 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -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 mount *mnt, struct mount *end)
+ {
+diff --git a/fs/notify/group.c b/fs/notify/group.c
+index 63fc294..6f4adca 100644
+--- a/fs/notify/group.c
++++ b/fs/notify/group.c
+@@ -22,6 +22,7 @@
+ #include <linux/srcu.h>
+ #include <linux/rculist.h>
+ #include <linux/wait.h>
++#include <linux/module.h>
+ 
+ #include <linux/fsnotify_backend.h>
+ #include "fsnotify.h"
+@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+ 	if (atomic_dec_and_test(&group->refcnt))
+ 		fsnotify_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_put_group);
+ 
+ /*
+  * Create a new fsnotify_group and hold a reference for the group returned.
+@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+ 
+ 	return group;
+ }
++EXPORT_SYMBOL(fsnotify_alloc_group);
+diff --git a/fs/notify/mark.c b/fs/notify/mark.c
+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)
+ 	if (atomic_dec_and_test(&mark->refcnt))
+ 		mark->free_mark(mark);
+ }
++EXPORT_SYMBOL(fsnotify_put_mark);
+ 
+ /*
+  * Any time a mark is getting freed we end up here.
+@@ -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);
+ }
++EXPORT_SYMBOL(fsnotify_destroy_mark);
+ 
+ void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
+ {
+@@ -278,6 +280,7 @@ err:
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(fsnotify_add_mark);
+ 
+ /*
+  * clear any marks in a group in which mark->flags & flags is true
+@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+ 	atomic_set(&mark->refcnt, 1);
+ 	mark->free_mark = free_mark;
+ }
++EXPORT_SYMBOL(fsnotify_init_mark);
+ 
+ static int fsnotify_mark_destroy(void *ignored)
+ {
+diff --git a/fs/open.c b/fs/open.c
+index 5720854..ec59242 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,
+ 	mutex_unlock(&dentry->d_inode->i_mutex);
+ 	return ret;
+ }
++EXPORT_SYMBOL(do_truncate);
+ 
+ static long do_sys_truncate(const char __user *pathname, loff_t length)
+ {
+diff --git a/fs/splice.c b/fs/splice.c
+index f871233..70f5481 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ 
+ 	return splice_write(pipe, out, ppos, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_from);
+ 
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+ 
+ 	return splice_read(in, ppos, pipe, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_to);
+ 
+ /**
+  * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/security/commoncap.c b/security/commoncap.c
+index 71a166a..5d63aac 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -972,3 +972,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 c43a332..0c37289 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -7,6 +7,7 @@
+ #include <linux/device_cgroup.h>
+ #include <linux/cgroup.h>
+ #include <linux/ctype.h>
++#include <linux/export.h>
+ #include <linux/list.h>
+ #include <linux/uaccess.h>
+ #include <linux/seq_file.h>
+@@ -499,6 +500,7 @@ found:
+ 
+ 	return -EPERM;
+ }
++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 bf619ff..60b996a 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -380,6 +380,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->path_rmdir(dir, dentry);
+ }
++EXPORT_SYMBOL(security_path_rmdir);
+ 
+ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ {
+@@ -396,6 +397,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+ 		return 0;
+ 	return security_ops->path_symlink(dir, dentry, old_name);
+ }
++EXPORT_SYMBOL(security_path_symlink);
+ 
+ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ 		       struct dentry *new_dentry)
+@@ -404,6 +406,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);
+ }
++EXPORT_SYMBOL(security_path_link);
+ 
+ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ 			 struct path *new_dir, struct dentry *new_dentry)
+@@ -422,6 +425,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 path *path, umode_t mode)
+ {
+@@ -429,6 +433,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)
+ {
+@@ -436,6 +441,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ 		return 0;
+ 	return security_ops->path_chown(path, uid, gid);
+ }
++EXPORT_SYMBOL(security_path_chown);
+ 
+ int security_path_chroot(struct path *path)
+ {
+@@ -512,6 +518,7 @@ int security_inode_readlink(struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->inode_readlink(dentry);
+ }
++EXPORT_SYMBOL(security_inode_readlink);
+ 
+ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+@@ -526,6 +533,7 @@ int security_inode_permission(struct inode *inode, int mask)
+ 		return 0;
+ 	return security_ops->inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(security_inode_permission);
+ 
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -641,6 +649,7 @@ int security_file_permission(struct file *file, int mask)
+ 
+ 	return fsnotify_perm(file, mask);
+ }
++EXPORT_SYMBOL(security_file_permission);
+ 
+ int security_file_alloc(struct file *file)
+ {
+@@ -668,6 +677,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ 		return ret;
+ 	return ima_file_mmap(file, prot);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+ 
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ 			    unsigned long prot)