X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2FautoMakefile.am;h=45e266d88a235ed74c4f9418ce8b11475f714f3f;hb=0331487fbde09658d34ea2a28ee9f1c6d829b733;hp=b90fdcd7c325a708b1a6a24d485f91069ca55a87;hpb=4dd31baae9a73502c5c7bb5c0962fd703e231fd5;p=fs%2Flustre-release.git

diff --git a/ldiskfs/autoMakefile.am b/ldiskfs/autoMakefile.am
index b90fdcd..45e266d 100644
--- a/ldiskfs/autoMakefile.am
+++ b/ldiskfs/autoMakefile.am
@@ -14,10 +14,13 @@ ldiskfs_linux_headers := $(addprefix linux/,$(subst ext4,ldiskfs,$(notdir $(linu
 
 $(filter %.c,$(ldiskfs_patched_sources)): sources $(ldiskfs_linux_headers) $(filter %.h,$(ldiskfs_patched_sources))
 
+# Convert LDISKFS_SUPER_MAGIC back to EXT4_SUPER_MAGIC so that the ldiskfs
+# code can use the existing kernel headers instead of defining this itself.
 ldiskfs_sed_flags = \
 	-e "s/dx_hash_info/ext4_dx_hash_info/g" \
 	-e "s/DX_HASH/EXT4_DX_HASH/g" \
-	-e "s/EXT4/LDISKFS/g" -e "s/ext4/ldiskfs/g"
+	-e "s/EXT4/LDISKFS/g" -e "s/ext4/ldiskfs/g" \
+	-e "s/LDISKFS_SUPER_MAGIC/EXT4_SUPER_MAGIC/g"
 
 %.c: linux-stage/fs/ext4/%.c
 	sed $(strip $(ldiskfs_sed_flags)) $< > $@