diff options
author | Justin Lecher <jlec@gentoo.org> | 2011-08-15 18:49:16 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2011-08-15 18:49:16 +0000 |
commit | dba7cd1e02c1ad1f6fd0ac1aa5efa842aa487e2a (patch) | |
tree | 55d467015e11e64204bb9a28e94a14d81615c28f /sys-fs/aufs2 | |
parent | x86 stable, bug #377465 (diff) | |
download | gentoo-2-dba7cd1e02c1ad1f6fd0ac1aa5efa842aa487e2a.tar.gz gentoo-2-dba7cd1e02c1ad1f6fd0ac1aa5efa842aa487e2a.tar.bz2 gentoo-2-dba7cd1e02c1ad1f6fd0ac1aa5efa842aa487e2a.zip |
Version Bump
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/aufs2')
19 files changed, 1872 insertions, 689 deletions
diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog index a2a39d2b8751..5d3549114ada 100644 --- a/sys-fs/aufs2/ChangeLog +++ b/sys-fs/aufs2/ChangeLog @@ -1,6 +1,20 @@ # 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.38 2011/06/27 08:12:45 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.39 2011/08/15 18:49:16 jlec Exp $ + +*aufs2-2.2_p20110815 (15 Aug 2011) + + 15 Aug 2011; Justin Lecher <jlec@gentoo.org> -aufs2-0_p20100809.ebuild, + -aufs2-0_p20101122.ebuild, -aufs2-0_p20110120.ebuild, + -aufs2-0_p20110120-r1.ebuild, -aufs2-0_p20110327.ebuild, + -aufs2-0_p20110605.ebuild, -aufs2-0_p20110620.ebuild, + aufs2-0_p20110627.ebuild, +aufs2-2.2_p20110815.ebuild, + +files/2.2/aufs2-base-35.patch, +files/2.2/aufs2-standalone-35.patch, + +files/2.2/aufs2-base-36.patch, +files/2.2/aufs2-standalone-36.patch, + +files/2.2/aufs2-base-37.patch, +files/2.2/aufs2-standalone-37.patch, + +files/2.2/aufs2-base-38.patch, +files/2.2/aufs2-standalone-38.patch, + +files/2.2/aufs2-base-39.patch, +files/2.2/aufs2-standalone-39.patch: + Version Bump *aufs2-0_p20110627 (27 Jun 2011) diff --git a/sys-fs/aufs2/aufs2-0_p20100809.ebuild b/sys-fs/aufs2/aufs2-0_p20100809.ebuild deleted file mode 100644 index c02f7e22bf6e..000000000000 --- a/sys-fs/aufs2/aufs2-0_p20100809.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# 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_p20100809.ebuild,v 1.4 2011/03/27 13:09:40 jlec Exp $ - -EAPI="2" - -inherit linux-mod multilib toolchain-funcs - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug inotify hardened kernel-patch nfs ramfs" - -DEPEND="dev-vcs/git" -RDEPEND="!sys-fs/aufs" - -S=${WORKDIR}/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - # 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 27 && die "kernel too old" - kernel_is gt 2 6 35 && die "kernel too new" - - 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 - linux-mod_pkg_setup - export PKG_SETUP_HAS_BEEN_RAN=1 -} - -src_prepare() { - local branch=origin/aufs2-${KV_PATCH} - git checkout -q $branch || die - if ! use debug; then - sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die - fi - if use inotify; then - sed -i -e "s:AUFS_HNOTIFY =:AUFS_HNOTIFY = y:g" \ - -e "s:AUFS_HINOTIFY =:AUFS_HINOTIFY = y:g" config.mk || die - fi - if use ramfs; then - sed -i "s:RAMFS =:RAMFS = y:g" config.mk || die - fi - if use hardened ; then - epatch "${FILESDIR}"/pax.patch - fi - - cd "${WORKDIR}"/${PN}-util - 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 myargs="" ARCH=x86 - use nfs && myargs="CONFIG_EXPORTFS=y CONFIG_AUFS_EXPORT=y " - use nfs && use amd64 && myargs+="CONFIG_AUFS_INO_T_64=y" - emake CC=$(tc-getCC) CONFIG_AUFS_FS=m ${myargs} KDIR=${KV_DIR} || die - cd "${WORKDIR}"/${PN}-util - emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include || die -} - -src_install() { - linux-mod_src_install - dodoc README || die - docinto design - dodoc design/*.txt || die - cd "${WORKDIR}"/${PN}-util - emake DESTDIR="${D}" KDIR=${KV_DIR} install || die - docinto - newdoc README README-utils || die -} diff --git a/sys-fs/aufs2/aufs2-0_p20101122.ebuild b/sys-fs/aufs2/aufs2-0_p20101122.ebuild deleted file mode 100644 index c6f43c49ef1c..000000000000 --- a/sys-fs/aufs2/aufs2-0_p20101122.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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_p20101122.ebuild,v 1.3 2011/03/27 13:09:40 jlec Exp $ - -EAPI="2" - -inherit linux-mod multilib toolchain-funcs - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug inotify hardened kernel-patch nfs ramfs" - -DEPEND="dev-vcs/git" -RDEPEND="!sys-fs/aufs" - -S=${WORKDIR}/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - # 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 36 && 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 -} - -src_prepare() { - local branch=origin/aufs2.1-${KV_PATCH} - git checkout -q $branch || die - if ! use debug; then - sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die - fi - if use inotify; then - sed -i -e "s:AUFS_HNOTIFY =:AUFS_HNOTIFY = y:g" \ - -e "s:AUFS_HINOTIFY =:AUFS_HINOTIFY = y:g" config.mk || die - fi - if use ramfs; then - sed -i "s:RAMFS =:RAMFS = y:g" config.mk || die - fi - 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 myargs="" ARCH=x86 - use nfs && myargs="CONFIG_EXPORTFS=y CONFIG_AUFS_EXPORT=y " - use nfs && use amd64 && myargs+="CONFIG_AUFS_INO_T_64=y" - emake CC=$(tc-getCC) CONFIG_AUFS_FS=m ${myargs} KDIR=${KV_DIR} || die - cd "${WORKDIR}"/${PN}-util - emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include || die -} - -src_install() { - linux-mod_src_install - dodoc README || die - docinto design - dodoc design/*.txt || die - cd "${WORKDIR}"/${PN}-util - emake DESTDIR="${D}" KDIR=${KV_DIR} install || die - docinto - newdoc README README-utils || die -} diff --git a/sys-fs/aufs2/aufs2-0_p20110120-r1.ebuild b/sys-fs/aufs2/aufs2-0_p20110120-r1.ebuild deleted file mode 100644 index b964f58b1d14..000000000000 --- a/sys-fs/aufs2/aufs2-0_p20110120-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# 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_p20110120-r1.ebuild,v 1.2 2011/03/27 13:09:40 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.bz2" - -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 37 && 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/aufs2-0_p20110120.ebuild b/sys-fs/aufs2/aufs2-0_p20110120.ebuild deleted file mode 100644 index dc9792ee208a..000000000000 --- a/sys-fs/aufs2/aufs2-0_p20110120.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# 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_p20110120.ebuild,v 1.5 2011/03/27 13:09:40 jlec Exp $ - -EAPI="2" - -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.bz2 - mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug fuse inotify hardened hfs 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 37 && 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 -} - -src_prepare() { - local branch=origin/aufs2.1-${KV_PATCH} - git checkout -q $branch || die - if ! use debug; then - sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die - fi - if use inotify; then - sed -i -e "s:AUFS_HNOTIFY =:AUFS_HNOTIFY = y:g" \ - -e "s:AUFS_HFSNOTIFY =:AUFS_HFSNOTIFY = y:g" config.mk || die - fi - if use ramfs; then - sed -i "s:RAMFS =:RAMFS = y:g" config.mk || die - fi - - sed -i "s:AUFS_RDU =:AUFS_RDU = y:g" config.mk || die - - if use fuse; then - sed \ - -e "s:AUFS_BR_FUSE =:AUFS_BR_FUSE = y:g" \ - -e "s:AUFS_POLL =:AUFS_POLL = y:g" \ - -i config.mk || die - fi - - if use hfs; then - sed -i "s:AUFS_BR_HFSPLUS =:AUFS_BR_HFSPLUS = y:g" config.mk || die - fi - - 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 myargs="" ARCH=x86 - use nfs && myargs="CONFIG_EXPORTFS=y CONFIG_AUFS_EXPORT=y " - use nfs && use amd64 && myargs+="CONFIG_AUFS_INO_T_64=y" - emake CC=$(tc-getCC) CONFIG_AUFS_FS=m ${myargs} KDIR=${KV_DIR} || die - cd "${WORKDIR}"/${PN}-util - emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include || die -} - -src_install() { - linux-mod_src_install - dodoc README || die - docinto design - dodoc design/*.txt || die - cd "${WORKDIR}"/${PN}-util - emake DESTDIR="${D}" KDIR=${KV_DIR} install || die - docinto - newdoc README README-utils || die -} diff --git a/sys-fs/aufs2/aufs2-0_p20110327.ebuild b/sys-fs/aufs2/aufs2-0_p20110327.ebuild deleted file mode 100644 index d99f9c34c35c..000000000000 --- a/sys-fs/aufs2/aufs2-0_p20110327.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# 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_p20110327.ebuild,v 1.1 2011/03/27 13:09:40 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.bz2" - -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 38 && 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/aufs2-0_p20110620.ebuild b/sys-fs/aufs2/aufs2-0_p20110620.ebuild deleted file mode 100644 index a3f1d5c5ba22..000000000000 --- a/sys-fs/aufs2/aufs2-0_p20110620.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# 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_p20110620.ebuild,v 1.1 2011/06/20 05:49:29 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/aufs2-0_p20110627.ebuild b/sys-fs/aufs2/aufs2-0_p20110627.ebuild index d333348c5e70..a2b1c1ac1ec5 100644 --- a/sys-fs/aufs2/aufs2-0_p20110627.ebuild +++ b/sys-fs/aufs2/aufs2-0_p20110627.ebuild @@ -1,8 +1,8 @@ # 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_p20110627.ebuild,v 1.1 2011/06/27 08:12:45 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20110627.ebuild,v 1.2 2011/08/15 18:49:16 jlec Exp $ -EAPI="4" +EAPI=4 inherit linux-mod multilib toolchain-funcs @@ -16,7 +16,9 @@ KEYWORDS="~amd64 ~x86" IUSE="debug fuse hardened hfs inotify kernel-patch nfs ramfs" DEPEND="dev-vcs/git" -RDEPEND="!sys-fs/aufs" +RDEPEND=" + !sys-fs/aufs + !sys-fs/aufs3" S="${WORKDIR}"/${PN}-standalone @@ -29,7 +31,7 @@ pkg_setup() { 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 + # 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 @@ -37,21 +39,21 @@ pkg_setup() { 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 ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${KV_PATCH}.patch >/dev/null && \ + patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-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 + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${KV_PATCH}.patch >/dev/null + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${KV_PATCH}.patch >/dev/null + epatch "${FILESDIR}"/${PN}-{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 "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}/aufs2-base-${KV_PATCH}.patch and" - eerror "${FILESDIR}/aufs2-standalone-${KV_PATCH}.patch by hand" + eerror "or apply ${FILESDIR}/${PN}-base-${KV_PATCH}.patch and" + eerror "${FILESDIR}/${PN}-standalone-${KV_PATCH}.patch by hand" die "missing kernel patch, please apply it first" fi fi diff --git a/sys-fs/aufs2/aufs2-0_p20110605.ebuild b/sys-fs/aufs2/aufs2-2.2_p20110815.ebuild index f829eb96230d..3fadadd31a5e 100644 --- a/sys-fs/aufs2/aufs2-0_p20110605.ebuild +++ b/sys-fs/aufs2/aufs2-2.2_p20110815.ebuild @@ -1,11 +1,13 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-2.2_p20110815.ebuild,v 1.1 2011/08/15 18:49:16 jlec Exp $ -EAPI="4" +EAPI=4 inherit linux-mod multilib toolchain-funcs +AUFS_VERSION="${PV%%_p*}" + 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" @@ -16,7 +18,9 @@ KEYWORDS="~amd64 ~x86" IUSE="debug fuse hardened hfs inotify kernel-patch nfs ramfs" DEPEND="dev-vcs/git" -RDEPEND="!sys-fs/aufs" +RDEPEND=" + !sys-fs/aufs + !sys-fs/aufs3" S="${WORKDIR}"/${PN}-standalone @@ -29,29 +33,29 @@ pkg_setup() { 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 + # 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 2 6 31 && die "kernel too old" + kernel_is lt 2 6 35 && 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 ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-standalone-${KV_PATCH}.patch >/dev/null && \ + patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-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 + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-standalone-${KV_PATCH}.patch >/dev/null + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-base-${KV_PATCH}.patch >/dev/null + epatch "${FILESDIR}"/${AUFS_VERSION}/${PN}-{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 "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}/aufs2-base-${KV_PATCH}.patch and" - eerror "${FILESDIR}/aufs2-standalone-${KV_PATCH}.patch by hand" + eerror "or apply ${FILESDIR}/${PN}-base-${KV_PATCH}.patch and" + eerror "${FILESDIR}/${PN}-standalone-${KV_PATCH}.patch by hand" die "missing kernel patch, please apply it first" fi fi @@ -66,7 +70,7 @@ set_config() { } src_prepare() { - local branch=origin/aufs2.1-${KV_PATCH} + local branch=origin/aufs${AUFS_VERSION}-${KV_PATCH} git checkout -q $branch || die # All config options to off @@ -90,7 +94,7 @@ src_prepare() { sed -i "s:__user::g" include/linux/aufs_type.h || die cd "${WORKDIR}"/${PN}-util - git checkout -q origin/aufs2.1 + git checkout -q origin/aufs${AUFS_VERSION} 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 } diff --git a/sys-fs/aufs2/files/2.2/aufs2-base-35.patch b/sys-fs/aufs2/files/2.2/aufs2-base-35.patch new file mode 100644 index 000000000000..4261f58b801e --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-base-35.patch @@ -0,0 +1,81 @@ +aufs2.2 base patch for linux-2.6.35 + +diff --git a/fs/namei.c b/fs/namei.c +index 868d0cb..6e92c81 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1178,7 +1178,7 @@ out: + * 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) + { + int err; + +@@ -1188,7 +1188,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } + +-static int __lookup_one_len(const char *name, struct qstr *this, ++int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) + { + unsigned long hash; +diff --git a/fs/splice.c b/fs/splice.c +index efdbfec..e01a51e 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1104,8 +1104,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); +@@ -1132,9 +1132,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 05b441d..91bc74e 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -73,6 +73,9 @@ 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 int __lookup_one_len(const char *name, struct qstr *this, ++ struct dentry *base, int len); + extern struct dentry *lookup_one_len(const char *, struct dentry *, int); + + extern int follow_down(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/2.2/aufs2-base-36.patch b/sys-fs/aufs2/files/2.2/aufs2-base-36.patch new file mode 100644 index 000000000000..f4d28996d283 --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-base-36.patch @@ -0,0 +1,81 @@ +aufs2.2 base patch for linux-2.6.36 + +diff --git a/fs/namei.c b/fs/namei.c +index 24896e8..19d69c5 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1159,7 +1159,7 @@ out: + * 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) + { + int err; + +@@ -1169,7 +1169,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } + +-static int __lookup_one_len(const char *name, struct qstr *this, ++int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) + { + unsigned long hash; +diff --git a/fs/splice.c b/fs/splice.c +index 8f1dfae..278c94f 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1092,8 +1092,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); +@@ -1120,9 +1120,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 05b441d..91bc74e 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -73,6 +73,9 @@ 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 int __lookup_one_len(const char *name, struct qstr *this, ++ struct dentry *base, int len); + extern struct dentry *lookup_one_len(const char *, struct dentry *, int); + + extern int follow_down(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/2.2/aufs2-base-37.patch b/sys-fs/aufs2/files/2.2/aufs2-base-37.patch new file mode 100644 index 000000000000..40fbd08ca749 --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-base-37.patch @@ -0,0 +1,78 @@ +aufs2.2 base patch for linux-2.6.37 + +diff --git a/fs/namei.c b/fs/namei.c +index 4ff7ca5..a8c583f 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1161,12 +1161,12 @@ out: + * 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); + } + +-static int __lookup_one_len(const char *name, struct qstr *this, ++int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) + { + unsigned long hash; +diff --git a/fs/splice.c b/fs/splice.c +index ce2f025..ff0ae69 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1092,8 +1092,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); +@@ -1120,9 +1120,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 05b441d..91bc74e 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -73,6 +73,9 @@ 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 int __lookup_one_len(const char *name, struct qstr *this, ++ struct dentry *base, int len); + extern struct dentry *lookup_one_len(const char *, struct dentry *, int); + + extern int follow_down(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/2.2/aufs2-base-38.patch b/sys-fs/aufs2/files/2.2/aufs2-base-38.patch new file mode 100644 index 000000000000..c91262af6523 --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-base-38.patch @@ -0,0 +1,78 @@ +aufs2.2 base patch for linux-2.6.38 + +diff --git a/fs/namei.c b/fs/namei.c +index a4689eb..0513563 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1842,12 +1842,12 @@ out: + * 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); + } + +-static int __lookup_one_len(const char *name, struct qstr *this, ++int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) + { + unsigned long hash; +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 f276d4f..4eb5fcb 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -79,6 +79,9 @@ 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 int __lookup_one_len(const char *name, struct qstr *this, ++ struct dentry *base, int len); + 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/2.2/aufs2-base-39.patch b/sys-fs/aufs2/files/2.2/aufs2-base-39.patch new file mode 100644 index 000000000000..d2fbbc8fb5ba --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-base-39.patch @@ -0,0 +1,70 @@ +aufs2.2 base patch for linux-2.6.39 + +diff --git a/fs/namei.c b/fs/namei.c +index e3c4f11..202d358 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1769,7 +1769,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/2.2/aufs2-standalone-35.patch b/sys-fs/aufs2/files/2.2/aufs2-standalone-35.patch new file mode 100644 index 000000000000..d685cd7156f0 --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-standalone-35.patch @@ -0,0 +1,312 @@ +aufs2.2 standalone patch for linux-2.6.35 + +diff --git a/fs/file_table.c b/fs/file_table.c +index 5c7d10e..9031acf 100644 +--- a/fs/file_table.c ++++ b/fs/file_table.c +@@ -34,6 +34,7 @@ struct files_stat_struct files_stat = { + + /* public. Not pretty! */ + __cacheline_aligned_in_smp DEFINE_SPINLOCK(files_lock); ++EXPORT_SYMBOL(files_lock); + + /* SLAB cache for file structures */ + static struct kmem_cache *filp_cachep __read_mostly; +@@ -346,6 +347,7 @@ void file_kill(struct file *file) + file_list_unlock(); + } + } ++EXPORT_SYMBOL(file_kill); + + int fs_may_remount_ro(struct super_block *sb) + { +diff --git a/fs/inode.c b/fs/inode.c +index 722860b..bfb0698 100644 +--- a/fs/inode.c ++++ b/fs/inode.c +@@ -84,6 +84,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(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 6e92c81..334130e 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -348,6 +348,7 @@ int deny_write_access(struct file * file) + + return 0; + } ++EXPORT_SYMBOL(deny_write_access); + + /** + * path_get - get a reference to a path +@@ -1187,6 +1188,7 @@ struct dentry *lookup_hash(struct nameidata *nd) + return ERR_PTR(err); + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } ++EXPORT_SYMBOL(lookup_hash); + + int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) +@@ -1209,6 +1211,7 @@ int __lookup_one_len(const char *name, struct qstr *this, + this->hash = end_name_hash(hash); + return 0; + } ++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 88058de..6e39b694 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -39,6 +39,7 @@ + + /* spinlock for vfsmount related operations, inplace of dcache_lock */ + __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock); ++EXPORT_SYMBOL(vfsmount_lock); + + static int event; + static DEFINE_IDA(mnt_id_ida); +@@ -1279,6 +1280,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 0e16771..3fab10a 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" +@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) + fsnotify_recalc_global_mask(); + fsnotify_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_put_group); + + /* + * Simply run the fsnotify_groups list and find a group which matches +@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, + + return group; + } ++EXPORT_SYMBOL(fsnotify_obtain_group); +diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c +index 0399bcb..74cdc13 100644 +--- a/fs/notify/inode_mark.c ++++ b/fs/notify/inode_mark.c +@@ -105,6 +105,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) + if (atomic_dec_and_test(&entry->refcnt)) + entry->free_mark(entry); + } ++EXPORT_SYMBOL(fsnotify_put_mark); + + /* + * Recalculate the mask of events relevant to a given inode locked. +@@ -215,6 +216,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) + if (unlikely(atomic_dec_and_test(&group->num_marks))) + fsnotify_final_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); + + /* + * Given a group, destroy all of the marks associated with that group. +@@ -281,6 +283,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou + } + return NULL; + } ++EXPORT_SYMBOL(fsnotify_find_mark_entry); + + /* + * Nothing fancy, just initialize lists and locks and counters. +@@ -297,6 +300,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, + entry->inode = NULL; + entry->free_mark = free_mark; + } ++EXPORT_SYMBOL(fsnotify_init_mark); + + /* + * Attach an initialized mark entry to a given group and inode. +@@ -352,6 +356,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /** + * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. +diff --git a/fs/open.c b/fs/open.c +index 5463266..d248ead 100644 +--- a/fs/open.c ++++ b/fs/open.c +@@ -59,6 +59,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 e01a51e..4806358 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1128,6 +1128,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. +@@ -1154,6 +1155,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 4e01599..3611e1b 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -951,3 +951,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 351942a..6ba84a8 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -376,6 +376,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(security_path_mkdir); + + int security_path_rmdir(struct path *dir, struct dentry *dentry) + { +@@ -383,6 +384,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) + { +@@ -390,6 +392,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) + return 0; + return security_ops->path_unlink(dir, dentry); + } ++EXPORT_SYMBOL(security_path_unlink); + + int security_path_symlink(struct path *dir, struct dentry *dentry, + const char *old_name) +@@ -398,6 +401,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) +@@ -406,6 +410,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) +@@ -416,6 +421,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(security_path_rename); + + int security_path_truncate(struct path *path, loff_t length, + unsigned int time_attrs) +@@ -424,6 +430,7 @@ int security_path_truncate(struct path *path, loff_t length, + return 0; + return security_ops->path_truncate(path, length, time_attrs); + } ++EXPORT_SYMBOL(security_path_truncate); + + int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, + mode_t mode) +@@ -432,6 +439,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) + { +@@ -439,6 +447,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) + { +@@ -515,6 +524,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) + { +@@ -529,6 +539,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) + { +@@ -622,6 +633,7 @@ int security_file_permission(struct file *file, int mask) + { + return security_ops->file_permission(file, mask); + } ++EXPORT_SYMBOL(security_file_permission); + + int security_file_alloc(struct file *file) + { +@@ -649,6 +661,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) diff --git a/sys-fs/aufs2/files/2.2/aufs2-standalone-36.patch b/sys-fs/aufs2/files/2.2/aufs2-standalone-36.patch new file mode 100644 index 000000000000..c0e788b2df1e --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-standalone-36.patch @@ -0,0 +1,289 @@ +aufs2.2 standalone patch for linux-2.6.36 + +diff --git a/fs/file_table.c b/fs/file_table.c +index a04bdd8..f51588f 100644 +--- a/fs/file_table.c ++++ b/fs/file_table.c +@@ -394,6 +394,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 8646433..d84944d 100644 +--- a/fs/inode.c ++++ b/fs/inode.c +@@ -83,6 +83,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(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 19d69c5..944842e 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -347,6 +347,7 @@ int deny_write_access(struct file * file) + + return 0; + } ++EXPORT_SYMBOL(deny_write_access); + + /** + * path_get - get a reference to a path +@@ -1168,6 +1169,7 @@ struct dentry *lookup_hash(struct nameidata *nd) + return ERR_PTR(err); + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } ++EXPORT_SYMBOL(lookup_hash); + + int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) +@@ -1190,6 +1192,7 @@ int __lookup_one_len(const char *name, struct qstr *this, + this->hash = end_name_hash(hash); + return 0; + } ++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 a72eaab..36107eb 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1322,6 +1322,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 325185e..adede09 100644 +--- a/fs/notify/mark.c ++++ b/fs/notify/mark.c +@@ -113,6 +113,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. +@@ -190,6 +191,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) + { +@@ -277,6 +279,7 @@ err: + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /* + * clear any marks in a group in which mark->flags & flags is true +@@ -332,6 +335,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 d74e198..53ef25e 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 278c94f..033f7ac 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, + + return splice_write(pipe, out, ppos, len, flags); + } ++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, + + 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 9d172e6..8a61084 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -951,3 +951,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 c53949f..0ae5b91 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -376,6 +376,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(security_path_mkdir); + + int security_path_rmdir(struct path *dir, struct dentry *dentry) + { +@@ -383,6 +384,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) + { +@@ -390,6 +392,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) + return 0; + return security_ops->path_unlink(dir, dentry); + } ++EXPORT_SYMBOL(security_path_unlink); + + int security_path_symlink(struct path *dir, struct dentry *dentry, + const char *old_name) +@@ -398,6 +401,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) +@@ -406,6 +410,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) +@@ -416,6 +421,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(security_path_rename); + + int security_path_truncate(struct path *path) + { +@@ -423,6 +429,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) +@@ -431,6 +438,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) + { +@@ -438,6 +446,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) + { +@@ -514,6 +523,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) + { +@@ -528,6 +538,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) + { +@@ -627,6 +638,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) + { +@@ -654,6 +666,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) diff --git a/sys-fs/aufs2/files/2.2/aufs2-standalone-37.patch b/sys-fs/aufs2/files/2.2/aufs2-standalone-37.patch new file mode 100644 index 000000000000..1f3692548b56 --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-standalone-37.patch @@ -0,0 +1,289 @@ +aufs2.2 standalone patch for linux-2.6.37 + +diff --git a/fs/file_table.c b/fs/file_table.c +index c3dee38..f529e4d 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(file_sb_list_del); ++ + #ifdef CONFIG_SMP + + /* +diff --git a/fs/inode.c b/fs/inode.c +index ae2727a..2c8071a 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(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 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -347,6 +347,7 @@ int deny_write_access(struct file * file) + + return 0; + } ++EXPORT_SYMBOL(deny_write_access); + + /** + * path_get - get a reference to a path +@@ -1165,6 +1166,7 @@ struct dentry *lookup_hash(struct nameidata *nd) + { + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } ++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, + this->hash = end_name_hash(hash); + return 0; + } ++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 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1321,6 +1321,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 325185e..adede09 100644 +--- a/fs/notify/mark.c ++++ b/fs/notify/mark.c +@@ -113,6 +113,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. +@@ -190,6 +191,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) + { +@@ -277,6 +279,7 @@ err: + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /* + * clear any marks in a group in which mark->flags & flags is true +@@ -332,6 +335,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 4197b9e..912817a 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 ff0ae69..1c9e9b0 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, + + return splice_write(pipe, out, ppos, len, flags); + } ++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, + + 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 64c2ed9..e58b5d8 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -929,3 +929,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 1b798d3..3b7d2ca 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) + return 0; + return security_ops->path_mkdir(dir, dentry, mode); + } ++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) + return 0; + return security_ops->path_rmdir(dir, dentry); + } ++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) + return 0; + return security_ops->path_unlink(dir, dentry); + } ++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, + 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) +@@ -390,6 +394,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) +@@ -400,6 +405,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(security_path_rename); + + int security_path_truncate(struct path *path) + { +@@ -407,6 +413,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) +@@ -415,6 +422,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) + { +@@ -422,6 +430,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) + { +@@ -498,6 +507,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) + { +@@ -512,6 +522,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) + { +@@ -611,6 +622,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) + { +@@ -638,6 +650,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) diff --git a/sys-fs/aufs2/files/2.2/aufs2-standalone-38.patch b/sys-fs/aufs2/files/2.2/aufs2-standalone-38.patch new file mode 100644 index 000000000000..3d763cedaa67 --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-standalone-38.patch @@ -0,0 +1,289 @@ +aufs2.2 standalone patch for linux-2.6.38 + +diff --git a/fs/file_table.c b/fs/file_table.c +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(file_sb_list_del); ++ + #ifdef CONFIG_SMP + + /* +diff --git a/fs/inode.c b/fs/inode.c +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(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 0513563..e1d996e 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -353,6 +353,7 @@ int deny_write_access(struct file * file) + + return 0; + } ++EXPORT_SYMBOL(deny_write_access); + + /** + * path_get - get a reference to a path +@@ -1846,6 +1847,7 @@ struct dentry *lookup_hash(struct nameidata *nd) + { + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } ++EXPORT_SYMBOL(lookup_hash); + + int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) +@@ -1868,6 +1870,7 @@ int __lookup_one_len(const char *name, struct qstr *this, + this->hash = end_name_hash(hash); + return 0; + } ++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 d1edf26..44ca259 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1465,6 +1465,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 325185e..adede09 100644 +--- a/fs/notify/mark.c ++++ b/fs/notify/mark.c +@@ -113,6 +113,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. +@@ -190,6 +191,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) + { +@@ -277,6 +279,7 @@ err: + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /* + * clear any marks in a group in which mark->flags & flags is true +@@ -332,6 +335,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 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(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 64c2ed9..e58b5d8 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -929,3 +929,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 7b7308a..140afc7 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -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(security_path_mkdir); + + 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(security_path_rmdir); + + 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(security_path_unlink); + + int security_path_symlink(struct path *dir, struct dentry *dentry, + const char *old_name) +@@ -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(security_path_symlink); + + int security_path_link(struct dentry *old_dentry, struct path *new_dir, + struct dentry *new_dentry) +@@ -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(security_path_link); + + int security_path_rename(struct path *old_dir, struct dentry *old_dentry, + struct path *new_dir, struct dentry *new_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(security_path_rename); + + 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(security_path_truncate); + + int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, + mode_t mode) +@@ -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(security_path_chmod); + + 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(security_path_chown); + + int security_path_chroot(struct path *path) + { +@@ -497,6 +506,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) + { +@@ -511,6 +521,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) + { +@@ -619,6 +630,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) + { +@@ -646,6 +658,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) diff --git a/sys-fs/aufs2/files/2.2/aufs2-standalone-39.patch b/sys-fs/aufs2/files/2.2/aufs2-standalone-39.patch new file mode 100644 index 000000000000..4cb88625dabf --- /dev/null +++ b/sys-fs/aufs2/files/2.2/aufs2-standalone-39.patch @@ -0,0 +1,257 @@ +aufs2.2 standalone patch for linux-2.6.39 + +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 202d358..876010f 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 +@@ -1773,6 +1774,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 d99bcf5..3ec2aa7 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1508,6 +1508,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 4ba6d4c..9f64bb8 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, 0); + } ++EXPORT_SYMBOL(security_inode_permission); + + int security_inode_exec_permission(struct inode *inode, unsigned int flags) + { +@@ -626,6 +634,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) + { +@@ -653,6 +662,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) |