Branch b1_6

b=12415
r=kalpak

Fixed the ext3-unlink-race.patch. It should be against the ext3.

diff --git a/ldiskfs/kernel_patches/patches/ext3-unlink-race.patch b/ldiskfs/kernel_patches/patches/ext3-unlink-race.patch
index 9672766..12e0352 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-unlink-race.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-unlink-race.patch
@@ -2,14 +2,14 @@ Index: lustre+chaos/lustre/ldiskfs/namei.c
 ===================================================================
 --- linux-2.6.5-7.283-full.orig/fs/ext3/namei.c
 +++ linux-2.6.5-7.283-full/fs/ext3/namei.c
-@@ -2184,8 +2184,8 @@ static int ldiskfs_link (struct dentry *
-        * Return -ENOENT if we've raced with unlink and i_nlink is 0.  Doing
-        * otherwise has the potential to corrupt the orphan inode list.
-        */
+@@ -2184,8 +2184,8 @@
+        * Return -ENOENT if we've raced with unlink and i_nlink is 0.  Doing
+        * otherwise has the potential to corrupt the orphan inode list.
+        */
 -      if (inode->i_nlink == 0)
 -              return -ENOENT;
 +      //if (inode->i_nlink == 0)
 +      //      return -ENOENT;
  
  retry:
-       handle = ldiskfs_journal_start(dir, LDISKFS_DATA_TRANS_BLOCKS +
+       handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS +