From f20e9d119f46f6698fb84b6902bff8bd8010a6ec Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 9 Jan 2012 10:22:19 +0000 Subject: [PATCH] Version Bump Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- sys-fs/aufs3/ChangeLog | 9 +- sys-fs/aufs3/Manifest | 14 +- sys-fs/aufs3/aufs3-3_p20120109.ebuild | 146 +++++++++++ sys-fs/aufs3/files/aufs3-base-2.patch | 70 ++++++ sys-fs/aufs3/files/aufs3-standalone-0.patch | 2 +- sys-fs/aufs3/files/aufs3-standalone-2.patch | 257 ++++++++++++++++++++ 6 files changed, 491 insertions(+), 7 deletions(-) create mode 100644 sys-fs/aufs3/aufs3-3_p20120109.ebuild create mode 100644 sys-fs/aufs3/files/aufs3-base-2.patch create mode 100644 sys-fs/aufs3/files/aufs3-standalone-2.patch diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog index 64603ee372fd..2dc729b19c54 100644 --- a/sys-fs/aufs3/ChangeLog +++ b/sys-fs/aufs3/ChangeLog @@ -1,6 +1,13 @@ # 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.5 2012/01/08 13:31:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.6 2012/01/09 10:22:19 jlec Exp $ + +*aufs3-3_p20120109 (09 Jan 2012) + + 09 Jan 2012; Justin Lecher files/aufs3-standalone-0.patch, + +files/aufs3-base-2.patch, +files/aufs3-standalone-2.patch, + +aufs3-3_p20120109.ebuild: + Version Bump *aufs3-3_p20111205-r1 (08 Jan 2012) diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest index 70d9dcc819c2..24905f932883 100644 --- a/sys-fs/aufs3/Manifest +++ b/sys-fs/aufs3/Manifest @@ -4,26 +4,30 @@ Hash: SHA512 AUX aufs-util-31.patch 852 RMD160 bc4eaf23e62a0634e204cf25acb412b6c856c39b SHA1 51f7b18407295fe952f87a1f30678b3d84f4e366 SHA256 8729b765bf48143a12e8038b4141a27e24ab72f0dee2a60c1b1ac01e58dbcbd0 AUX aufs3-base-0.patch 2711 RMD160 bf3995e925b25d97c02673dfad596ea35ee4f0f5 SHA1 f193efb6a1f44a0bb5630974e6b209877097970d SHA256 4d6e669f9bebc301d0acf3e0dedaaff84aaa19ef7633da3c11cc3430d232ce86 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-x-rcN.patch 2738 RMD160 843e42cc6c83803d5e61bf6f4a6ee7542d9bb5a0 SHA1 35fb1903461afc5e25695f6714884070a6877b11 SHA256 e89517543869b6a030f5f581920e78b9e53893a266020d6c6a695a82bbe72c05 AUX aufs3-fix-export-__devcgroup_inode_permission.patch 231 RMD160 d26cc80dd9d54429e4f244f51f54b7d6df074c55 SHA1 a588e94d58063faa3b239bf7a5eeff81b4963a25 SHA256 e2e18629401ecc1d8a89cc21f911c11c5e451161570cf36bff942a54ac523053 -AUX aufs3-standalone-0.patch 7665 RMD160 5769d42935c0ebc043373d13634552eebd96a4a3 SHA1 94f61a17807991e7db1f00901a7e87b78847f2d8 SHA256 d4ae47e64ba6dea2a3f33cabbf2a502acedb4963467a5d889d59f9a1df3f05ab +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-x-rcN.patch 7514 RMD160 d800bd9f4d2ca8ead4c6879b2d3a46f89d1272f6 SHA1 dd4c5f2d40706b06d02f3fe4d918e5f4d7c0e890 SHA256 7fc69ea58084f8a0d92d9049330fed1bba7225b9895c55cef1a00c747863ac0c AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d7b01959a8ed5756c78d29255923287c6 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad DIST aufs3-3_p20110815.tar.xz 391672 RMD160 f99b997401f1d983cb46ceb355445b94e6103c56 SHA1 f1d91e872cc75ee8bb76f6f4a08ddbe3c3a9c6b8 SHA256 e7d71097ba949c9a42b726f0e13ada8bed41f3630a4749f46a0eb7823851e337 DIST aufs3-3_p20111031.tar.xz 432796 RMD160 1321f3233578ac563d998fac5430b78e0c74eab3 SHA1 18c5244bb3ca28babd09a6350df42bc53a3a8bd0 SHA256 c9d9332fe9fab6c8cdadfa890591ef872cdf68ea1091cbaf60e79cdfb2113355 DIST aufs3-3_p20111114.tar.xz 472760 RMD160 60c030fc9f7c5e5297a0c68efb6501039de281bf SHA1 6c1c4535156e9c8115417f336d5745a46618133a SHA256 3e68f7ffe4feee593f786b3f335e0ec83ff576d40a262535fa2b2f79d872bc0a DIST aufs3-3_p20111205.tar.xz 478084 RMD160 33a545ec241a855b5e1d675334da6cc77417b58d SHA1 bf4e4d728cfe8a551f334eef57c6d850c93b072d SHA256 c522eaf622d7efb9489cde47c6fe2ac49ffe24d86871191ab76bfb7684a4824b +DIST aufs3-3_p20120109.tar.xz 572140 RMD160 0e36afa641ea51bb1d102a6b4381573f6deb71a7 SHA1 5ad014f188b1673eaf1dba08d90ab56f9b88a392 SHA256 7d83bee04871def490193fd9c2e5af1b386caaedd980bee7856c7389db9c8444 EBUILD aufs3-3_p20110815.ebuild 3924 RMD160 3b62654d7c66a13a9b3c2a8ed7b0ab57d9d6699d SHA1 d1293e727a590619a42706cf6d63975681f14116 SHA256 1b83d7bc7f5a2779ddb0de7bcd19c9daae64278af9106cb41949be4c5bab51c0 EBUILD aufs3-3_p20111031.ebuild 4064 RMD160 ae385f7895de0b58d892e5a84669c8993a999417 SHA1 b871613ac5c22a410979edaef2d19c10ceed2941 SHA256 56405349d2dc3dad6eb4028d6048ff3e5b6b96c45fe7b7b5a68c2c474369b43f EBUILD aufs3-3_p20111114.ebuild 4023 RMD160 ce04630f37c94af8b8bcd0311e497f9d1725b722 SHA1 6a197abdb447826b471262ba0b66fd3a8ece3a4d SHA256 d74a55ddb45e996ef1c853487e925d5d1e350a8b1b9cc51c04ec36bd6b0fabae EBUILD aufs3-3_p20111205-r1.ebuild 4613 RMD160 0cbca3ae3b89b66f57e97597ffb050e72d814db9 SHA1 396cd1841bd8b833ef078391469f5bb4836bac3c SHA256 350e90ce6438697d39c462c660694bff82891553885be3db8446fa5c88b57c20 -MISC ChangeLog 2174 RMD160 543d2dbdf12842bc0f9629d7c4831b5e63f79a0d SHA1 ee6b2c11fd226b6a4c5520e3ac7aaa73c3fbc998 SHA256 24a77595524e44a27134c95fd82f8006d84f37fff4893be6404551fd1cbcce4f +EBUILD aufs3-3_p20120109.ebuild 4610 RMD160 8f00fed5ca889b0a25b030ffaf5fdc5b4bd52750 SHA1 e6ace683cf41cd75f661552337b3ab89625ce94c SHA256 3951e04934f088cbf9ca97af9a8252618f592e03bb245d80a0bb12c20224a687 +MISC ChangeLog 2394 RMD160 843372b3dccde51ac968501fa2011c1ad77999ed SHA1 b7ed4da20832b1b3d81a721b1ef98274ae85e90e SHA256 b52400f570ebc38c2a3a6a0dbba75a498ce0dd0dd2cca913f393689a1a2ef735 MISC metadata.xml 758 RMD160 f05821007d4e2f7d58dd9b3c8aac840f85ddb9dc SHA1 988f050899dfed3593cc5d3f65caa02275c4bdb9 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk8JmrIACgkQgAnW8HDreRaa4QCfaoOuQZFXIeRMWLlD9PkcDIry -krsAn0B4mlrI9M2/smBiGOaVz4hHXs0p -=aMMg +iEYEAREKAAYFAk8Kv+AACgkQgAnW8HDreRbEgACdESOHlLY6c5GOw/g0pJ/bPbxE +A6gAoKSJ0drBe1Y7si9hdECVL3qASBUv +=+ljN -----END PGP SIGNATURE----- diff --git a/sys-fs/aufs3/aufs3-3_p20120109.ebuild b/sys-fs/aufs3/aufs3-3_p20120109.ebuild new file mode 100644 index 000000000000..9d5d9f6d231e --- /dev/null +++ b/sys-fs/aufs3/aufs3-3_p20120109.ebuild @@ -0,0 +1,146 @@ +# 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_p20120109.ebuild,v 1.1 2012/01/09 10:22:19 jlec Exp $ + +EAPI=4 + +inherit linux-mod multilib toolchain-funcs + +AUFS_VERSION="${PV%%_p*}" +PATCH_MAX_VER="2" +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 2 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 + [[ ${KV_MINOR} -gt ${PATCH_MAX_VER} ]] && \ + epatch "${FILESDIR}"/${PN}-fix-export-__devcgroup_inode_permission.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 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-2.patch b/sys-fs/aufs3/files/aufs3-base-2.patch new file mode 100644 index 000000000000..ac30c8db9033 --- /dev/null +++ b/sys-fs/aufs3/files/aufs3-base-2.patch @@ -0,0 +1,70 @@ +aufs3.2 base patch + +diff --git a/fs/namei.c b/fs/namei.c +index 5008f01..4cc94cf 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1753,7 +1753,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 fa2defa..e3569b0 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1085,8 +1085,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); +@@ -1113,9 +1113,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-0.patch b/sys-fs/aufs3/files/aufs3-standalone-0.patch index 54456bf3b030..ada3df9d4b06 100644 --- a/sys-fs/aufs3/files/aufs3-standalone-0.patch +++ b/sys-fs/aufs3/files/aufs3-standalone-0.patch @@ -131,7 +131,7 @@ index b52cf01..c1b341c 100644 static long do_sys_truncate(const char __user *pathname, loff_t length) { diff --git a/fs/splice.c b/fs/splice.c -index 19afec6..11f07f8 100644 +index 19afec6..11f07f86 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, diff --git a/sys-fs/aufs3/files/aufs3-standalone-2.patch b/sys-fs/aufs3/files/aufs3-standalone-2.patch new file mode 100644 index 000000000000..ae897f388cb7 --- /dev/null +++ b/sys-fs/aufs3/files/aufs3-standalone-2.patch @@ -0,0 +1,257 @@ +aufs3.2 standalone patch + +diff --git a/fs/file_table.c b/fs/file_table.c +index c322794..2aad244 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 ee4e66b..728042b 100644 +--- a/fs/inode.c ++++ b/fs/inode.c +@@ -65,6 +65,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 4cc94cf..af19e30 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1757,6 +1757,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 cfc6d44..173d15a 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1506,6 +1506,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 63fc294..6f4adca 100644 +--- a/fs/notify/group.c ++++ b/fs/notify/group.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #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 e14587d..be6533b 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 22c41b5..33b4033 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 e3569b0..9dc07b7 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, + + return splice_write(pipe, out, ppos, len, flags); + } ++EXPORT_SYMBOL(do_splice_from); + + /* + * 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, + + 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 ee4f848..611fd70 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -975,3 +975,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 +--- a/security/device_cgroup.c ++++ b/security/device_cgroup.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -500,6 +501,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 e2f684a..892000c 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -411,6 +411,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) + { +@@ -427,6 +428,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) +@@ -435,6 +437,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) +@@ -453,6 +456,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, + 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) + { +@@ -468,6 +473,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) + { +@@ -544,6 +550,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) + { +@@ -558,6 +565,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) + { +@@ -673,6 +681,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) + { +@@ -700,6 +709,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) -- 2.26.2