Version Bump, rc patches moved to final, still waiting for proper upstream release

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

7 files changed, 523 insertions, 113 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index 6f03c5f8d983..ccf9de52fc25 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/aufs2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.35 2011/03/27 13:09:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.36 2011/06/09 13:51:38 jlec Exp $
+
+*aufs2-0_p20110605 (09 Jun 2011)
+
+  09 Jun 2011; Justin Lecher <jlec@gentoo.org> +aufs2-0_p20110605.ebuild,
+  files/aufs2-base-38.patch, files/aufs2-standalone-38.patch,
+  +files/aufs2-base-39.patch, +files/aufs2-standalone-39.patch:
+  Version Bump, rc patches moved to final, still waiting for proper upstream
+  release
 
 *aufs2-0_p20110327 (27 Mar 2011)
 
diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest
index 8305222bad5b..4e75aef5f11d 100644
--- a/sys-fs/aufs2/Manifest
+++ b/sys-fs/aufs2/Manifest
@@ -12,7 +12,8 @@ AUX aufs2-base-34.patch 3051 RMD160 9d139d809b1c471375f265dfaf7e2c1b493b8cfc SHA
 AUX aufs2-base-35.patch 3055 RMD160 b3a41c780a007469ef586e0058c00ef599416005 SHA1 b1dac2bfc7597bd9872914d47a8db79bb4d146a1 SHA256 414733bbac088bf6f50ad37d98fc1670955ac7ef116cb9f3992b7263f57512c7
 AUX aufs2-base-36.patch 3055 RMD160 6a45e93ff9eb49462491457955abb70815d6a2e3 SHA1 b8bf77f81fb0bc732e075304128ec80598058316 SHA256 f5ee2c878fff11e93f73846439c883da9d9087fcecb9433d6560ccfdf46dad68
 AUX aufs2-base-37.patch 2966 RMD160 9b14dc01ddd7b63053ecbbddeee95c7d0942f1c1 SHA1 472939bdb8d9212c5532eda5634d636d2a803ac6 SHA256 ee92f4dbb9990762d6bfd1ce1d4960dbf17deadd21163140b346cc324889bd3e
-AUX aufs2-base-38.patch 4271 RMD160 4a1ed346c578a417784ad19c085478e46f936269 SHA1 711be85d209af5b8adb7f3332c1ac1aa0805636f SHA256 940d913839ab897bf7ffdff517a88ae98ce5b0399d37d9a9900945f6fe029924
+AUX aufs2-base-38.patch 2971 RMD160 368fad0fe2a9f56de474e04e5ac4b35937ab198a SHA1 03b72c6f7d3b18ce9622ea21b7c5e8d5a3f09aee SHA256 e30fe83e0ee29b2facd1dba79aeab944aa078920f799a71d2a8c3f2bd93a3714
+AUX aufs2-base-39.patch 2727 RMD160 00c6b9af30e82fa67d67cfeb772fdf294e2b8bd8 SHA1 68201d3dcff24c081dc7fd1f652bd8239c485fd8 SHA256 cb0cd7c00a5def7ef518144fa86ebd84f59ca2c47f007b418f768acde4b887fd
 AUX aufs2-standalone-27.patch 4322 RMD160 a3b0adae7a34369d5835848b32c8bdb90ceb1f14 SHA1 9677eea003fad79255ad876e132d3c5b436f9c14 SHA256 2db4ce52e67f31aeac41010279dd3bc680218ad3080437834caaddd6397a0353
 AUX aufs2-standalone-28.patch 4322 RMD160 5bab72a393a5a5878930d25d20d9c916cd374ba3 SHA1 f9cd11351679e3f759d9e4cccdcb3adfc2590157 SHA256 272bc7bd5873de054370868588646de9a0a71430570c7670cb9201d27268b0a7
 AUX aufs2-standalone-29.patch 6140 RMD160 f97d4bb7a27c83a7de40bf37754f51ccddd962fd SHA1 22d7ed995a5efa3d5c57835b6496c857e91eda92 SHA256 237bedbfc270c0042e62aebd0caa79a0372150f884492435503e6d838fc04d4c
@@ -24,24 +25,27 @@ AUX aufs2-standalone-34.patch 9758 RMD160 3088cbafcae2975d93083ff704c28726bbc897
 AUX aufs2-standalone-35.patch 9756 RMD160 157ece414071d1129f7bf57468c5cfcea52db484 SHA1 674fc4ef72f543882dce85621237ea9bc745c7a8 SHA256 bdebc625e849240db42dfc05f389f3251699579657ebfbb85d8c9b15234931a4
 AUX aufs2-standalone-36.patch 8747 RMD160 e7ec313fee92087e9c9c0aea9054b88b08d56d41 SHA1 ab799b635b0165e78de03e4394d3fb863e6e8dee SHA256 4cfff8eb5cebafc897a1f9e45cd92fa5483893e30b6a4add8c0fdd9df64775c7
 AUX aufs2-standalone-37.patch 8726 RMD160 21bd2b983979bfe72e37961db571169ba799e25e SHA1 cfa5e7f0446ca82b13b9dfa532419a21ab9cf841 SHA256 5efde55f07ace99ed0dd70c23252a5b726bab0dd48ac8901b467fd2ef4b9dd07
-AUX aufs2-standalone-38.patch 8846 RMD160 00780948f984c1116229cdeb4008f90d50193d92 SHA1 fbafc8a0b85101f7adb2b16b3887635ce3861f2c SHA256 47ec70c73726e179ec70090dfb8e3ce9df9cc0764d62107ebf71e00198b15f5d
+AUX aufs2-standalone-38.patch 8732 RMD160 e326b9d0839ee8b718a950c76c70ec8a1cea966c SHA1 7c69b81d27826101edfd616e24e093089a866938 SHA256 3bde56c3d0f641a45e3ab9ccadf73d8a8284d2421eb8f6d08cfe32cb77c762a7
+AUX aufs2-standalone-39.patch 7677 RMD160 3f0d21c8ebdbab05e3d072447278be7e9dba8a22 SHA1 acd55f3ebb50e61558cf01e72344292e015c1e01 SHA256 485335ae4ae0938f0c0a7bf62402f8d092b958e0fcc5c6a902a5b098a0a06d18
 AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d7b01959a8ed5756c78d29255923287c6 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad
 AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62
 DIST aufs2-0_p20100809.tar.bz2 12227959 RMD160 92f33cd69399ef249c59a79991fae22b71e85415 SHA1 69d6d696f84c27adf3b5f4e663ef3489c20e6186 SHA256 5b4441c709e3e41c03319172facaed60f9a83f46e8045a68882a27efef6eaa6b
 DIST aufs2-0_p20101122.tar.bz2 14124185 RMD160 b4b94438b916bb3972c55e6c3edc37eec2298e6f SHA1 0e216e6063dbfa34a9dfb5c77f4cf5cac8e76a9c SHA256 49e98b334d5d93772782049d9fa902fdd50ae05b8cfbde7196cb83d6634a7c0a
 DIST aufs2-0_p20110120.tar.bz2 2325118 RMD160 2b756ad239c7d96e04789bc1bff23b064da03eba SHA1 ee58cf1bdeaca6eaad352353a792b40494fc0b44 SHA256 93e0e6b1c862fa2565932200350b8bcb313f9db129f51e44b37e17fbc3c2b9b7
 DIST aufs2-0_p20110327.tar.bz2 1660490 RMD160 d649d610f339b2873738c5aa68c5c4bc2ae95322 SHA1 c3c58428692cdf76d683b8c25c2afafeb644e5db SHA256 4e36cb579fc78a5339f60efba6fb359960c69863747f8b5f35327c5dcec5c1b8
+DIST aufs2-0_p20110605.tar.xz 1508296 RMD160 870eb2234192ace4b71a1f7b9efa832ce7238266 SHA1 05f5b1fa00ad51a52addb68b39f46e89f923b317 SHA256 b606af4c0acfceafcbd9895c728bbcfae3d2ba1ec473fcb3cb90d9ffd863bcfe
 EBUILD aufs2-0_p20100809.ebuild 3247 RMD160 1779af21dcf53c2ff90617f171f2547ba4ec035f SHA1 b01271a1382df1e9facb02823c7bb7522bbd74bd SHA256 b6527cba1e67f3afcb1f4125eda9bcf7e8c898df250c4ae7b8e2ef285171bd39
 EBUILD aufs2-0_p20101122.ebuild 3412 RMD160 76b835c667f2edc232585f5734c0bf97f4920ff4 SHA1 6848dd1ea4d4a55b839b9fe5300b9ea9f76545b3 SHA256 11781a1d71fccc8adfd37d050c106958a38b837ceaed96748b9243c01feb3505
 EBUILD aufs2-0_p20110120-r1.ebuild 3809 RMD160 571a3a07d339e2711cff19ae83c515bc9f855dd0 SHA1 a8507e5e0761247b3525079fcd93845a16c01151 SHA256 68d086101ae63926e945f368c64da801abcb31d58d93ecbfea27f8ca6497a034
 EBUILD aufs2-0_p20110120.ebuild 4033 RMD160 832d873c5e8f97a2dd1589a292a3e346c7037dab SHA1 6f667b64bdc891a5c8bab69182fa494cd0ff81bc SHA256 91c07b38742e1590f26c5a70ca24ed5a969f8e6386643494aff60d6c6b317707
 EBUILD aufs2-0_p20110327.ebuild 3806 RMD160 b30b6e686477aca8477fcabfcdfcc3746f43db78 SHA1 5705534b04374bed17e19f390ec6660c65e33b7b SHA256 e67f8f0716a7184b405cdad71326d81dcb1afedc8ba5e575a0280c52dd34f6ab
-MISC ChangeLog 7632 RMD160 35ced8388dbdb193f651928a08366a012710c849 SHA1 0ff423d298b6c3168c1b73ffb8a9ac9694687439 SHA256 7c06f0d42a4ce225141e18a028e25296a5a049ccaabb22c8bd4f1c95879ad418
+EBUILD aufs2-0_p20110605.ebuild 3805 RMD160 b31e894f33cd450958a7e3dbb34cee8336ec92c8 SHA1 f28154e00f0e715204c01a137154274fdf035c1a SHA256 e0d6d2a9cfb14709561138654f9d2bbf16a0944c6272026bf03a6a12851a48ec
+MISC ChangeLog 7954 RMD160 00bcf7c402ec4a35f70289a572cdaac1d021946a SHA1 0202ab2fb7131560eae42f66450097fb3cc500da SHA256 e6389150609cdcd6cf496146ea4cc064a13877a52b7816f0d1cca8b99d86ff0b
 MISC metadata.xml 704 RMD160 592d993abdffb3af8519a0ca331548e0e45593dd SHA1 311576b500cde5fae84f621393371e30c5f791e5 SHA256 71b9740f4dfe687701efd3465500fb99ca9e2ec8a9f14379580fa58b45db5e05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2PNxoACgkQgAnW8HDreRYwtwCaA5RHkp5iNdGPCyyOMdB6OWAc
-MIQAoIcxwmIFBw5t89Gky7+FUeR5nVQI
-=Mc6Q
+iEYEARECAAYFAk3w0AIACgkQgAnW8HDreRZE7gCcDlDNkb5fJI5f1SamlraacVpK
++W4An31UejOsplgnJ03rogoC9eEDt6V3
+=M/bn
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs2/aufs2-0_p20110605.ebuild b/sys-fs/aufs2/aufs2-0_p20110605.ebuild
new file mode 100644
index 000000000000..f829eb96230d
--- /dev/null
+++ b/sys-fs/aufs2/aufs2-0_p20110605.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20110605.ebuild,v 1.1 2011/06/09 13:51:38 jlec Exp $
+
+EAPI="4"
+
+inherit linux-mod multilib toolchain-funcs
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug fuse hardened hfs inotify kernel-patch nfs ramfs"
+
+DEPEND="dev-vcs/git"
+RDEPEND="!sys-fs/aufs"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
+	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
+	use nfs && CONFIG_CHECK="${CONFIG_CHECK} ~EXPORTFS"
+	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
+	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
+
+	# this is needed so merging a binpkg aufs2 is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 2 6 31 && die "kernel too old"
+	kernel_is gt 2 6 39 && die "kernel too new"
+
+	linux-mod_pkg_setup
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \
+		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null
+			epatch "${FILESDIR}"/aufs2-{base,standalone}-${KV_PATCH}.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the aufs2 module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply ${FILESDIR}/aufs2-base-${KV_PATCH}.patch and"
+			eerror "${FILESDIR}/aufs2-standalone-${KV_PATCH}.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local branch=origin/aufs2.1-${KV_PATCH}
+	git checkout -q $branch || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && use amd64 && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use hardened ; then
+		epatch "${FILESDIR}"/pax.patch
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+	sed -i "s:__user::g" include/linux/aufs_type.h || die
+
+	cd "${WORKDIR}"/${PN}-util
+	git checkout -q origin/aufs2.1
+	sed -i "/LDFLAGS += -static -s/d" Makefile || die
+	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
+
+	cd "${WORKDIR}"/${PN}-util
+	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README
+	docinto design
+	dodoc design/*.txt
+	cd "${WORKDIR}"/${PN}-util
+	emake DESTDIR="${D}" KDIR=${KV_DIR} install
+	docinto
+	newdoc README README-utils
+}
diff --git a/sys-fs/aufs2/files/aufs2-base-38.patch b/sys-fs/aufs2/files/aufs2-base-38.patch
index 21e1240522a5..47cf4b034698 100644
--- a/sys-fs/aufs2/files/aufs2-base-38.patch
+++ b/sys-fs/aufs2/files/aufs2-base-38.patch
@@ -1,22 +1,10 @@
- fs/namei.c             |   18 +++++++++++++-----
- fs/splice.c            |   10 +++++-----
- include/linux/namei.h  |    3 +++
- include/linux/splice.h |    6 ++++++
- 4 files changed, 27 insertions(+), 10 deletions(-)
+aufs2.1 base patch for linux-2.6.38
 
 diff --git a/fs/namei.c b/fs/namei.c
-index 0087cf9..0513563 100644
+index a4689eb..0513563 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -1546,6 +1546,7 @@ static int path_walk(const char *name, struct nameidata *nd)
- 		/* nd->path had been dropped */
- 		current->total_link_count = 0;
- 		nd->path = save;
-+		nd->inode = save.dentry->d_inode;
- 		path_get(&nd->path);
- 		nd->flags |= LOOKUP_REVAL;
- 		result = link_path_walk(name, nd);
-@@ -1841,12 +1842,12 @@ out:
+@@ -1842,12 +1842,12 @@ out:
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -31,39 +19,6 @@ index 0087cf9..0513563 100644
  		struct dentry *base, int len)
  {
  	unsigned long hash;
-@@ -2455,22 +2456,29 @@ struct file *do_filp_open(int dfd, const char *pathname,
- 	/* !O_CREAT, simple open */
- 	error = do_path_lookup(dfd, pathname, flags, &nd);
- 	if (unlikely(error))
--		goto out_filp;
-+		goto out_filp2;
- 	error = -ELOOP;
- 	if (!(nd.flags & LOOKUP_FOLLOW)) {
- 		if (nd.inode->i_op->follow_link)
--			goto out_path;
-+			goto out_path2;
- 	}
- 	error = -ENOTDIR;
- 	if (nd.flags & LOOKUP_DIRECTORY) {
- 		if (!nd.inode->i_op->lookup)
--			goto out_path;
-+			goto out_path2;
- 	}
- 	audit_inode(pathname, nd.path.dentry);
- 	filp = finish_open(&nd, open_flag, acc_mode);
-+out2:
- 	release_open_intent(&nd);
- 	return filp;
- 
-+out_path2:
-+	path_put(&nd.path);
-+out_filp2:
-+	filp = ERR_PTR(error);
-+	goto out2;
-+
- creat:
- 	/* OK, have to create the file. Find the parent. */
- 	error = path_init_rcu(dfd, pathname,
 diff --git a/fs/splice.c b/fs/splice.c
 index 50a5d978..886e942 100644
 --- a/fs/splice.c
diff --git a/sys-fs/aufs2/files/aufs2-base-39.patch b/sys-fs/aufs2/files/aufs2-base-39.patch
new file mode 100644
index 000000000000..299697f18077
--- /dev/null
+++ b/sys-fs/aufs2/files/aufs2-base-39.patch
@@ -0,0 +1,70 @@
+aufs2.1 base patch for linux-2.6.
+
+diff --git a/fs/namei.c b/fs/namei.c
+index e6cd611..27d7dc7 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1768,7 +1768,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
+  * 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 50a5d978..886e942 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1081,8 +1081,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);
+@@ -1109,9 +1109,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 eba45ea..21ed6c9 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -82,6 +82,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 997c3b4..be9a153 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
+ extern void splice_shrink_spd(struct pipe_inode_info *,
+ 				struct splice_pipe_desc *);
+ 
++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/aufs2/files/aufs2-standalone-38.patch b/sys-fs/aufs2/files/aufs2-standalone-38.patch
index fb77f7cefc32..913b2043824a 100644
--- a/sys-fs/aufs2/files/aufs2-standalone-38.patch
+++ b/sys-fs/aufs2/files/aufs2-standalone-38.patch
@@ -1,67 +1,67 @@
-aufs2.1 standalone patch for linux-2.6.37
+aufs2.1 standalone patch for linux-2.6.38
 
 diff --git a/fs/file_table.c b/fs/file_table.c
-index c3dee38..f529e4d 100644
+index eb36b6b..12f2809 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
 @@ -393,6 +393,8 @@ void file_sb_list_del(struct file *file)
  	}
  }
  
-+EXPORT_SYMBOL_GPL(file_sb_list_del);
++EXPORT_SYMBOL(file_sb_list_del);
 +
  #ifdef CONFIG_SMP
  
  /*
 diff --git a/fs/inode.c b/fs/inode.c
-index ae2727a..2c8071a 100644
+index 0647d80..294b8ad 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
 @@ -82,6 +82,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
   * the i_state of an inode while it is in use..
   */
  DEFINE_SPINLOCK(inode_lock);
-+EXPORT_SYMBOL_GPL(inode_lock);
++EXPORT_SYMBOL(inode_lock);
  
  /*
   * iprune_sem provides exclusion between the kswapd or try_to_free_pages
 diff --git a/fs/namei.c b/fs/namei.c
-index a8c583f..b020c45 100644
+index 0513563..e1d996e 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -347,6 +347,7 @@ int deny_write_access(struct file * file)
+@@ -353,6 +353,7 @@ int deny_write_access(struct file * file)
  
  	return 0;
  }
-+EXPORT_SYMBOL_GPL(deny_write_access);
++EXPORT_SYMBOL(deny_write_access);
  
  /**
   * path_get - get a reference to a path
-@@ -1165,6 +1166,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1846,6 +1847,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
  {
  	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
-+EXPORT_SYMBOL_GPL(lookup_hash);
++EXPORT_SYMBOL(lookup_hash);
  
  int __lookup_one_len(const char *name, struct qstr *this,
  		struct dentry *base, int len)
-@@ -1187,6 +1189,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
+@@ -1868,6 +1870,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
  	this->hash = end_name_hash(hash);
  	return 0;
  }
-+EXPORT_SYMBOL_GPL(__lookup_one_len);
++EXPORT_SYMBOL(__lookup_one_len);
  
  /**
   * lookup_one_len - filesystem helper to lookup single pathname component
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 3dbfc07..3998762 100644
+index d1edf26..44ca259 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1321,6 +1321,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1465,6 +1465,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
-+EXPORT_SYMBOL_GPL(iterate_mounts);
++EXPORT_SYMBOL(iterate_mounts);
  
  static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
  {
@@ -81,7 +81,7 @@ index d309f38..f0e9568 100644
  	if (atomic_dec_and_test(&group->refcnt))
  		fsnotify_destroy_group(group);
  }
-+EXPORT_SYMBOL_GPL(fsnotify_put_group);
++EXPORT_SYMBOL(fsnotify_put_group);
  
  /*
   * Create a new fsnotify_group and hold a reference for the group returned.
@@ -89,7 +89,7 @@ index d309f38..f0e9568 100644
  
  	return group;
  }
-+EXPORT_SYMBOL_GPL(fsnotify_alloc_group);
++EXPORT_SYMBOL(fsnotify_alloc_group);
 diff --git a/fs/notify/mark.c b/fs/notify/mark.c
 index 325185e..adede09 100644
 --- a/fs/notify/mark.c
@@ -98,7 +98,7 @@ index 325185e..adede09 100644
  	if (atomic_dec_and_test(&mark->refcnt))
  		mark->free_mark(mark);
  }
-+EXPORT_SYMBOL_GPL(fsnotify_put_mark);
++EXPORT_SYMBOL(fsnotify_put_mark);
  
  /*
   * Any time a mark is getting freed we end up here.
@@ -106,7 +106,7 @@ index 325185e..adede09 100644
  	if (unlikely(atomic_dec_and_test(&group->num_marks)))
  		fsnotify_final_destroy_group(group);
  }
-+EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
++EXPORT_SYMBOL(fsnotify_destroy_mark);
  
  void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
  {
@@ -114,7 +114,7 @@ index 325185e..adede09 100644
  
  	return ret;
  }
-+EXPORT_SYMBOL_GPL(fsnotify_add_mark);
++EXPORT_SYMBOL(fsnotify_add_mark);
  
  /*
   * clear any marks in a group in which mark->flags & flags is true
@@ -122,39 +122,39 @@ index 325185e..adede09 100644
  	atomic_set(&mark->refcnt, 1);
  	mark->free_mark = free_mark;
  }
-+EXPORT_SYMBOL_GPL(fsnotify_init_mark);
++EXPORT_SYMBOL(fsnotify_init_mark);
  
  static int fsnotify_mark_destroy(void *ignored)
  {
 diff --git a/fs/open.c b/fs/open.c
-index 4197b9e..912817a 100644
+index b47aab3..cf7b1ac 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_GPL(do_truncate);
++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 ff0ae69..1c9e9b0 100644
+index 886e942..9a77a3e 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1105,6 +1105,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
-+EXPORT_SYMBOL_GPL(do_splice_from);
++EXPORT_SYMBOL(do_splice_from);
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1131,6 +1132,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
-+EXPORT_SYMBOL_GPL(do_splice_to);
++EXPORT_SYMBOL(do_splice_to);
  
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
@@ -166,7 +166,7 @@ index 64c2ed9..e58b5d8 100644
  	}
  	return ret;
  }
-+EXPORT_SYMBOL_GPL(cap_file_mmap);
++EXPORT_SYMBOL(cap_file_mmap);
 diff --git a/security/device_cgroup.c b/security/device_cgroup.c
 index 8d9c48f..29108aa 100644
 --- a/security/device_cgroup.c
@@ -175,115 +175,115 @@ index 8d9c48f..29108aa 100644
  
  	return -EPERM;
  }
-+EXPORT_SYMBOL_GPL(devcgroup_inode_permission);
++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 1b798d3..3b7d2ca 100644
+index 7b7308a..140afc7 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -360,6 +360,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
+@@ -359,6 +359,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
  		return 0;
  	return security_ops->path_mkdir(dir, dentry, mode);
  }
-+EXPORT_SYMBOL_GPL(security_path_mkdir);
++EXPORT_SYMBOL(security_path_mkdir);
  
  int security_path_rmdir(struct path *dir, struct dentry *dentry)
  {
-@@ -367,6 +368,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+@@ -366,6 +367,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
  		return 0;
  	return security_ops->path_rmdir(dir, dentry);
  }
-+EXPORT_SYMBOL_GPL(security_path_rmdir);
++EXPORT_SYMBOL(security_path_rmdir);
  
  int security_path_unlink(struct path *dir, struct dentry *dentry)
  {
-@@ -374,6 +376,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
+@@ -373,6 +375,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
  		return 0;
  	return security_ops->path_unlink(dir, dentry);
  }
-+EXPORT_SYMBOL_GPL(security_path_unlink);
++EXPORT_SYMBOL(security_path_unlink);
  
  int security_path_symlink(struct path *dir, struct dentry *dentry,
  			  const char *old_name)
-@@ -382,6 +385,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+@@ -381,6 +384,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
  		return 0;
  	return security_ops->path_symlink(dir, dentry, old_name);
  }
-+EXPORT_SYMBOL_GPL(security_path_symlink);
++EXPORT_SYMBOL(security_path_symlink);
  
  int security_path_link(struct dentry *old_dentry, struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -390,6 +394,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+@@ -389,6 +393,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_GPL(security_path_link);
++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)
-@@ -400,6 +405,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+@@ -399,6 +404,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
  	return security_ops->path_rename(old_dir, old_dentry, new_dir,
  					 new_dentry);
  }
-+EXPORT_SYMBOL_GPL(security_path_rename);
++EXPORT_SYMBOL(security_path_rename);
  
  int security_path_truncate(struct path *path)
  {
-@@ -407,6 +413,7 @@ int security_path_truncate(struct path *path)
+@@ -406,6 +412,7 @@ int security_path_truncate(struct path *path)
  		return 0;
  	return security_ops->path_truncate(path);
  }
-+EXPORT_SYMBOL_GPL(security_path_truncate);
++EXPORT_SYMBOL(security_path_truncate);
  
  int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
  			mode_t mode)
-@@ -415,6 +422,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+@@ -414,6 +421,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
  		return 0;
  	return security_ops->path_chmod(dentry, mnt, mode);
  }
-+EXPORT_SYMBOL_GPL(security_path_chmod);
++EXPORT_SYMBOL(security_path_chmod);
  
  int security_path_chown(struct path *path, uid_t uid, gid_t gid)
  {
-@@ -422,6 +430,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+@@ -421,6 +429,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_GPL(security_path_chown);
++EXPORT_SYMBOL(security_path_chown);
  
  int security_path_chroot(struct path *path)
  {
-@@ -498,6 +507,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -497,6 +506,7 @@ int security_inode_readlink(struct dentry *dentry)
  		return 0;
  	return security_ops->inode_readlink(dentry);
  }
-+EXPORT_SYMBOL_GPL(security_inode_readlink);
++EXPORT_SYMBOL(security_inode_readlink);
  
  int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
-@@ -512,6 +522,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -511,6 +521,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return security_ops->inode_permission(inode, mask);
  }
-+EXPORT_SYMBOL_GPL(security_inode_permission);
++EXPORT_SYMBOL(security_inode_permission);
  
- int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ int security_inode_exec_permission(struct inode *inode, unsigned int flags)
  {
-@@ -611,6 +622,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -619,6 +630,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
-+EXPORT_SYMBOL_GPL(security_file_permission);
++EXPORT_SYMBOL(security_file_permission);
  
  int security_file_alloc(struct file *file)
  {
-@@ -638,6 +650,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+@@ -646,6 +658,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }
-+EXPORT_SYMBOL_GPL(security_file_mmap);
++EXPORT_SYMBOL(security_file_mmap);
  
  int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
  			    unsigned long prot)
diff --git a/sys-fs/aufs2/files/aufs2-standalone-39.patch b/sys-fs/aufs2/files/aufs2-standalone-39.patch
new file mode 100644
index 000000000000..57dd820c24fa
--- /dev/null
+++ b/sys-fs/aufs2/files/aufs2-standalone-39.patch
@@ -0,0 +1,257 @@
+aufs2.1 standalone patch for linux-2.6.
+
+diff --git a/fs/file_table.c b/fs/file_table.c
+index 01e4c1e..0e800e2 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -443,6 +443,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 33c963d..e31e8d5 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -112,6 +112,7 @@ static DEFINE_SPINLOCK(inode_lru_lock);
+ 
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_wb_list_lock);
++EXPORT_SYMBOL(inode_sb_list_lock);
+ 
+ /*
+  * iprune_sem provides exclusion between the icache shrinking and the
+diff --git a/fs/namei.c b/fs/namei.c
+index 27d7dc7..3c72fd5 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -364,6 +364,7 @@ int deny_write_access(struct file * file)
+ 
+ 	return 0;
+ }
++EXPORT_SYMBOL(deny_write_access);
+ 
+ /**
+  * path_get - get a reference to a path
+@@ -1772,6 +1773,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 7dba2ed..d7570d1 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1524,6 +1524,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)
+ {
+diff --git a/fs/notify/group.c b/fs/notify/group.c
+index d309f38..f0e9568 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 252ab1f..2199b9b 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.
+@@ -189,6 +190,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)
+ {
+@@ -276,6 +278,7 @@ err:
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(fsnotify_add_mark);
+ 
+ /*
+  * 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,
+ 	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 b52cf01..c1b341c 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 886e942..9a77a3e 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1105,6 +1105,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.
+@@ -1131,6 +1132,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 f20e984..d39acd9 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -976,3 +976,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 8d9c48f..29108aa 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -515,6 +515,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 1011423..3bb850b 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -373,6 +373,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)
+ {
+@@ -389,6 +390,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)
+@@ -397,6 +399,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)
+@@ -415,6 +418,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)
+@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ 		return 0;
+ 	return security_ops->path_chmod(dentry, mnt, mode);
+ }
++EXPORT_SYMBOL(security_path_chmod);
+ 
+ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ {
+@@ -430,6 +435,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)
+ {
+@@ -506,6 +512,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)
+ {
+@@ -520,6 +527,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_exec_permission(struct inode *inode, unsigned int flags)
+ {
+@@ -628,6 +636,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)
+ {
+@@ -655,6 +664,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)