Branch: b_hd_ctxt

update from b1_6

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6.12-vanilla.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6.12-vanilla.series
index 53c060b..286a3a2 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6.12-vanilla.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6.12-vanilla.series
@@ -11,5 +11,8 @@ ext3-ialloc-2.6.patch
 ext3-remove-cond_resched-calls-2.6.12.patch
 ext3-htree-dot-2.6.patch
 ext3-external-journal-2.6.12.patch
 ext3-remove-cond_resched-calls-2.6.12.patch
 ext3-htree-dot-2.6.patch
 ext3-external-journal-2.6.12.patch

-ext3-lookup-dotdot-2.6.9.patch
-ext3-sector_t-overflow-2.6.12.patch
+ext3-check-jbd-errors-2.6.12.patch
+ext3-check-jbd-errors-2.6.9.patch
+ext3-uninit-2.6.9.patch
+ext3-nanosecond-2.6-rhel4.patch
+

diff --git a/ldiskfs/ldiskfs/Makefile.in b/ldiskfs/ldiskfs/Makefile.in
index f945ff3..42f5dd7 100644 (file)
--- a/ldiskfs/ldiskfs/Makefile.in
+++ b/ldiskfs/ldiskfs/Makefile.in
@@ -10,7 +10,7 @@ linux_headers := $(wildcard @LINUX@/include/linux/ext3*.h)
 
 ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
 new_sources := iopen.c iopen.h extents.c mballoc.c group.h
 
 ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
 new_sources := iopen.c iopen.h extents.c mballoc.c group.h

-new_headers := ext3_extents.h
+new_headers := ext3_extents.h 

 ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
 ldiskfs_sources := $(ldiskfs_patched_sources)
 
 ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
 ldiskfs_sources := $(ldiskfs_patched_sources)