- fix for double lock causing hangs (from xfs mailing list; but introduced by vserver...

Changed files:
    kernel-vserver-fixes.patch -> 1.26

diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index 3f3728a172a7a64dfd775bc9b072dcb290464fdb..2fbb7a7c3e88971a4f4edf3842680fc0f8dc7d8e 100644 (file)
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -36,3 +36,14 @@ Missing header for routes patch, caused vs2.3 route.h mixing
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version);
 
+--- linux-3.2/fs/xfs/xfs_vnodeops.c~   2012-03-12 17:22:36.000000000 +0100
++++ linux-3.2/fs/xfs/xfs_vnodeops.c    2012-03-12 18:57:38.818045193 +0100
+@@ -152,7 +152,7 @@
+               goto error_out;
+ 
+       xfs_ilock(ip, XFS_ILOCK_EXCL);
+-      xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
++      xfs_trans_ijoin(tp, ip, 0);
+ 
+       inode->i_flags = flags;
+       inode->i_vflags = vflags;