LU-50 ldiskfs: pdirops patch for ldiskfs

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

diff --git a/ldiskfs/ldiskfs/Makefile.in b/ldiskfs/ldiskfs/Makefile.in
index acf0b20..acbd133 100644 (file)
--- a/ldiskfs/ldiskfs/Makefile.in
+++ b/ldiskfs/ldiskfs/Makefile.in
@@ -3,16 +3,31 @@ default: all
 MODULES := ldiskfs
 
 # copy makefile over to not break patches
-ext3_extra := $(wildcard @LINUX@/fs/ext3/Makefile)
-
-ext3_headers := $(wildcard @LINUX@/fs/ext3/*.h)
-linux_headers := $(wildcard @LINUX@/include/linux/ext3*.h)
-new_linux_hearders := ext3_extents.h
-ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
-new_sources := iopen.c iopen.h extents.c extents-in-ea.c mballoc.c
-ldiskfs_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources)
+backfs_extra := $(wildcard @LINUX@/fs/@BACKFS@/Makefile)
+
+backfs_headers := $(wildcard @EXT_DIR@/*.h)
+linux_headers := $(wildcard @LINUX@/include/linux/@BACKFS@*.h)
+linux_new_headers := dynlocks.h
+@LDISKFS_PDO_TRUE@linux_new_headers += htree_lock.h
+trace_headers := $(wildcard @LINUX@/include/trace/events/@BACKFS@*.h)
+
+backfs_sources := $(filter-out %.mod.c,$(wildcard @EXT_DIR@/*.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
+@LDISKFS_PDO_TRUE@ext4_new_sources += htree_lock.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))
 
-EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs
+EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFSDIR@
 
 @INCLUDE_RULES@