diff options
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/aufs2/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-fs/aufs2/aufs2-0_p20110605.ebuild | 116 | ||||
| -rw-r--r-- | sys-fs/aufs2/files/aufs2-base-38.patch | 51 | ||||
| -rw-r--r-- | sys-fs/aufs2/files/aufs2-base-39.patch | 70 | ||||
| -rw-r--r-- | sys-fs/aufs2/files/aufs2-standalone-38.patch | 116 | ||||
| -rw-r--r-- | sys-fs/aufs2/files/aufs2-standalone-39.patch | 257 |
6 files changed, 513 insertions, 107 deletions
diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog index 6f03c5f8d983..ccf9de52fc25 100644 --- a/sys-fs/aufs2/ChangeLog +++ b/sys-fs/aufs2/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-fs/aufs2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.35 2011/03/27 13:09:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.36 2011/06/09 13:51:38 jlec Exp $ + +*aufs2-0_p20110605 (09 Jun 2011) + + 09 Jun 2011; Justin Lecher <jlec@gentoo.org> +aufs2-0_p20110605.ebuild, + files/aufs2-base-38.patch, files/aufs2-standalone-38.patch, + +files/aufs2-base-39.patch, +files/aufs2-standalone-39.patch: + Version Bump, rc patches moved to final, still waiting for proper upstream + release *aufs2-0_p20110327 (27 Mar 2011) diff --git a/sys-fs/aufs2/aufs2-0_p20110605.ebuild b/sys-fs/aufs2/aufs2-0_p20110605.ebuild new file mode 100644 index 000000000000..f829eb96230d --- /dev/null +++ b/sys-fs/aufs2/aufs2-0_p20110605.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20110605.ebuild,v 1.1 2011/06/09 13:51:38 jlec Exp $ + +EAPI="4" + +inherit linux-mod multilib toolchain-funcs + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug fuse hardened hfs inotify kernel-patch nfs ramfs" + +DEPEND="dev-vcs/git" +RDEPEND="!sys-fs/aufs" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +pkg_setup() { + CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL" + use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" + use nfs && CONFIG_CHECK="${CONFIG_CHECK} ~EXPORTFS" + use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" + use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" + + # this is needed so merging a binpkg aufs2 is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + + get_version + kernel_is lt 2 6 31 && die "kernel too old" + kernel_is gt 2 6 39 && die "kernel too new" + + linux-mod_pkg_setup + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \ + patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null ); then + if use kernel-patch; then + cd ${KV_DIR} + ewarn "Patching your kernel..." + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null + epatch "${FILESDIR}"/aufs2-{base,standalone}-${KV_PATCH}.patch + ewarn "You need to compile your kernel with the applied patch" + ewarn "to be able to load and use the aufs kernel module" + else + eerror "You need to apply a patch to your kernel to compile and run the aufs2 module" + eerror "Either enable the kernel-patch useflag to do it with this ebuild" + eerror "or apply ${FILESDIR}/aufs2-base-${KV_PATCH}.patch and" + eerror "${FILESDIR}/aufs2-standalone-${KV_PATCH}.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + export PKG_SETUP_HAS_BEEN_RAN=1 +} + +set_config() { + for option in $*; do + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die + done +} + +src_prepare() { + local branch=origin/aufs2.1-${KV_PATCH} + git checkout -q $branch || die + + # All config options to off + sed "s:= y:=:g" -i config.mk || die + + set_config RDU BRANCH_MAX_127 SBILIST + + use debug && set_config DEBUG + use fuse && set_config BR_FUSE POLL + use hfs && set_config BR_HFSPLUS + use inotify && set_config HNOTIFY HFSNOTIFY + use nfs && set_config EXPORT + use nfs && use amd64 && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + if use hardened ; then + epatch "${FILESDIR}"/pax.patch + fi + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die + sed -i "s:__user::g" include/linux/aufs_type.h || die + + cd "${WORKDIR}"/${PN}-util + git checkout -q origin/aufs2.1 + sed -i "/LDFLAGS += -static -s/d" Makefile || die + sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die +} + +src_compile() { + local ARCH=x86 + + emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} + + cd "${WORKDIR}"/${PN}-util + emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include +} + +src_install() { + linux-mod_src_install + dodoc README + docinto design + dodoc design/*.txt + cd "${WORKDIR}"/${PN}-util + emake DESTDIR="${D}" KDIR=${KV_DIR} install + docinto + newdoc README README-utils +} diff --git a/sys-fs/aufs2/files/aufs2-base-38.patch b/sys-fs/aufs2/files/aufs2-base-38.patch index 21e1240522a5..47cf4b034698 100644 --- a/sys-fs/aufs2/files/aufs2-base-38.patch +++ b/sys-fs/aufs2/files/aufs2-base-38.patch @@ -1,22 +1,10 @@ - fs/namei.c | 18 +++++++++++++----- - fs/splice.c | 10 +++++----- - include/linux/namei.h | 3 +++ - include/linux/splice.h | 6 ++++++ - 4 files changed, 27 insertions(+), 10 deletions(-) +aufs2.1 base patch for linux-2.6.38 diff --git a/fs/namei.c b/fs/namei.c -index 0087cf9..0513563 100644 +index a4689eb..0513563 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -1546,6 +1546,7 @@ static int path_walk(const char *name, struct nameidata *nd) - /* nd->path had been dropped */ - current->total_link_count = 0; - nd->path = save; -+ nd->inode = save.dentry->d_inode; - path_get(&nd->path); - nd->flags |= LOOKUP_REVAL; - result = link_path_walk(name, nd); -@@ -1841,12 +1842,12 @@ out: +@@ -1842,12 +1842,12 @@ out: * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ @@ -31,39 +19,6 @@ index 0087cf9..0513563 100644 struct dentry *base, int len) { unsigned long hash; -@@ -2455,22 +2456,29 @@ struct file *do_filp_open(int dfd, const char *pathname, - /* !O_CREAT, simple open */ - error = do_path_lookup(dfd, pathname, flags, &nd); - if (unlikely(error)) -- goto out_filp; -+ goto out_filp2; - error = -ELOOP; - if (!(nd.flags & LOOKUP_FOLLOW)) { - if (nd.inode->i_op->follow_link) -- goto out_path; -+ goto out_path2; - } - error = -ENOTDIR; - if (nd.flags & LOOKUP_DIRECTORY) { - if (!nd.inode->i_op->lookup) -- goto out_path; -+ goto out_path2; - } - audit_inode(pathname, nd.path.dentry); - filp = finish_open(&nd, open_flag, acc_mode); -+out2: - release_open_intent(&nd); - return filp; - -+out_path2: -+ path_put(&nd.path); -+out_filp2: -+ filp = ERR_PTR(error); -+ goto out2; -+ - creat: - /* OK, have to create the file. Find the parent. */ - error = path_init_rcu(dfd, pathname, diff --git a/fs/splice.c b/fs/splice.c index 50a5d978..886e942 100644 --- a/fs/splice.c diff --git a/sys-fs/aufs2/files/aufs2-base-39.patch b/sys-fs/aufs2/files/aufs2-base-39.patch new file mode 100644 index 000000000000..299697f18077 --- /dev/null +++ b/sys-fs/aufs2/files/aufs2-base-39.patch @@ -0,0 +1,70 @@ +aufs2.1 base patch for linux-2.6. + +diff --git a/fs/namei.c b/fs/namei.c +index e6cd611..27d7dc7 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1768,7 +1768,7 @@ static struct dentry *__lookup_hash(struct qstr *name, + * needs parent already locked. Doesn't follow mounts. + * SMP-safe. + */ +-static struct dentry *lookup_hash(struct nameidata *nd) ++struct dentry *lookup_hash(struct nameidata *nd) + { + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } +diff --git a/fs/splice.c b/fs/splice.c +index 50a5d978..886e942 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1081,8 +1081,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); + /* + * Attempt to initiate a splice from pipe to file. + */ +-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +- loff_t *ppos, size_t len, unsigned int flags) ++long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags) + { + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, + loff_t *, size_t, unsigned int); +@@ -1109,9 +1109,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + /* + * Attempt to initiate a splice from a file to a pipe. + */ +-static long do_splice_to(struct file *in, loff_t *ppos, +- struct pipe_inode_info *pipe, size_t len, +- unsigned int flags) ++long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) + { + ssize_t (*splice_read)(struct file *, loff_t *, + struct pipe_inode_info *, size_t, unsigned int); +diff --git a/include/linux/namei.h b/include/linux/namei.h +index eba45ea..21ed6c9 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, + extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, + int (*open)(struct inode *, struct file *)); + ++extern struct dentry *lookup_hash(struct nameidata *nd); + extern struct dentry *lookup_one_len(const char *, struct dentry *, int); + + extern int follow_down_one(struct path *); +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 997c3b4..be9a153 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); + extern void splice_shrink_spd(struct pipe_inode_info *, + struct splice_pipe_desc *); + ++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags); ++extern long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags); ++ + #endif diff --git a/sys-fs/aufs2/files/aufs2-standalone-38.patch b/sys-fs/aufs2/files/aufs2-standalone-38.patch index fb77f7cefc32..913b2043824a 100644 --- a/sys-fs/aufs2/files/aufs2-standalone-38.patch +++ b/sys-fs/aufs2/files/aufs2-standalone-38.patch @@ -1,67 +1,67 @@ -aufs2.1 standalone patch for linux-2.6.37 +aufs2.1 standalone patch for linux-2.6.38 diff --git a/fs/file_table.c b/fs/file_table.c -index c3dee38..f529e4d 100644 +index eb36b6b..12f2809 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -393,6 +393,8 @@ void file_sb_list_del(struct file *file) } } -+EXPORT_SYMBOL_GPL(file_sb_list_del); ++EXPORT_SYMBOL(file_sb_list_del); + #ifdef CONFIG_SMP /* diff --git a/fs/inode.c b/fs/inode.c -index ae2727a..2c8071a 100644 +index 0647d80..294b8ad 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -82,6 +82,7 @@ static struct hlist_head *inode_hashtable __read_mostly; * the i_state of an inode while it is in use.. */ DEFINE_SPINLOCK(inode_lock); -+EXPORT_SYMBOL_GPL(inode_lock); ++EXPORT_SYMBOL(inode_lock); /* * iprune_sem provides exclusion between the kswapd or try_to_free_pages diff --git a/fs/namei.c b/fs/namei.c -index a8c583f..b020c45 100644 +index 0513563..e1d996e 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -347,6 +347,7 @@ int deny_write_access(struct file * file) +@@ -353,6 +353,7 @@ int deny_write_access(struct file * file) return 0; } -+EXPORT_SYMBOL_GPL(deny_write_access); ++EXPORT_SYMBOL(deny_write_access); /** * path_get - get a reference to a path -@@ -1165,6 +1166,7 @@ struct dentry *lookup_hash(struct nameidata *nd) +@@ -1846,6 +1847,7 @@ struct dentry *lookup_hash(struct nameidata *nd) { return __lookup_hash(&nd->last, nd->path.dentry, nd); } -+EXPORT_SYMBOL_GPL(lookup_hash); ++EXPORT_SYMBOL(lookup_hash); int __lookup_one_len(const char *name, struct qstr *this, struct dentry *base, int len) -@@ -1187,6 +1189,7 @@ int __lookup_one_len(const char *name, struct qstr *this, +@@ -1868,6 +1870,7 @@ int __lookup_one_len(const char *name, struct qstr *this, this->hash = end_name_hash(hash); return 0; } -+EXPORT_SYMBOL_GPL(__lookup_one_len); ++EXPORT_SYMBOL(__lookup_one_len); /** * lookup_one_len - filesystem helper to lookup single pathname component diff --git a/fs/namespace.c b/fs/namespace.c -index 3dbfc07..3998762 100644 +index d1edf26..44ca259 100644 --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1321,6 +1321,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, +@@ -1465,6 +1465,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, } return 0; } -+EXPORT_SYMBOL_GPL(iterate_mounts); ++EXPORT_SYMBOL(iterate_mounts); static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) { @@ -81,7 +81,7 @@ index d309f38..f0e9568 100644 if (atomic_dec_and_test(&group->refcnt)) fsnotify_destroy_group(group); } -+EXPORT_SYMBOL_GPL(fsnotify_put_group); ++EXPORT_SYMBOL(fsnotify_put_group); /* * Create a new fsnotify_group and hold a reference for the group returned. @@ -89,7 +89,7 @@ index d309f38..f0e9568 100644 return group; } -+EXPORT_SYMBOL_GPL(fsnotify_alloc_group); ++EXPORT_SYMBOL(fsnotify_alloc_group); diff --git a/fs/notify/mark.c b/fs/notify/mark.c index 325185e..adede09 100644 --- a/fs/notify/mark.c @@ -98,7 +98,7 @@ index 325185e..adede09 100644 if (atomic_dec_and_test(&mark->refcnt)) mark->free_mark(mark); } -+EXPORT_SYMBOL_GPL(fsnotify_put_mark); ++EXPORT_SYMBOL(fsnotify_put_mark); /* * Any time a mark is getting freed we end up here. @@ -106,7 +106,7 @@ index 325185e..adede09 100644 if (unlikely(atomic_dec_and_test(&group->num_marks))) fsnotify_final_destroy_group(group); } -+EXPORT_SYMBOL_GPL(fsnotify_destroy_mark); ++EXPORT_SYMBOL(fsnotify_destroy_mark); void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) { @@ -114,7 +114,7 @@ index 325185e..adede09 100644 return ret; } -+EXPORT_SYMBOL_GPL(fsnotify_add_mark); ++EXPORT_SYMBOL(fsnotify_add_mark); /* * clear any marks in a group in which mark->flags & flags is true @@ -122,39 +122,39 @@ index 325185e..adede09 100644 atomic_set(&mark->refcnt, 1); mark->free_mark = free_mark; } -+EXPORT_SYMBOL_GPL(fsnotify_init_mark); ++EXPORT_SYMBOL(fsnotify_init_mark); static int fsnotify_mark_destroy(void *ignored) { diff --git a/fs/open.c b/fs/open.c -index 4197b9e..912817a 100644 +index b47aab3..cf7b1ac 100644 --- a/fs/open.c +++ b/fs/open.c @@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, mutex_unlock(&dentry->d_inode->i_mutex); return ret; } -+EXPORT_SYMBOL_GPL(do_truncate); ++EXPORT_SYMBOL(do_truncate); static long do_sys_truncate(const char __user *pathname, loff_t length) { diff --git a/fs/splice.c b/fs/splice.c -index ff0ae69..1c9e9b0 100644 +index 886e942..9a77a3e 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +@@ -1105,6 +1105,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, return splice_write(pipe, out, ppos, len, flags); } -+EXPORT_SYMBOL_GPL(do_splice_from); ++EXPORT_SYMBOL(do_splice_from); /* * Attempt to initiate a splice from a file to a pipe. -@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos, +@@ -1131,6 +1132,7 @@ long do_splice_to(struct file *in, loff_t *ppos, return splice_read(in, ppos, pipe, len, flags); } -+EXPORT_SYMBOL_GPL(do_splice_to); ++EXPORT_SYMBOL(do_splice_to); /** * splice_direct_to_actor - splices data directly between two non-pipes @@ -166,7 +166,7 @@ index 64c2ed9..e58b5d8 100644 } return ret; } -+EXPORT_SYMBOL_GPL(cap_file_mmap); ++EXPORT_SYMBOL(cap_file_mmap); diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 8d9c48f..29108aa 100644 --- a/security/device_cgroup.c @@ -175,115 +175,115 @@ index 8d9c48f..29108aa 100644 return -EPERM; } -+EXPORT_SYMBOL_GPL(devcgroup_inode_permission); ++EXPORT_SYMBOL(devcgroup_inode_permission); int devcgroup_inode_mknod(int mode, dev_t dev) { diff --git a/security/security.c b/security/security.c -index 1b798d3..3b7d2ca 100644 +index 7b7308a..140afc7 100644 --- a/security/security.c +++ b/security/security.c -@@ -360,6 +360,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) +@@ -359,6 +359,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) return 0; return security_ops->path_mkdir(dir, dentry, mode); } -+EXPORT_SYMBOL_GPL(security_path_mkdir); ++EXPORT_SYMBOL(security_path_mkdir); int security_path_rmdir(struct path *dir, struct dentry *dentry) { -@@ -367,6 +368,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) +@@ -366,6 +367,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) return 0; return security_ops->path_rmdir(dir, dentry); } -+EXPORT_SYMBOL_GPL(security_path_rmdir); ++EXPORT_SYMBOL(security_path_rmdir); int security_path_unlink(struct path *dir, struct dentry *dentry) { -@@ -374,6 +376,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) +@@ -373,6 +375,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) return 0; return security_ops->path_unlink(dir, dentry); } -+EXPORT_SYMBOL_GPL(security_path_unlink); ++EXPORT_SYMBOL(security_path_unlink); int security_path_symlink(struct path *dir, struct dentry *dentry, const char *old_name) -@@ -382,6 +385,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, +@@ -381,6 +384,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, return 0; return security_ops->path_symlink(dir, dentry, old_name); } -+EXPORT_SYMBOL_GPL(security_path_symlink); ++EXPORT_SYMBOL(security_path_symlink); int security_path_link(struct dentry *old_dentry, struct path *new_dir, struct dentry *new_dentry) -@@ -390,6 +394,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, +@@ -389,6 +393,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, return 0; return security_ops->path_link(old_dentry, new_dir, new_dentry); } -+EXPORT_SYMBOL_GPL(security_path_link); ++EXPORT_SYMBOL(security_path_link); int security_path_rename(struct path *old_dir, struct dentry *old_dentry, struct path *new_dir, struct dentry *new_dentry) -@@ -400,6 +405,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, +@@ -399,6 +404,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, return security_ops->path_rename(old_dir, old_dentry, new_dir, new_dentry); } -+EXPORT_SYMBOL_GPL(security_path_rename); ++EXPORT_SYMBOL(security_path_rename); int security_path_truncate(struct path *path) { -@@ -407,6 +413,7 @@ int security_path_truncate(struct path *path) +@@ -406,6 +412,7 @@ int security_path_truncate(struct path *path) return 0; return security_ops->path_truncate(path); } -+EXPORT_SYMBOL_GPL(security_path_truncate); ++EXPORT_SYMBOL(security_path_truncate); int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, mode_t mode) -@@ -415,6 +422,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, +@@ -414,6 +421,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, return 0; return security_ops->path_chmod(dentry, mnt, mode); } -+EXPORT_SYMBOL_GPL(security_path_chmod); ++EXPORT_SYMBOL(security_path_chmod); int security_path_chown(struct path *path, uid_t uid, gid_t gid) { -@@ -422,6 +430,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) +@@ -421,6 +429,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) return 0; return security_ops->path_chown(path, uid, gid); } -+EXPORT_SYMBOL_GPL(security_path_chown); ++EXPORT_SYMBOL(security_path_chown); int security_path_chroot(struct path *path) { -@@ -498,6 +507,7 @@ int security_inode_readlink(struct dentry *dentry) +@@ -497,6 +506,7 @@ int security_inode_readlink(struct dentry *dentry) return 0; return security_ops->inode_readlink(dentry); } -+EXPORT_SYMBOL_GPL(security_inode_readlink); ++EXPORT_SYMBOL(security_inode_readlink); int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) { -@@ -512,6 +522,7 @@ int security_inode_permission(struct inode *inode, int mask) +@@ -511,6 +521,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return security_ops->inode_permission(inode, mask); } -+EXPORT_SYMBOL_GPL(security_inode_permission); ++EXPORT_SYMBOL(security_inode_permission); - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) + int security_inode_exec_permission(struct inode *inode, unsigned int flags) { -@@ -611,6 +622,7 @@ int security_file_permission(struct file *file, int mask) +@@ -619,6 +630,7 @@ int security_file_permission(struct file *file, int mask) return fsnotify_perm(file, mask); } -+EXPORT_SYMBOL_GPL(security_file_permission); ++EXPORT_SYMBOL(security_file_permission); int security_file_alloc(struct file *file) { -@@ -638,6 +650,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, +@@ -646,6 +658,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, return ret; return ima_file_mmap(file, prot); } -+EXPORT_SYMBOL_GPL(security_file_mmap); ++EXPORT_SYMBOL(security_file_mmap); int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, unsigned long prot) diff --git a/sys-fs/aufs2/files/aufs2-standalone-39.patch b/sys-fs/aufs2/files/aufs2-standalone-39.patch new file mode 100644 index 000000000000..57dd820c24fa --- /dev/null +++ b/sys-fs/aufs2/files/aufs2-standalone-39.patch @@ -0,0 +1,257 @@ +aufs2.1 standalone patch for linux-2.6. + +diff --git a/fs/file_table.c b/fs/file_table.c +index 01e4c1e..0e800e2 100644 +--- a/fs/file_table.c ++++ b/fs/file_table.c +@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) + } + } + ++EXPORT_SYMBOL(file_sb_list_del); ++ + #ifdef CONFIG_SMP + + /* +diff --git a/fs/inode.c b/fs/inode.c +index 33c963d..e31e8d5 100644 +--- a/fs/inode.c ++++ b/fs/inode.c +@@ -112,6 +112,7 @@ static DEFINE_SPINLOCK(inode_lru_lock); + + __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); + __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_wb_list_lock); ++EXPORT_SYMBOL(inode_sb_list_lock); + + /* + * iprune_sem provides exclusion between the icache shrinking and the +diff --git a/fs/namei.c b/fs/namei.c +index 27d7dc7..3c72fd5 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -364,6 +364,7 @@ int deny_write_access(struct file * file) + + return 0; + } ++EXPORT_SYMBOL(deny_write_access); + + /** + * path_get - get a reference to a path +@@ -1772,6 +1773,7 @@ struct dentry *lookup_hash(struct nameidata *nd) + { + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } ++EXPORT_SYMBOL(lookup_hash); + + /** + * lookup_one_len - filesystem helper to lookup single pathname component +diff --git a/fs/namespace.c b/fs/namespace.c +index 7dba2ed..d7570d1 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1524,6 +1524,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, + } + return 0; + } ++EXPORT_SYMBOL(iterate_mounts); + + static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) + { +diff --git a/fs/notify/group.c b/fs/notify/group.c +index d309f38..f0e9568 100644 +--- a/fs/notify/group.c ++++ b/fs/notify/group.c +@@ -22,6 +22,7 @@ + #include <linux/srcu.h> + #include <linux/rculist.h> + #include <linux/wait.h> ++#include <linux/module.h> + + #include <linux/fsnotify_backend.h> + #include "fsnotify.h" +@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) + if (atomic_dec_and_test(&group->refcnt)) + fsnotify_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_put_group); + + /* + * Create a new fsnotify_group and hold a reference for the group returned. +@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) + + return group; + } ++EXPORT_SYMBOL(fsnotify_alloc_group); +diff --git a/fs/notify/mark.c b/fs/notify/mark.c +index 252ab1f..2199b9b 100644 +--- a/fs/notify/mark.c ++++ b/fs/notify/mark.c +@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) + if (atomic_dec_and_test(&mark->refcnt)) + mark->free_mark(mark); + } ++EXPORT_SYMBOL(fsnotify_put_mark); + + /* + * Any time a mark is getting freed we end up here. +@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) + if (unlikely(atomic_dec_and_test(&group->num_marks))) + fsnotify_final_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_destroy_mark); + + void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) + { +@@ -276,6 +278,7 @@ err: + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /* + * clear any marks in a group in which mark->flags & flags is true +@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, + atomic_set(&mark->refcnt, 1); + mark->free_mark = free_mark; + } ++EXPORT_SYMBOL(fsnotify_init_mark); + + static int fsnotify_mark_destroy(void *ignored) + { +diff --git a/fs/open.c b/fs/open.c +index b52cf01..c1b341c 100644 +--- a/fs/open.c ++++ b/fs/open.c +@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, + mutex_unlock(&dentry->d_inode->i_mutex); + return ret; + } ++EXPORT_SYMBOL(do_truncate); + + static long do_sys_truncate(const char __user *pathname, loff_t length) + { +diff --git a/fs/splice.c b/fs/splice.c +index 886e942..9a77a3e 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1105,6 +1105,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + + return splice_write(pipe, out, ppos, len, flags); + } ++EXPORT_SYMBOL(do_splice_from); + + /* + * Attempt to initiate a splice from a file to a pipe. +@@ -1131,6 +1132,7 @@ long do_splice_to(struct file *in, loff_t *ppos, + + return splice_read(in, ppos, pipe, len, flags); + } ++EXPORT_SYMBOL(do_splice_to); + + /** + * splice_direct_to_actor - splices data directly between two non-pipes +diff --git a/security/commoncap.c b/security/commoncap.c +index f20e984..d39acd9 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -976,3 +976,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, + } + return ret; + } ++EXPORT_SYMBOL(cap_file_mmap); +diff --git a/security/device_cgroup.c b/security/device_cgroup.c +index 8d9c48f..29108aa 100644 +--- a/security/device_cgroup.c ++++ b/security/device_cgroup.c +@@ -515,6 +515,7 @@ found: + + return -EPERM; + } ++EXPORT_SYMBOL(devcgroup_inode_permission); + + int devcgroup_inode_mknod(int mode, dev_t dev) + { +diff --git a/security/security.c b/security/security.c +index 1011423..3bb850b 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) + return 0; + return security_ops->path_rmdir(dir, dentry); + } ++EXPORT_SYMBOL(security_path_rmdir); + + int security_path_unlink(struct path *dir, struct dentry *dentry) + { +@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, + return 0; + return security_ops->path_symlink(dir, dentry, old_name); + } ++EXPORT_SYMBOL(security_path_symlink); + + int security_path_link(struct dentry *old_dentry, struct path *new_dir, + struct dentry *new_dentry) +@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, + return 0; + return security_ops->path_link(old_dentry, new_dir, new_dentry); + } ++EXPORT_SYMBOL(security_path_link); + + int security_path_rename(struct path *old_dir, struct dentry *old_dentry, + struct path *new_dir, struct dentry *new_dentry) +@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path) + return 0; + return security_ops->path_truncate(path); + } ++EXPORT_SYMBOL(security_path_truncate); + + int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, + mode_t mode) +@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, + return 0; + return security_ops->path_chmod(dentry, mnt, mode); + } ++EXPORT_SYMBOL(security_path_chmod); + + int security_path_chown(struct path *path, uid_t uid, gid_t gid) + { +@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) + return 0; + return security_ops->path_chown(path, uid, gid); + } ++EXPORT_SYMBOL(security_path_chown); + + int security_path_chroot(struct path *path) + { +@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) + return 0; + return security_ops->inode_readlink(dentry); + } ++EXPORT_SYMBOL(security_inode_readlink); + + int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) + { +@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) + return 0; + return security_ops->inode_permission(inode, mask); + } ++EXPORT_SYMBOL(security_inode_permission); + + int security_inode_exec_permission(struct inode *inode, unsigned int flags) + { +@@ -628,6 +636,7 @@ int security_file_permission(struct file *file, int mask) + + return fsnotify_perm(file, mask); + } ++EXPORT_SYMBOL(security_file_permission); + + int security_file_alloc(struct file *file) + { +@@ -655,6 +664,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, + return ret; + return ima_file_mmap(file, prot); + } ++EXPORT_SYMBOL(security_file_mmap); + + int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, + unsigned long prot) |