LU-264 Integrate upstream ext4 MMP chnages

[fs/lustre-release.git] / ldiskfs / ldiskfs / Makefile.in

diff --git a/ldiskfs/ldiskfs/Makefile.in b/ldiskfs/ldiskfs/Makefile.in
index d70d42b..27584ac 100644 (file)
--- a/ldiskfs/ldiskfs/Makefile.in
+++ b/ldiskfs/ldiskfs/Makefile.in
@@ -3,15 +3,24 @@ default: all
 MODULES := ldiskfs
 
 # copy makefile over to not break patches
-ext3_extra := $(wildcard @LINUX@/fs/ext3/Makefile)
+backfs_extra := $(wildcard @LINUX@/fs/@BACKFS@/Makefile)
 
-ext3_headers := $(wildcard @LINUX@/fs/ext3/*.h)
-linux_headers := $(wildcard @LINUX@/include/linux/ext3*.h)
+backfs_headers := $(wildcard @LINUX@/fs/@BACKFS@/*.h)
+linux_headers := $(wildcard @LINUX@/include/linux/@BACKFS@*.h)
+trace_headers := $(wildcard @LINUX@/include/trace/events/@BACKFS@*.h)
 
-ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
-new_sources := iopen.c iopen.h extents.c mballoc.c group.h fiemap.h
-new_headers := ext3_extents.h 
-ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
+backfs_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/@BACKFS@/*.c))
+
+ext3_new_sources := extents.c mballoc.c group.h dynlocks.c fiemap.h
+ext3_new_headers := ext3_extents.h
+
+ext4_new_sources := dynlocks.c fiemap.h mmp.c
+ext4_new_headers :=
+
+new_sources := $(@BACKFS@_new_sources)
+new_headers := $(@BACKFS@_new_headers)
+
+ldiskfs_patched_sources := $(notdir $(backfs_sources) $(backfs_headers)) $(new_sources) $(new_headers)
 ldiskfs_sources := $(ldiskfs_patched_sources)
 
 ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))