Branch b1_6

Remove ldiskfs and ldiskfs2 from lustre/

b=12068

diff --git a/lustre/ldiskfs/Makefile.in b/lustre/ldiskfs/Makefile.in
deleted file mode 100644 (file)
index eeb1bed..0000000
--- a/lustre/ldiskfs/Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-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)
-
-ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
-new_sources := iopen.c iopen.h extents.c mballoc.c
-new_headers := ext3_extents.h
-ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_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
-
-@INCLUDE_RULES@

diff --git a/lustre/ldiskfs/autoMakefile.am b/lustre/ldiskfs/autoMakefile.am
deleted file mode 100644 (file)
index 8ac1b87..0000000
--- a/lustre/ldiskfs/autoMakefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-if MODULES
-if LDISKFS
-modulefs_DATA = ldiskfs$(KMODEXT)
-endif
-endif
-
-ldiskfs_linux_headers := $(addprefix linux/,$(subst ext3,ldiskfs,$(notdir $(linux_headers))))
-
-$(filter %.c,$(ldiskfs_patched_sources)): sources $(ldiskfs_linux_headers) $(filter %.h,$(ldiskfs_patched_sources))
-
-ldiskfs_sed_flags = \
-       -e "s/dx_hash_info/ext3_dx_hash_info/g" \
-       -e "s/dir_private_info/ext3_dir_private_info/g" \
-       -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"
-
-%.c: linux-stage/fs/ext3/%.c
-       sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-%.h: linux-stage/fs/ext3/%.h
-       sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-linux/ldiskfs%.h: linux-stage/include/linux/ext3%.h
-       sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-#
-# FIXME: we need to grab the series in configure somehow
-# (see bug 1679)
-#
-series := @top_srcdir@/lustre/kernel_patches/series/ldiskfs-$(LDISKFS_SERIES)
-patches := @top_srcdir@/lustre/kernel_patches/patches
-
-sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
-       rm -rf linux-stage linux sources $(ldiskfs_SOURCES)
-       mkdir -p linux-stage/fs/ext3 linux-stage/include/linux
-       cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
-       cp $(linux_headers) linux-stage/include/linux
-if USE_QUILT
-       ln -s ../$(patches) linux-stage/patches
-       ln -s ../$(series) linux-stage/series
-       cd linux-stage && quilt push -a -q
-else
-       @echo -n "Applying ext3 patches:"
-       @cd linux-stage && for i in $$(<../$(series)) ; do \
-               echo -n " $$i" ; \
-               patch -s -p1 < ../$(patches)/$$i || exit 1 ; \
-       done
-       @echo
-endif
-       mkdir linux
-       @echo -n "Replacing 'ext3' with 'ldiskfs':"
-       @for i in $(notdir $(ext3_headers) $(ext3_sources)) $(new_sources) ; do \
-               echo -n " $$i" ; \
-               sed $(strip $(ldiskfs_sed_flags)) \
-                       linux-stage/fs/ext3/$$i > $$i ; \
-       done
-       @for i in $(subst ext3,,$(notdir $(linux_headers) $(new_headers))) ; do \
-               echo -n " ext3$$i" ; \
-               sed $(strip $(ldiskfs_sed_flags)) \
-                       linux-stage/include/linux/ext3$$i \
-                       > linux/ldiskfs$$i ; \
-       done
-       @echo
-       touch sources
-
-foo-check:
-       @echo "ldiskfs_sources: $(ldiskfs_sources)"
-       @echo "ldiskfs_SOURCES: $(ldiskfs_SOURCES)"
-       @echo "ldiskfs_headers: $(ldiskfs_headers)"
-       @echo "ldiskfs_objects: $(ldiskfs_objects)"
-       @echo "ldiskfs_OBJECTS: $(ldiskfs_OBJECTS)"
-       @echo "ldiskfs_LDADD: $(ldiskfs_LDADD)"
-
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-CLEANFILES = sources $(notdir $(linux_headers) $(ext3_headers) $(ext3_sources) $(new_sources) $(new_headers))
-
-clean: clean-am
-       rm -rf linux linux-stage

diff --git a/lustre/ldiskfs2/Makefile.in b/lustre/ldiskfs2/Makefile.in
deleted file mode 100644 (file)
index 032b687..0000000
--- a/lustre/ldiskfs2/Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-default: all
-
-MODULES := ldiskfs2
-
-# 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)
-
-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
-ldiskfs2_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
-ldiskfs2_sources := $(ldiskfs2_patched_sources)
-
-ldiskfs2-objs := $(filter %.o,$(ldiskfs2_sources:.c=.o))
-
-EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs2
-
-@INCLUDE_RULES@

diff --git a/lustre/ldiskfs2/autoMakefile.am b/lustre/ldiskfs2/autoMakefile.am
deleted file mode 100644 (file)
index 5b7ac7c..0000000
--- a/lustre/ldiskfs2/autoMakefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-if MODULES
-if LDISKFS
-modulefs_DATA = ldiskfs2$(KMODEXT)
-endif
-endif
-
-ldiskfs2_linux_headers := $(addprefix linux/,$(subst ext3,ldiskfs2,$(notdir $(linux_headers))))
-
-$(filter %.c,$(ldiskfs2_patched_sources)): sources $(ldiskfs2_linux_headers) $(filter %.h,$(ldiskfs2_patched_sources))
-
-ldiskfs2_sed_flags = \
-       -e "s/dx_hash_info/ext3_dx_hash_info/g" \
-       -e "s/dir_private_info/ext3_dir_private_info/g" \
-       -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/LDISKFS2/g" -e "s/ext3/ldiskfs2/g"
-
-%.c: linux-stage/fs/ext3/%.c
-       sed $(strip $(ldiskfs2_sed_flags)) $< > $@
-
-%.h: linux-stage/fs/ext3/%.h
-       sed $(strip $(ldiskfs2_sed_flags)) $< > $@
-
-linux/ldiskfs2%.h: linux-stage/include/linux/ext3%.h
-       sed $(strip $(ldiskfs2_sed_flags)) $< > $@
-
-#
-# FIXME: we need to grab the series in configure somehow
-# (see bug 1679)
-#
-series := @top_srcdir@/lustre/kernel_patches/series/ldiskfs2-$(LDISKFS_SERIES)
-patches := @top_srcdir@/lustre/kernel_patches/patches
-
-sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
-       rm -rf linux-stage linux sources $(ldiskfs2_SOURCES)
-       mkdir -p linux-stage/fs/ext3 linux-stage/include/linux
-       cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
-       cp $(linux_headers) linux-stage/include/linux
-if USE_QUILT
-       ln -s ../$(patches) linux-stage/patches
-       ln -s ../$(series) linux-stage/series
-       cd linux-stage && quilt push -a -q
-else
-       @echo -n "Applying ext3 patches:"
-       @cd linux-stage && for i in $$(<../$(series)) ; do \
-               echo -n " $$i" ; \
-               patch -s -p1 < ../$(patches)/$$i || exit 1 ; \
-       done
-       @echo
-endif
-       mkdir linux
-       @echo -n "Replacing 'ext3' with 'ldiskfs2':"
-       @for i in $(notdir $(ext3_headers) $(ext3_sources)) $(new_sources) ; do \
-               echo -n " $$i" ; \
-               sed $(strip $(ldiskfs2_sed_flags)) \
-                       linux-stage/fs/ext3/$$i > $$i ; \
-       done
-       @for i in $(subst ext3,,$(notdir $(linux_headers) $(new_headers))) ; do \
-               echo -n " ext3$$i" ; \
-               sed $(strip $(ldiskfs2_sed_flags)) \
-                       linux-stage/include/linux/ext3$$i \
-                       > linux/ldiskfs2$$i ; \
-       done
-       @echo
-       touch sources
-
-foo-check:
-       @echo "ldiskfs2_sources: $(ldiskfs2_sources)"
-       @echo "ldiskfs2_SOURCES: $(ldiskfs2_SOURCES)"
-       @echo "ldiskfs2_headers: $(ldiskfs2_headers)"
-       @echo "ldiskfs2_objects: $(ldiskfs2_objects)"
-       @echo "ldiskfs2_OBJECTS: $(ldiskfs2_OBJECTS)"
-       @echo "ldiskfs2_LDADD: $(ldiskfs2_LDADD)"
-
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
-CLEANFILES = sources $(notdir $(linux_headers) $(ext3_headers) $(ext3_sources) $(new_sources) $(new_headers))
-
-clean: clean-am
-       rm -rf linux linux-stage