[arch-commits] Commit in aufs2/trunk (4 files)
Tobias Powalowski
tpowa at archlinux.org
Sat Oct 30 17:27:25 UTC 2010
Date: Saturday, October 30, 2010 @ 13:27:24
Author: tpowa
Revision: 97484
upgpkg: aufs2 2.6.36_20101021-1
bump to .36 release
Added:
aufs2/trunk/aufs2-module-2.6.36.patch
Modified:
aufs2/trunk/PKGBUILD
aufs2/trunk/aufs2.install
aufs2/trunk/create-tarball.sh
---------------------------+
PKGBUILD | 17 +++++++++------
aufs2-module-2.6.36.patch | 47 ++++++++++++++++++++++++++++++++++++++++++++
aufs2.install | 2 -
create-tarball.sh | 6 ++---
4 files changed, 61 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-10-30 17:24:37 UTC (rev 97483)
+++ PKGBUILD 2010-10-30 17:27:24 UTC (rev 97484)
@@ -2,23 +2,25 @@
# Maintainer: Paul Mattal <pjmattal at elys.com>
pkgname=aufs2
-pkgver=2.6.35_20100802
-pkgrel=2
+pkgver=2.6.36_20101021
+pkgrel=1
#_kernver=${pkgver%_*}-ARCH
-_kernver=2.6.35-ARCH
+_kernver=2.6.36-ARCH
pkgdesc="Another Unionfs Implementation"
arch=('i686' 'x86_64')
url="http://aufs.sourceforge.net/"
license=('GPL2')
-depends=('kernel26>=2.6.35' 'kernel26<2.6.36')
-makedepends=('kernel26-headers>=2.6.35' 'kernel26-headers<2.6.36')
+depends=('kernel26>=2.6.36' 'kernel26<2.6.37')
+makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37')
replaces=('aufs')
install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/aufs2/${pkgname}-${pkgver}.tar.gz")
+source=("ftp://ftp.archlinux.org/other/aufs2/${pkgname}-${pkgver}.tar.gz"
+ aufs2-module-2.6.36.patch)
options=('!makeflags')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ../aufs2-module-2.6.36.patch
sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
@@ -54,4 +56,5 @@
# install include files
install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/src/linux-$_kernver/include/linux/aufs_type.h || return 1
}
-md5sums=('e0b3f5709e1cb746fdfa43047354ad4d')
+md5sums=('9ba0666dc200bebb240ac598f9021d9f'
+ '55aac34dd0aa39458b6d927f4b2bddb8')
Added: aufs2-module-2.6.36.patch
===================================================================
--- aufs2-module-2.6.36.patch (rev 0)
+++ aufs2-module-2.6.36.patch 2010-10-30 17:27:24 UTC (rev 97484)
@@ -0,0 +1,47 @@
+diff --git a/ubuntu/aufs/branch.c b/ubuntu/aufs/branch.c
+index cd4463c..ff6b158 100644
+--- a/fs/aufs/branch.c
++++ b/fs/aufs/branch.c
+@@ -22,6 +22,8 @@
+
+ #include <linux/file.h>
+ #include <linux/statfs.h>
++#include <linux/lglock.h>
++#include <linux/percpu.h>
+ #include "aufs.h"
+
+ /*
+@@ -851,7 +853,8 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
+ goto out;
+
+ /* no need file_list_lock() since sbinfo is locked? defered? */
+- list_for_each_entry(file, &sb->s_files, f_u.fu_list) {
++ lg_global_lock(files_lglock);
++ do_file_list_for_each_entry(sb, file) {
+ if (special_file(file->f_dentry->d_inode->i_mode))
+ continue;
+
+@@ -861,6 +864,7 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
+ err = -EBUSY;
+ FiMustNoWaiters(file);
+ fi_read_unlock(file);
++ lg_global_unlock(files_lglock);
+ goto out_free;
+ }
+
+@@ -889,10 +893,13 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
+ if (p) {
+ a = p;
+ a[n++] = hf;
+- } else
++ } else {
++ lg_global_unlock(files_lglock);
+ goto out_free;
++ }
+ }
+- }
++ } while_file_list_for_each_entry;
++ lg_global_unlock(files_lglock);
+
+ err = 0;
+ if (n)
Modified: aufs2.install
===================================================================
--- aufs2.install 2010-10-30 17:24:37 UTC (rev 97483)
+++ aufs2.install 2010-10-30 17:27:24 UTC (rev 97484)
@@ -1,5 +1,5 @@
post_install() {
- KERNEL_VERSION=2.6.35-ARCH
+ KERNEL_VERSION=2.6.36-ARCH
depmod $KERNEL_VERSION
}
Modified: create-tarball.sh
===================================================================
--- create-tarball.sh 2010-10-30 17:24:37 UTC (rev 97483)
+++ create-tarball.sh 2010-10-30 17:27:24 UTC (rev 97484)
@@ -1,7 +1,7 @@
#!/bin/sh
-AUFS2VERSION="-35"
-KERNELVERSION=2.6.35
-GITSNAPSHOT=20100802
+AUFS2VERSION="-36"
+KERNELVERSION=2.6.36
+GITSNAPSHOT=20101021
# aufs2 (no -xx) for the latest -rc version.
git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git
cd aufs2-standalone.git
More information about the arch-commits
mailing list