From 13a15dfdab592730dd26b8a4bb00432b65720954 Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Fri, 6 Jul 2007 10:22:51 +0000
Subject: [PATCH] Branch b1_6 b=<12415> r=<adilger,green>
---
ldiskfs/ChangeLog | 7 +++++++
.../kernel_patches/patches/ext3-unlink-race.patch | 15 +++++++++++++++
.../series/ldiskfs-2.6-rhel4.series | 1 +
3 files changed, 23 insertions(+)
create mode 100644 ldiskfs/kernel_patches/patches/ext3-unlink-race.patch
diff --git a/ldiskfs/ChangeLog b/ldiskfs/ChangeLog
index 484e1a93fe..1e27ceaa62 100644
--- a/ldiskfs/ChangeLog
+++ b/ldiskfs/ChangeLog
@@ -1,3 +1,10 @@
tbd Cluster File Systems, Inc. <info@clusterfs.com>
* version 3.0.0
* Initial release of ldiskfs as a separate package.
+
+Severity : normal
+Frequency : rare
+Bugzilla : 12415
+Description: Updated patchess for new RHEL4 kernel
+Details : Add patch ext3-unlink-race.patch
+ Updated series file ldiskfs-2.6-rhel4.series
diff --git a/ldiskfs/kernel_patches/patches/ext3-unlink-race.patch b/ldiskfs/kernel_patches/patches/ext3-unlink-race.patch
new file mode 100644
index 0000000000..96727664fa
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/ext3-unlink-race.patch
@@ -0,0 +1,15 @@
+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.
+ */
+- if (inode->i_nlink == 0)
+- return -ENOENT;
++ //if (inode->i_nlink == 0)
++ // return -ENOENT;
+
+ retry:
+ handle = ldiskfs_journal_start(dir, LDISKFS_DATA_TRANS_BLOCKS +
diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series
index afbd3b8e35..bbb7b56462 100644
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series
@@ -19,3 +19,4 @@ ext3-sector_t-overflow-2.6.9-rhel4.patch
ext3-check-jbd-errors-2.6.9.patch
ext3-uninit-2.6.9.patch
ext3-nanosecond-2.6-rhel4.patch
+ext3-unlink-race.patch
--
GitLab