Please allow aufs 0+20080719-2 to go into Lenny,
as it fixes a serious bug.
The version has been uploaded and is currently at incoming.d.o.
- I also attached a debdiff
PS: Nobody has answered the exception request for app-install-data yet
(Message-ID 488F2461.3070005@jak-linux.org)
--
Julian Andres Klode, Fellow of the Free Software Foundation Europe
Debian Maintainer | Developer | Ubuntu Member
try Debian: http://www.debian.org/ | my site: http://jak-linux.org/
jabber: juliank@jabber.org | IRC: juliank (FreeNode, OFTC)
languages: German | English
diff -u aufs-0+20080719/debian/changelog aufs-0+20080719/debian/changelog --- aufs-0+20080719/debian/changelog +++ aufs-0+20080719/debian/changelog @@ -1,3 +1,12 @@ +aufs (0+20080719-2) unstable; urgency=medium + + [ Cyril Brulebois ] + * debian/patches/10_fix_deadlocks_in_rename.dpatch: Backport a fix for + blocking rename calls, caused by deadlocks, which led to hanging + package managers when trying to update the APT cache (Closes: #493184). + + -- Julian Andres Klode <jak@jak-linux.org> Sat, 02 Aug 2008 15:21:20 +0200 + aufs (0+20080719-1) unstable; urgency=low * New upstream snapshot, fixing many bugs diff -u aufs-0+20080719/debian/patches/00list aufs-0+20080719/debian/patches/00list --- aufs-0+20080719/debian/patches/00list +++ aufs-0+20080719/debian/patches/00list @@ -8,0 +9 @@ +10_fix_deadlocks_in_rename.dpatch only in patch2: unchanged: --- aufs-0+20080719.orig/debian/patches/10_fix_deadlocks_in_rename.dpatch +++ aufs-0+20080719/debian/patches/10_fix_deadlocks_in_rename.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_fix_deadlocks_in_rename.dpatch by Cyril Brulebois <cyril.brulebois@kerlabs.com> +## +## DP: Fix deadlocks as detected by running aptitude update. + +@DPATCH@ +Index: fs/aufs/cpup.c +=================================================================== +RCS file: /cvsroot/aufs/aufs/fs/aufs/cpup.c,v +retrieving revision 1.67 +diff -u -p -r1.67 cpup.c +--- a/fs/aufs/cpup.c 21 Jul 2008 02:51:28 -0000 1.67 ++++ b/fs/aufs/cpup.c 24 Jul 2008 04:01:23 -0000 +@@ -1004,7 +1004,7 @@ int au_cp_dirs(struct dentry *dentry, au + h_parent = au_h_dptr(parent, bdst); + } while (!h_parent); + +- if (d != real_parent) ++ if (d != real_parent && d != locked) + di_write_lock_child3(d); + + /* somebody else might create while we were sleeping */ +@@ -1041,7 +1041,7 @@ int au_cp_dirs(struct dentry *dentry, au + di_read_unlock(parent, AuLock_IR); + } + +- if (d != real_parent) ++ if (d != real_parent && d != locked) + di_write_unlock(d); + if (unlikely(err)) + break; +Index: fs/aufs25/cpup.c +=================================================================== +RCS file: /cvsroot/aufs/aufs/fs/aufs25/cpup.c,v +retrieving revision 1.11 +diff -u -p -r1.11 cpup.c +--- a/fs/aufs25/cpup.c 21 Jul 2008 02:53:36 -0000 1.11 ++++ b/fs/aufs25/cpup.c 24 Jul 2008 04:01:23 -0000 +@@ -998,7 +998,7 @@ int au_cp_dirs(struct dentry *dentry, au + h_parent = au_h_dptr(parent, bdst); + } while (!h_parent); + +- if (d != real_parent) ++ if (d != real_parent && d != locked) + di_write_lock_child3(d); + + /* somebody else might create while we were sleeping */ +@@ -1036,7 +1036,7 @@ int au_cp_dirs(struct dentry *dentry, au + di_read_unlock(parent, AuLock_IR); + } + +- if (d != real_parent) ++ if (d != real_parent && d != locked) + di_write_unlock(d); + if (unlikely(err)) + break;
Attachment:
signature.asc
Description: OpenPGP digital signature