sys-fs/aufs3: Version BUmp

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

5 files changed, 254 insertions, 42 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index beeb938607e6..e3acc09d2524 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2012/05/31 16:13:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.19 2012/06/19 18:56:35 jlec Exp $
+
+*aufs3-3_p20120619 (19 Jun 2012)
+
+  19 Jun 2012; Justin Lecher <jlec@gentoo.org> files/aufs3-base-x-rcN.patch,
+  files/aufs3-standalone-x-rcN.patch, +aufs3-3_p20120619.ebuild:
+  Version BUmp
 
 *aufs3-3_p20120531 (31 May 2012)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 924d65f0814e..8587326261ad 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -7,31 +7,33 @@ AUX aufs3-base-1.patch 2734 RMD160 cccc14c5711a120616d51573042ac32dfbf952f9 SHA1
 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-base-x-rcN.patch 3881 RMD160 6595e14bf3dcb731c6ce3b0c5c402079b222c5b7 SHA1 361381fb4bef62837711f379d80f78c6f3ba70fe SHA256 84e2693f7a044f6c8968b01a541ab104523ea91fd9407fb768c7228f6029c279
 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 aufs3-standalone-x-rcN.patch 8452 RMD160 82f5a45529993d352aa3aa9d04c86a1723aac079 SHA1 f419edbb424dec10bd9f493137e882a48b9be07e SHA256 6ba0c05596504e5ea4e433fff5564b6f7c984abd10061b96f12202535506bd18
 AUX parallel.patch 725 RMD160 45b54727f87723174884d19adb708f3983afb44f SHA1 15022c8d1570be2281845b7a9abe664f80258728 SHA256 99f93cffb09a0d2ab14fb9cb68fea0f8e87d34d681db642a8a375e045853d8a6
 AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d7b01959a8ed5756c78d29255923287c6 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad
 DIST aufs3-3_p20120109.tar.xz 572140 RMD160 0e36afa641ea51bb1d102a6b4381573f6deb71a7 SHA1 5ad014f188b1673eaf1dba08d90ab56f9b88a392 SHA256 7d83bee04871def490193fd9c2e5af1b386caaedd980bee7856c7389db9c8444
 DIST aufs3-3_p20120430.tar.xz 1085556 RMD160 3d6d8f8a11f1bf3a958036c079b55b268710f24b SHA1 375ea311f5540c57eed0636f1c0f13accafaf1df SHA256 1b6ce1cf87377033e3741111db4f40cafdcb969b22f80b406c9407535e71788c
 DIST aufs3-3_p20120523.tar.xz 1108480 RMD160 3b0db00430b934301b68fcf945856debe6ccbc0c SHA1 de3b0d2a1fc49e9196075e760ae76be64516e247 SHA256 694d0a89653959d6175ee52cfd29e5bb7a8c026d00200310b198fff57ad188f0
 DIST aufs3-3_p20120531.tar.xz 1135072 RMD160 1a5daf321aa50da8b16bad93dc0abb77695977b4 SHA1 b06e8768cab2a42a296c618961c6e9fd8ec9b840 SHA256 b7c0aa54867451df191ecc9fa497ba99618cde3a9135cc2f465490ca34d43728
+DIST aufs3-3_p20120619.tar.xz 1307784 RMD160 8c183ffb18dfcbe53d9e9fc4ddefe0f5911e8b1c SHA1 3bc1797c58677d792314c96be55215daa3e8dbd8 SHA256 8bbcc70da9e3e362c4e9e96f52f8bd9594371c1583d6a22bb04e32f2492effb7
 EBUILD aufs3-3_p20120109.ebuild 4617 RMD160 8a706375b323a0eed7cbb804f07bc7d74c737638 SHA1 0b4b81699ca36d07294821a7ec6f6c9f81ed98d4 SHA256 c82fab58ad78eb4c98e7d89ffdcb6fe77885bf1e3368e7dabe4550a962d5a370
 EBUILD aufs3-3_p20120430.ebuild 4526 RMD160 6e2fe2f662b21d6c9321ca68b4c39be3a0e8ec40 SHA1 0cee4e1b73fd7592258f78149ab44a588a262454 SHA256 989a7c7c51402597d684601ab276a2395fc0394016f1963f019d9cae93c0c6cf
 EBUILD aufs3-3_p20120523.ebuild 4522 RMD160 65c0a1fcf71b9120ae4d0ac83f7e8994164cb0c4 SHA1 0ff58ad9829c4a03858cc709f6c66a2a2c5097c1 SHA256 f3aa201a2d0074106dbcf63bc09653205a2128635c970e7c7013504fdc013cc1
 EBUILD aufs3-3_p20120531.ebuild 4632 RMD160 02ea4688964f13aaaa4fb11dbcafadcc37e73761 SHA1 18098a6c5313c5f78d51b448f1282075946d820b SHA256 f9ef7f6e4bf5660f7e875a38bbcc07db4ea304d5b80001db10882841749b2952
-MISC ChangeLog 4776 RMD160 8329ff650da5c2f558c2cb1f0c771f8e4a904c14 SHA1 9bd7c5c86012f4c7301352cc90bb8657e186e3d3 SHA256 1134e64a061403627f36b5265b4d37dc3c1585338d4054173063b80a8a746d4c
+EBUILD aufs3-3_p20120619.ebuild 4632 RMD160 f620e187026f9d9d74e7142fb8399e86459a8f9e SHA1 f5a7a9393b2423bcb99b78ad253e42855355fae8 SHA256 1458e837811fbaa6aad77be59353df89e3b49a5b91cd4af4df57882f5a604010
+MISC ChangeLog 4968 RMD160 e127c4e2e7ff147394d353407e23188efc33725a SHA1 5ab1b728392a0d1cd18c6b7237824d4c613cdcd9 SHA256 f25ec3849309fd7a1d6f1b82611a6505f1424401be4acb9fc69f97f38e54aa8c
 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/HmL8ACgkQgAnW8HDreRb0AACgn6SMnvRIt4LLiY3Z0IqwdVoP
-M80AoJng12q6WoARPklc1nHaTF/GjVlp
-=9ryO
+iEYEAREKAAYFAk/gy2kACgkQgAnW8HDreRYQQQCfWsbl+RWucqGO+HQquU0g8QGN
+fYIAn36WKYv2sGP4AQRvF/CS2xHLnBcO
+=5A85
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20120619.ebuild b/sys-fs/aufs3/aufs3-3_p20120619.ebuild
new file mode 100644
index 000000000000..83d05f0b7336
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20120619.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120619.ebuild,v 1.1 2012/06/19 18:56:35 jlec Exp $
+
+EAPI=4
+
+inherit linux-mod multilib toolchain-funcs eutils
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=4
+# highest supported version
+KERN_MAX_VER=5
+# highest util branch version
+UTIL_MAX_VER=0
+
+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 doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
+
+DEPEND="dev-vcs/git"
+RDEPEND="
+	!sys-fs/aufs
+	!sys-fs/aufs2"
+
+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 ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
+		UTIL_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
+		UTIL_BRANCH="${UTIL_MAX_VER}"
+	else
+		UTIL_BRANCH="${KV_MINOR}"
+	fi
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
+		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.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}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
+			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.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 ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
+			eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.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 module_branch=origin/${PN}.${PATCH_BRANCH}
+	local util_branch=origin/${PN}.${UTIL_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_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
+
+	use pax_kernel && epatch "${FILESDIR}"/pax.patch
+
+	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/3}-util
+
+	einfo "Using for utils building branch ${util_branch}"
+	git checkout -b local-gentoo ${util_branch} || die
+	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/3}-util
+	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	dodoc Documentation/filesystems/aufs/README
+
+	cd "${WORKDIR}"/${PN/3}-util
+	emake DESTDIR="${D}" KDIR=${KV_DIR} install
+
+	newdoc README README-utils
+}
diff --git a/sys-fs/aufs3/files/aufs3-base-x-rcN.patch b/sys-fs/aufs3/files/aufs3-base-x-rcN.patch
index e7c07fd2b864..e360b173aeeb 100644
--- a/sys-fs/aufs3/files/aufs3-base-x-rcN.patch
+++ b/sys-fs/aufs3/files/aufs3-base-x-rcN.patch
@@ -1,10 +1,23 @@
 aufs3.x-rcN base patch
 
+diff --git a/fs/inode.c b/fs/inode.c
+index c99163b..7f772fd 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
+  * This does the actual work of updating an inodes time or version.  Must have
+  * had called mnt_want_write() before calling this.
+  */
+-static int update_time(struct inode *inode, struct timespec *time, int flags)
++int update_time(struct inode *inode, struct timespec *time, int flags)
+ {
+ 	if (inode->i_op->update_time)
+ 		return inode->i_op->update_time(inode, time, flags);
 diff --git a/fs/namei.c b/fs/namei.c
-index 0062dd1..80bb0b9 100644
+index 7d69419..18c9782 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -1831,7 +1831,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
+@@ -1864,7 +1864,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -14,10 +27,10 @@ index 0062dd1..80bb0b9 100644
  	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
 diff --git a/fs/splice.c b/fs/splice.c
-index f847684..f871233 100644
+index c9f1318..490239f 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1086,8 +1086,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -28,7 +41,7 @@ index f847684..f871233 100644
  {
  	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,
+@@ -1114,9 +1114,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.
   */
@@ -41,6 +54,18 @@ index f847684..f871233 100644
  {
  	ssize_t (*splice_read)(struct file *, loff_t *,
  			       struct pipe_inode_info *, size_t, unsigned int);
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 17fd887..9c75a47 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -2591,6 +2591,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
+ extern int inode_newsize_ok(const struct inode *, loff_t offset);
+ extern void setattr_copy(struct inode *inode, const struct iattr *attr);
+ 
++extern int update_time(struct inode *, struct timespec *, int);
+ extern int file_update_time(struct file *file);
+ 
+ extern int generic_show_options(struct seq_file *m, struct dentry *root);
 diff --git a/include/linux/namei.h b/include/linux/namei.h
 index ffc0213..ef35a31 100644
 --- a/include/linux/namei.h
diff --git a/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch b/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch
index 70ff1593bf37..0c59e88ed797 100644
--- a/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch
+++ b/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch
@@ -1,10 +1,18 @@
 aufs3.x-rcN standalone patch
 
 diff --git a/fs/file_table.c b/fs/file_table.c
-index 70f2a0f..146a3d7 100644
+index a305d9e..6a768be 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
-@@ -442,6 +442,8 @@ void file_sb_list_del(struct file *file)
+@@ -35,6 +35,7 @@ struct files_stat_struct files_stat = {
+ };
+ 
+ DEFINE_LGLOCK(files_lglock);
++EXPORT_SYMBOL(files_lglock);
+ 
+ /* SLAB cache for file structures */
+ static struct kmem_cache *filp_cachep __read_mostly;
+@@ -441,6 +442,8 @@ void file_sb_list_del(struct file *file)
  	}
  }
  
@@ -14,7 +22,7 @@ index 70f2a0f..146a3d7 100644
  
  /*
 diff --git a/fs/inode.c b/fs/inode.c
-index 9f4f5fe..bb0f3ba 100644
+index 7f772fd..e789d2f 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
 @@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
@@ -25,11 +33,19 @@ index 9f4f5fe..bb0f3ba 100644
  
  /*
   * Empty aops. Can be used for the cases where the user does not
+@@ -1507,6 +1508,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
+ 	mark_inode_dirty_sync(inode);
+ 	return 0;
+ }
++EXPORT_SYMBOL(update_time);
+ 
+ /**
+  *	touch_atime	-	update the access time
 diff --git a/fs/namei.c b/fs/namei.c
-index 80bb0b9..3430ad3 100644
+index 18c9782..f09edf3 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -1835,6 +1835,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1868,6 +1868,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
  {
  	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
@@ -38,10 +54,18 @@ index 80bb0b9..3430ad3 100644
  /**
   * lookup_one_len - filesystem helper to lookup single pathname component
 diff --git a/fs/namespace.c b/fs/namespace.c
-index e608199..38fcc2e 100644
+index 1e4a5fe..06aa768 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1339,6 +1339,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj);
+  * tree or hash is modified or when a vfsmount structure is modified.
+  */
+ DEFINE_BRLOCK(vfsmount_lock);
++EXPORT_SYMBOL(vfsmount_lock);
+ 
+ static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry)
+ {
+@@ -1341,6 +1342,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -111,7 +135,7 @@ index f104d56..54f36db 100644
  static int fsnotify_mark_destroy(void *ignored)
  {
 diff --git a/fs/open.c b/fs/open.c
-index 5720854..ec59242 100644
+index d6c79a0..9004a15 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 +147,10 @@ index 5720854..ec59242 100644
  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
+index 490239f..701d34a 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,
+@@ -1110,6 +1110,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -134,7 +158,7 @@ index f871233..70f5481 100644
  
  /*
   * 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,
+@@ -1136,6 +1137,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -143,16 +167,23 @@ index f871233..70f5481 100644
  /**
   * 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
+index 6dbae46..9f4f29a 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
-@@ -972,3 +972,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr)
  	}
  	return ret;
  }
-+EXPORT_SYMBOL(cap_file_mmap);
++EXPORT_SYMBOL(cap_mmap_addr);
+ 
+ int cap_mmap_file(struct file *file, unsigned long reqprot,
+ 		  unsigned long prot, unsigned long flags)
+ {
+ 	return 0;
+ }
++EXPORT_SYMBOL(cap_mmap_file);
 diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index c43a332..0c37289 100644
+index 442204c..e644a1c 100644
 --- a/security/device_cgroup.c
 +++ b/security/device_cgroup.c
 @@ -7,6 +7,7 @@
@@ -163,7 +194,7 @@ index c43a332..0c37289 100644
  #include <linux/list.h>
  #include <linux/uaccess.h>
  #include <linux/seq_file.h>
-@@ -499,6 +500,7 @@ found:
+@@ -493,6 +494,7 @@ found:
  
  	return -EPERM;
  }
@@ -172,10 +203,10 @@ index c43a332..0c37289 100644
  int devcgroup_inode_mknod(int mode, dev_t dev)
  {
 diff --git a/security/security.c b/security/security.c
-index bf619ff..60b996a 100644
+index 3efc9b1..c7afd35 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -380,6 +380,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+@@ -383,6 +383,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
  		return 0;
  	return security_ops->path_rmdir(dir, dentry);
  }
@@ -183,7 +214,7 @@ index bf619ff..60b996a 100644
  
  int security_path_unlink(struct path *dir, struct dentry *dentry)
  {
-@@ -396,6 +397,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+@@ -399,6 +400,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
  		return 0;
  	return security_ops->path_symlink(dir, dentry, old_name);
  }
@@ -191,7 +222,7 @@ index bf619ff..60b996a 100644
  
  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,
+@@ -407,6 +409,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,7 +230,7 @@ index bf619ff..60b996a 100644
  
  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)
+@@ -425,6 +428,7 @@ int security_path_truncate(struct path *path)
  		return 0;
  	return security_ops->path_truncate(path);
  }
@@ -207,7 +238,7 @@ index bf619ff..60b996a 100644
  
  int security_path_chmod(struct path *path, umode_t mode)
  {
-@@ -429,6 +433,7 @@ int security_path_chmod(struct path *path, umode_t mode)
+@@ -432,6 +436,7 @@ int security_path_chmod(struct path *path, umode_t mode)
  		return 0;
  	return security_ops->path_chmod(path, mode);
  }
@@ -215,7 +246,7 @@ index bf619ff..60b996a 100644
  
  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)
+@@ -439,6 +444,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 +254,7 @@ index bf619ff..60b996a 100644
  
  int security_path_chroot(struct path *path)
  {
-@@ -512,6 +518,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -515,6 +521,7 @@ int security_inode_readlink(struct dentry *dentry)
  		return 0;
  	return security_ops->inode_readlink(dentry);
  }
@@ -231,7 +262,7 @@ index bf619ff..60b996a 100644
  
  int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
-@@ -526,6 +533,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -529,6 +536,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return security_ops->inode_permission(inode, mask);
  }
@@ -239,7 +270,7 @@ index bf619ff..60b996a 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -641,6 +649,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -644,6 +652,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -247,11 +278,11 @@ index bf619ff..60b996a 100644
  
  int security_file_alloc(struct file *file)
  {
-@@ -668,6 +677,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+@@ -704,6 +713,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }
-+EXPORT_SYMBOL(security_file_mmap);
++EXPORT_SYMBOL(security_mmap_file);
  
- int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
- 			    unsigned long prot)
+ int security_mmap_addr(unsigned long addr)
+ {