Branch b1_8

b=21188

Remove ext3/4_data_in_dirent patch since it causes spurious assertion
failure in ldiskfs.

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 521bfee..fafac54 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series
@@ -27,5 +27,4 @@ ext4-dynlocks-2.6-rhel5.patch
 ext4-hash-indexed-dir-dotdot-update.patch
 ext4-ext_generation-sles11.patch
 ext4-kill-dx_root.patch
 ext4-hash-indexed-dir-dotdot-update.patch
 ext4-ext_generation-sles11.patch
 ext4-kill-dx_root.patch

-ext4_data_in_dirent.patch

 ext4-extents-mount-option-rhel5.patch
 ext4-extents-mount-option-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 a4fdac9..ae426f0 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series
@@ -34,4 +34,3 @@ ext3-dynlocks-2.6-rhel5.patch
 ext3-hash-indexed-dir-dotdot-update.patch
 ext3-corrupted-orphans-2.6.patch
 ext3-kill-dx_root.patch
 ext3-hash-indexed-dir-dotdot-update.patch
 ext3-corrupted-orphans-2.6.patch
 ext3-kill-dx_root.patch

-ext3_data_in_dirent.patch