X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2FautoMakefile.am;h=24431919ed426c9fc5b9c0186cd09c38bfdce2f5;hb=8c3084c293c9ce5005542084f02a1fd328b23e46;hp=1b5311b7a8e94b5a3d93155062a582b6d5c87f7e;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index 1b5311b..2443191 100644
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -60,7 +60,10 @@ sources: fsfilt_$(BACKINGFS).c
 else #SERVER
 sources:
 
-endif
+endif #SERVER
+
+fsfilt_extN.c: fsfilt_ext3.c
+	sed -e "s/EXT3/EXTN/g" -e "s/ext3/extN/g" $< > $@
 
 ldiskfs_sed_flags = \
 	-e "s/dx_hash_info/ext3_dx_hash_info/g" \
@@ -68,10 +71,15 @@ ldiskfs_sed_flags = \
 	-e "s/DX_HASH/EXT3_DX_HASH/g" \
 	-e "s/reserve_window/ext3_reserve_window/g" \
 	-e "s/rsv_window_add/ext3_rsv_window_add/g" \
-	-e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g"
+	-e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g" \
+	-e "s/EXT4/LDISKFS/g" -e "s/ext4/ldiskfs/g" \
+	-e "s/HAVE_LDISKFS_LDISKFS/HAVE_EXT4_LDISKFS/g"
 
 fsfilt_ldiskfs.c: fsfilt_ext3.c
 	sed $(strip $(ldiskfs_sed_flags)) $< > $@
+	if grep -q '^#define\(.*\)HAVE_EXT4_LDISKFS' @LDISKFS_DIR@/config.h ; then \
+		sed -i -e "/DEBUG_SUBSYSTEM\(.*\)S_FILTER/a\#define HAVE_EXT4_LDISKFS 1" $@ ;\
+	fi
 fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h
 	sed $(strip $(ldiskfs_sed_flags)) $< > $@
 
@@ -101,11 +109,5 @@ endif # MODULES
 
 install-data-hook: $(install_data_hook)
 
-DIST_SOURCES = fsfilt.c fsfilt_ext3.c fsfilt_reiserfs.c lvfs_common.c \
-	lvfs_internal.h lvfs_linux.c lvfs_userfs.c \
-	upcall_cache.c prng.c lvfs_lib.c \
-	lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c \
-        # quotacheck_test.c quotactl_test.c fsfilt_ext3_quota.h
-
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = fsfilt-*.c fsfilt_ldiskfs*.c fsfilt_extN.c sources