[arch-commits] CVS update of extra/system/aufs (PKGBUILD vfs_splice.diff)

[Simo Leone]

    Date: Sunday, March 30, 2008 @ 06:27:31
  Author: simo
    Path: /home/cvs-extra/extra/system/aufs

   Added: vfs_splice.diff (1.1)
Modified: PKGBUILD (1.12 -> 1.13)

upgpkg: aufs 20080210-3


-----------------+
 PKGBUILD        |   15 ++++++++++-----
 vfs_splice.diff |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)


Index: extra/system/aufs/PKGBUILD
diff -u extra/system/aufs/PKGBUILD:1.12 extra/system/aufs/PKGBUILD:1.13
--- extra/system/aufs/PKGBUILD:1.12	Fri Mar 21 13:11:18 2008
+++ extra/system/aufs/PKGBUILD	Sun Mar 30 06:27:31 2008
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD,v 1.12 2008/03/21 17:11:18 tpowa Exp $
+# $Id: PKGBUILD,v 1.13 2008/03/30 10:27:31 simo Exp $
 # Contributor: Paul Mattal <paul at mattal.com>
 # Maintainer: Paul Mattal <pjmattal at elys.com>
 pkgname=aufs
 pkgver=20080210
-pkgrel=2
+pkgrel=3
 _kernver='2.6.24-ARCH'
 pkgdesc="Another Unionfs Implementation that supports NFS branches"
 arch=('i686' 'x86_64')
 url="http://aufs.sourceforge.net/"
 license=('GPL2')
-depends=('kernel26>=2.6.24.3-4' 'kernel26<=2.6.25-0' 'glibc' 'aufs-utils')
+depends=('kernel26>=2.6.24.4-1' 'kernel26<=2.6.25-0' 'glibc' 'aufs-utils')
 install=$pkgname.install
-source=(ftp://ftp.archlinux.org/other/aufs-new/$pkgname-$pkgver.tar.gz)
-md5sums=('b365da56879f24ee6234672921a5f820')
+source=(ftp://ftp.archlinux.org/other/aufs-new/$pkgname-$pkgver.tar.gz \
+        vfs_splice.diff)
+md5sums=('b365da56879f24ee6234672921a5f820'
+         '2b9cd549bf5194e853c6a2d4a10856eb')
 options=(!libtool !makeflags)
 
 build() {
   cd $startdir/src/$pkgname || return 1
 
+  # use splice functions exported by unionfs kernel patch
+  patch -p1 < $startdir/src/vfs_splice.diff
+
   # configure for NFS by:
   # 1) configure local.mk to use FILP and LHASH
   sed -i 's|CONFIG_AUFS_PUT_FILP_PATCH =|CONFIG_AUFS_PUT_FILP_PATCH = y|' \
Index: extra/system/aufs/vfs_splice.diff
diff -u /dev/null extra/system/aufs/vfs_splice.diff:1.1
--- /dev/null	Sun Mar 30 06:27:31 2008
+++ extra/system/aufs/vfs_splice.diff	Sun Mar 30 06:27:31 2008
@@ -0,0 +1,24 @@
+This patch enables aufs to use the splice functions exported by the
+unionfs kernel patch.
+
+diff -Nru aufs/fs/aufs/vfsub.h aufs.new/fs/aufs/vfsub.h
+--- aufs/fs/aufs/vfsub.h	2008-02-03 22:22:46.000000000 -0600
++++ aufs/fs/aufs/vfsub.h	2008-03-26 20:51:04.000000000 -0500
+@@ -604,7 +604,7 @@
+ 		  AuDLNPair(in->f_dentry), *ppos, (unsigned long)len, flags);
+ 
+ 	lockdep_off();
+-	err = do_splice_to(in, ppos, pipe, len, flags);
++	err = vfs_splice_to(in, ppos, pipe, len, flags);
+ 	lockdep_on();
+ 	if (err >= 0)
+ 		au_update_fuse_h_inode(in->f_vfsmnt, in->f_dentry); /*ignore*/
+@@ -621,7 +621,7 @@
+ 		  AuDLNPair(out->f_dentry), *ppos, (unsigned long)len, flags);
+ 
+ 	lockdep_off();
+-	err = do_splice_from(pipe, out, ppos, len, flags);
++	err = vfs_splice_from(pipe, out, ppos, len, flags);
+ 	lockdep_on();
+ 	if (err >= 0)
+ 		au_update_fuse_h_inode(out->f_vfsmnt, out->f_dentry); /*ignore*/