[KERNEL-2.6.33] Aufs2 rebuild fails

Question

With kernel 2.6.33 we have the marble bug on our live-cds again.
So I downloaded the latest git and patched my custom kernel with the aufs2-patches as usual until I ran into troubles with aufs2:
phil@[chroot]:~/kdemod/chakra/aufs2$ ../makepkg
==> Making package: aufs2 2.6.33_20100411-1chakra i686 (Sun Apr 11 21:58:03 UTC 2010)
==> Checking Runtime Dependencies...
==> Checking Buildtime Dependencies...
==> Retrieving Sources...
-> Found aufs2-2.6.33_20100411.tar.gz in build dir
==> Validating source files with md5sums...
aufs2-2.6.33_20100411.tar.gz ... Passed
==> Extracting Sources...
-> bsdtar -x -f "aufs2-2.6.33_20100411.tar.gz"
==> Removing existing pkg/ directory...
==> Entering fakeroot environment...
==> Starting build()...
==> fix headers
==> start config
-I/home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/include -DCONFIG_AUFS_MODULE -UCONFIG_AUFS -DCONFIG_AUFS_BRANCH_MAX_127 -DCONFIG_AUFS_HINOTIFY -DCONFIG_AUFS_EXPORT -DCONFIG_AUFS_SHWH -DCONFIG_AUFS_BR_RAMFS -DCONFIG_AUFS_BDEV_LOOP
make -C /usr/src/linux-2.6.33-ARCH M=/home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs EXTRA_CFLAGS="-I/home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/include -DCONFIG_AUFS_MODULE -UCONFIG_AUFS -DCONFIG_AUFS_BRANCH_MAX_127 -DCONFIG_AUFS_HINOTIFY -DCONFIG_AUFS_EXPORT -DCONFIG_AUFS_SHWH -DCONFIG_AUFS_BR_RAMFS -DCONFIG_AUFS_BDEV_LOOP" modules
make[1]: Entering directory `/usr/src/linux-2.6.33-ARCH'
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/module.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/sbinfo.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/super.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/branch.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/xino.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/sysaufs.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/opts.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/wkq.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/vfsub.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/dcsub.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/cpup.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/whout.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/plink.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/wbr_policy.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/dinfo.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/dentry.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/finfo.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/file.o
CC [M] /home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/f_op.o
/home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/f_op.c: In function 'aufs_mmap':
/home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/f_op.c:668: error: implicit declaration of function 'mutex_set_owner'
make[2]: *** [/home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs/f_op.o] Error 1
make[1]: *** [_module_/home/phil/kdemod/chakra/aufs2/src/aufs2-2.6.33_20100411/fs/aufs] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.33-ARCH'
make: *** [fs/aufs/aufs.ko] Error 2
==> ERROR: Build Failed.
Aborting...
PKGBUILD
# KDEmod, mod[ded|ular] KDE packages for Arch Linux, part of chakra-project.org
# maintainer (i686): Jan Mette (funkyou) <funkyou @ kdemod.ath.cx>
# maintainer (x86_64): Martin Sandsmark (PhinnFort) <sandsmark @ kdemod.ath.cx>
# maintainer (x86_64): Phil Miller (Amnnon82) <philm @ chakra-project.org>
# include global config
source ../_buildsystem/${current_repo}-${_arch}_cfg.conf
pkgname=aufs2
pkgver=2.6.33_20100411
pkgrel=1chakra
_kernver=${pkgver%_*}-ARCH
pkgdesc="Another Unionfs Implementation"
arch=('i686' 'x86_64')
url="http://aufs.sourceforge.net/"
license=('GPL2')
depends=('kernel26>=2.6.33' 'kernel26<2.6.34')
makedepends=('kernel26-headers>=2.6.33' 'kernel26-headers<2.6.34')
replaces=('aufs')
install=${pkgname}.install
source=("${pkgname}-${pkgver}.tar.gz")
options=(!makeflags)
md5sums=('3bea2829cb565996322743b182237364')
build() {
cd ${srcdir}/${pkgname}-${pkgver} || return 1
msg "fix headers"
sed -i -e "s~#include <../kernel/mutex~#include <linux/mutex~g" fs/aufs/f_op.c
msg "start config"
sed -i 's|CONFIG_AUFS_HINOTIFY =.*|CONFIG_AUFS_HINOTIFY = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \
config.mk || return 1
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 || return 1
# build
make KDIR=/usr/src/linux-${_kernver} || return 1
# install
install -D -m644 fs/aufs/aufs.ko \
$pkgdir/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko || return 1
# tweak the install script for the right kernel version
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
$startdir/$pkgname.install || return 1
# install include files
install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/src/linux-$_kernver/include/linux/aufs_type.h || return 1
does anybody managed to build a newer aufs2 for 33-series yet?

Answer 1

I managed to build aufs2 with the help of Junjiro R. Okajima. He responded very fast and gave me a working patch for latest aufs2 checkout.
You can find my files here:
http://chakra-project.org/code/index.ph … kra/aufs2/
http://chakra-project.org/code/index.ph … ufs2-util/