From ca2404c2263140099081cdbc5485c20948285dc8 Mon Sep 17 00:00:00 2001 From: Julian Langschaedel Date: Fri, 23 Sep 2011 20:35:45 +0200 Subject: [PATCH] aufs3 support for 3.0.x kernel (aufs_friendly) --- aur/aufs3/PKGBUILD | 69 ++++++++ aur/aufs3/aufs3.install | 12 ++ core/linux/PKGBUILD | 14 +- core/linux/aufs3-base.patch | 70 ++++++++ core/linux/aufs3-standalone.patch | 257 ++++++++++++++++++++++++++++++ 5 files changed, 419 insertions(+), 3 deletions(-) create mode 100644 aur/aufs3/PKGBUILD create mode 100644 aur/aufs3/aufs3.install create mode 100644 core/linux/aufs3-base.patch create mode 100644 core/linux/aufs3-standalone.patch diff --git a/aur/aufs3/PKGBUILD b/aur/aufs3/PKGBUILD new file mode 100644 index 000000000..ca1e5153c --- /dev/null +++ b/aur/aufs3/PKGBUILD @@ -0,0 +1,69 @@ +# Contributor: Paul Mattal +# Maintainer: Calimero + +plugrel=1 + +pkgname=aufs3 +pkgver=3.0_20110829 +pkgrel=1 +#_kernver=${pkgver%_*}-ARCH + +# Set to whatever the tree of your aufs-friendly kernel is, and set the right dependency. +_kernver=3.0-ARCH +depends=('aufs_friendly') + +#_kernver=3.0-aufs_friendly +#depends=('linux-aufs_friendly') + +pkgdesc="Another Unionfs Implementation" +arch=('i686' 'x86_64') +url="http://aufs.sourceforge.net/" +license=('GPL2') +replaces=('aufs' 'aufs2') +conflicts=('aufs2') +install=aufs3.install +source=("http://calimeroteknik.free.fr/src/aufs3-${pkgver}.tar.gz") +options=('!makeflags' '!strip') +md5sums=('7452e0ec478a909f3238fd8fe0b33761') + +build() { + cd "${srcdir}/aufs3-${pkgver}" + sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \ + config.mk + sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \ + config.mk + sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \ + config.mk + sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \ + config.mk + sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \ + config.mk + sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \ + config.mk + sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \ + config.mk + if [ "${CARCH}" = "x86_64" ]; then + inot64=" y" + else + inot64="" + fi + sed -i "s|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 =${inot64}|" \ + config.mk + # build, sed fixes are from gentoo portage build + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile + sed -i "s:__user::g" include/linux/aufs_type.h + make KDIR="/usr/src/linux-${_kernver}" +} + +package() { + cd "${srcdir}/aufs3-${pkgver}" + install -D -m644 fs/aufs/aufs.ko \ + "${pkgdir}/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko" + # tweak the install script for the right kernel version + sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ + "${startdir}/aufs3.install" + # install include files + install -D -m 644 include/linux/aufs_type.h "${pkgdir}/usr/include/linux/aufs_type.h" + # gzip -9 the module + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; +} diff --git a/aur/aufs3/aufs3.install b/aur/aufs3/aufs3.install new file mode 100644 index 000000000..80574e080 --- /dev/null +++ b/aur/aufs3/aufs3.install @@ -0,0 +1,12 @@ +post_install() { + KERNEL_VERSION=3.0-ARCH + depmod $KERNEL_VERSION +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 76ab93a7b..4ddf8b971 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -20,12 +20,16 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-${_basekernel}.tar.bz2 "ftp://ftp.kernel.org/pub/linux/kernel/v3.0/patch-${pkgver}.bz2" 'archlinuxarm.patch' 'config' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + # patches exporting symbols for the aufs module + aufs3-base.patch aufs3-standalone.patch) md5sums=('398e95866794def22b12dfbc15ce89c0' '1757786b9a9ffbd48ad9642199ff5bd7' '77e8e011485c2061616214d07356132e' 'a6753f9fa6ca818b87ea817106e01566' - '9d3c56a4b999c8bfbd4018089a62f662') + '9d3c56a4b999c8bfbd4018089a62f662' + 'b9248a75a3fe415a18d4730887daa339' + 'd961e5dc52b4e4f98a6268b6dc4340fa') build() { cd "${srcdir}/linux-${_basekernel}" @@ -43,6 +47,10 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + msg 'AUFS3 patches' + patch -p1 -i "${srcdir}/aufs3-base.patch" + patch -p1 -i "${srcdir}/aufs3-standalone.patch" + cat "${srcdir}/config" > ./.config # remove the sublevel from Makefile @@ -83,7 +91,7 @@ package_linux() { groups=('base') depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') - provides=('kernel26') + provides=('kernel26' 'aufs_friendly') conflicts=('kernel26') replaces=('kernel26') backup=("etc/mkinitcpio.d/${pkgname}.preset") diff --git a/core/linux/aufs3-base.patch b/core/linux/aufs3-base.patch new file mode 100644 index 000000000..7fa7db4ee --- /dev/null +++ b/core/linux/aufs3-base.patch @@ -0,0 +1,70 @@ +aufs3.0 base patch + +diff --git a/fs/namei.c b/fs/namei.c +index 14ab8d3..eb4aef1 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1697,7 +1697,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 aa866d3..19afec6 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); + /* + * Attempt to initiate a splice from pipe to file. + */ +-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +- loff_t *ppos, size_t len, unsigned int flags) ++long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags) + { + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, + loff_t *, size_t, unsigned int); +@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + /* + * Attempt to initiate a splice from a file to a pipe. + */ +-static long do_splice_to(struct file *in, loff_t *ppos, +- struct pipe_inode_info *pipe, size_t len, +- unsigned int flags) ++long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) + { + ssize_t (*splice_read)(struct file *, loff_t *, + struct pipe_inode_info *, size_t, unsigned int); +diff --git a/include/linux/namei.h b/include/linux/namei.h +index 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/core/linux/aufs3-standalone.patch b/core/linux/aufs3-standalone.patch new file mode 100644 index 000000000..54456bf3b --- /dev/null +++ b/core/linux/aufs3-standalone.patch @@ -0,0 +1,257 @@ +aufs3.0 standalone patch + +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 43566d1..4291eae 100644 +--- a/fs/inode.c ++++ b/fs/inode.c +@@ -69,6 +69,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 eb4aef1..66d04c6 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -365,6 +365,7 @@ int deny_write_access(struct file * file) + + return 0; + } ++EXPORT_SYMBOL(deny_write_access); + + /** + * path_get - get a reference to a path +@@ -1701,6 +1702,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 fe59bd1..7d3843f 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 + #include + #include ++#include + + #include + #include "fsnotify.h" +@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) + if (atomic_dec_and_test(&group->refcnt)) + fsnotify_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_put_group); + + /* + * Create a new fsnotify_group and hold a reference for the group returned. +@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) + + return group; + } ++EXPORT_SYMBOL(fsnotify_alloc_group); +diff --git a/fs/notify/mark.c b/fs/notify/mark.c +index 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 19afec6..11f07f8 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + + return splice_write(pipe, out, ppos, len, flags); + } ++EXPORT_SYMBOL(do_splice_from); + + /* + * Attempt to initiate a splice from a file to a pipe. +@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, + + return splice_read(in, ppos, pipe, len, flags); + } ++EXPORT_SYMBOL(do_splice_to); + + /** + * splice_direct_to_actor - splices data directly between two non-pipes +diff --git a/security/commoncap.c b/security/commoncap.c +index a93b3b7..024282c 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -971,3 +971,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 1be6826..215278c 100644 +--- a/security/device_cgroup.c ++++ b/security/device_cgroup.c +@@ -508,6 +508,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)