Branch b1_8

b=19640
i=johann
i=adilger

Avoid calling vfs_link upon a file with link count of 0 in mds_orphan_add_link().

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series
index b9509ec..179621e 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series
@@ -18,7 +18,6 @@ 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
 ext3-mmp-2.6-rhel4.patch
 ext3-fiemap-2.6-sles10.patch
 ext3-external-journal-2.6.9.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series
index abe33b6..8606846 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series
@@ -8,7 +8,6 @@ ext4-remove-cond_resched-calls-rhel5.patch
 ext4-filterdata-rhel5.patch
 ext4-inode-version-rhel5.patch
 ext4-mmp-rhel5.patch
-ext4-unlink-race-rhel5.patch
 ext4-fiemap-2.6-rhel5.patch
 ext4-lookup-dotdot-rhel5.patch
 ext4-max-dir-size-rhel5.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series
index 37b7fa1..0257bce 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series
@@ -15,7 +15,6 @@ ext3-nanosecond-2.6.18-vanilla.patch
 ext3-inode-version-2.6.18-vanilla.patch
 ext3-ea-expand-lose-block.patch
 ext3-mmp-2.6.18-vanilla.patch
-ext3-unlink-race.patch
 ext3-fiemap-2.6-rhel5.patch
 ext3-statfs-2.6-rhel5.patch
 ext3-lookup-dotdot-2.6.9.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
index 1066568..2f35a0b 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
@@ -6,7 +6,6 @@ ext4-include-fixes-2.6-sles11.patch
 ext4-remove-cond_resched-calls-sles11.patch
 ext4-filterdata-sles11.patch
 ext4-mmp-sles11.patch
-ext4-unlink-race-sles11.patch
 ext4-fiemap-2.6-sles11.patch
 ext4-lookup-dotdot-sles11.patch
 ext4-max-dir-size-sles11.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series
index cd4ddda..370e624 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series
@@ -17,7 +17,6 @@ ext3-mmp-2.6.22-vanilla.patch
 ext3-fiemap-2.6.22-vanilla.patch
 ext3-statfs-2.6.22.patch
 ext3-lookup-dotdot-2.6.9.patch
-ext3-unlink-race.patch
 ext3-export-journal-api.patch
 ext3-max-dir-size.patch
 ext3-print-inum-in-htree-warning.patch