Remove support for --enable-clear-htree; this was

only needed during the early development of the htree patch.

diff --git a/ChangeLog b/ChangeLog
index 4c482db..e5b200e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-04  Theodore Ts'o  <tytso@mit.edu>
 
+       * configure.in: Remove support for --enable-clear-htree; this was
+               only needed during the early development of the htree patch.
+
        * configure.in, MCONFIG.in: Add support for --enable-maintainer-mode;
                only rebuild configure from configure.in if it is enabled.
 

diff --git a/configure b/configure
index 1c40b34..889bdcd 100644 (file)
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS E2FSPROGS_YEAR E2FSPROGS_MONTH E2FSPROGS_DAY E2FSPROGS_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LD CPP EGREP LINUX_INCLUDE MAINTAINER_CMT HTREE_CMT HTREE_CLR_CMT ELF_CMT BSDLIB_CMT PROFILE_CMT CHECKER_CMT LIB_EXT STATIC_LIB_EXT PROFILED_LIB_EXT SWAPFS_CMT DEBUGFS_CMT IMAGER_CMT RESIZER_CMT E2FSCK_TYPE FSCK_PROG FSCK_MAN E2INITRD_PROG E2INITRD_MAN GETTEXT_PACKAGE PACKAGE VERSION SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE RANLIB ac_ct_RANLIB ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB BINARY_TYPE LN LN_S MV CP RM CHMOD AWK SED PERL LDCONFIG AR ac_ct_AR STRIP ac_ct_STRIP BUILD_CC SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_LONG_LONG SOCKET_LIB DLOPEN_LIB LINUX_CMT CYGWIN_CMT UNIX_CMT root_prefix root_bindir root_sbindir root_libdir root_sysconfdir LDFLAG_STATIC SS_DIR ET_DIR DO_TEST_SUITE INTL_FLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS E2FSPROGS_YEAR E2FSPROGS_MONTH E2FSPROGS_DAY E2FSPROGS_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LD CPP EGREP LINUX_INCLUDE MAINTAINER_CMT HTREE_CMT ELF_CMT BSDLIB_CMT PROFILE_CMT CHECKER_CMT LIB_EXT STATIC_LIB_EXT PROFILED_LIB_EXT SWAPFS_CMT DEBUGFS_CMT IMAGER_CMT RESIZER_CMT E2FSCK_TYPE FSCK_PROG FSCK_MAN E2INITRD_PROG E2INITRD_MAN GETTEXT_PACKAGE PACKAGE VERSION SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE RANLIB ac_ct_RANLIB ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB BINARY_TYPE LN LN_S MV CP RM CHMOD AWK SED PERL LDCONFIG AR ac_ct_AR STRIP ac_ct_STRIP BUILD_CC SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_LONG_LONG SOCKET_LIB DLOPEN_LIB LINUX_CMT CYGWIN_CMT UNIX_CMT root_prefix root_bindir root_sbindir root_libdir root_sysconfdir LDFLAG_STATIC SS_DIR ET_DIR DO_TEST_SUITE INTL_FLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files='MCONFIG MAKEFILE_ELF MAKEFILE_BSDLIB MAKEFILE_PROFILE MAKEFILE_CHECKER MAKEFILE_LIBRARY'
 
 # Initialize some variables set by options.
@@ -847,7 +847,6 @@ Optional Features:
   --enable-maintainer-mode enable makefile rules useful for maintainers
   --enable-compression   enable EXPERIMENTAL compression support
   --enable-htree         enable EXPERIMENTAL htree directory support
-  --enable-htree-clear           clear htree because we don't trust e2fsck
   --enable-elf-shlibs    select ELF shared libraries
   --enable-bsd-shlibs    select BSD shared libraries
   --enable-profile       build profiling libraries
@@ -3148,28 +3147,6 @@ echo "Enabling htree directory support by default"
 
 fi;
 
-# Check whether --enable-htree-clear or --disable-htree-clear was given.
-if test "${enable_htree_clear+set}" = set; then
-  enableval="$enable_htree_clear"
-  if test "$enableval" = "no"
-then
-       HTREE_CLR_CMT=#
-       echo "Disabling htree clearing"
-else
-       HTREE_CLR_CMT=
-       cat >>confdefs.h <<\_ACEOF
-#define ENABLE_HTREE_CLEAR 1
-_ACEOF
-
-       echo "Enabling htree clearing"
-fi
-
-else
-  HTREE_CLR_CMT=#
-echo "Disabling htree clearing by default"
-
-fi;
-
 # Check whether --enable-elf-shlibs or --disable-elf-shlibs was given.
 if test "${enable_elf_shlibs+set}" = set; then
   enableval="$enable_elf_shlibs"
@@ -14963,7 +14940,6 @@ s,@EGREP@,$EGREP,;t t
 s,@LINUX_INCLUDE@,$LINUX_INCLUDE,;t t
 s,@MAINTAINER_CMT@,$MAINTAINER_CMT,;t t
 s,@HTREE_CMT@,$HTREE_CMT,;t t
-s,@HTREE_CLR_CMT@,$HTREE_CLR_CMT,;t t
 s,@ELF_CMT@,$ELF_CMT,;t t
 s,@BSDLIB_CMT@,$BSDLIB_CMT,;t t
 s,@PROFILE_CMT@,$PROFILE_CMT,;t t

diff --git a/configure.in b/configure.in
index 79f244e..2009e3f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -190,25 +190,6 @@ echo "Enabling htree directory support by default"
 )
 AC_SUBST(HTREE_CMT)
 dnl
-dnl handle --enable-clear-htree
-dnl
-AC_ARG_ENABLE([htree-clear],
-[  --enable-htree-clear          clear htree because we don't trust e2fsck],
-if test "$enableval" = "no"
-then
-       HTREE_CLR_CMT=#
-       echo "Disabling htree clearing"
-else
-       HTREE_CLR_CMT=
-       AC_DEFINE(ENABLE_HTREE_CLEAR)
-       echo "Enabling htree clearing"
-fi
-,
-HTREE_CLR_CMT=#
-echo "Disabling htree clearing by default"
-)
-AC_SUBST(HTREE_CLR_CMT)
-dnl
 dnl handle --enable-elf-shlibs
 dnl
 AC_ARG_ENABLE([elf-shlibs],

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index fbe6401..7553c2e 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-04  Theodore Ts'o  <tytso@mit.edu>
+
+       * pass2.c (e2fsck_pass2), problem.c (PR_2_HTREE_FCLR), problem.h
+               (PR_2_HTREE_FCLR): Remove support for
+               --enable-clear-htree; this was only needed during the
+               early development of the htree patch.
+
 2005-01-28  Theodore Ts'o  <tytso@mit.edu>
 
        * pass2.c (e2fsck_process_bad_inode): Fix a corner case involving

diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index dffaae7..69599ff 100644 (file)
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -243,13 +243,6 @@ void e2fsck_pass2(e2fsck_t ctx)
                        clear_htree(ctx, dx_dir->ino);
                        dx_dir->numblocks = 0;
                }
-#ifdef ENABLE_HTREE_CLEAR
-               if (dx_dir->numblocks) {
-                       fix_problem(ctx, PR_2_HTREE_FCLR, &pctx);
-                       clear_htree(ctx, dx_dir->ino);
-                       dx_dir->numblocks = 0;
-               }
-#endif
        }
 #endif
        ext2fs_free_mem(&buf);

diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 8951082..3350e8d 100644 (file)
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -1081,11 +1081,6 @@ static const struct e2fsck_problem problem_table[] = {
        { PR_2_HTREE_CLEAR,
          N_("Invalid @h %d (%q).  "), PROMPT_CLEAR, 0 },
                  
-       /* Clear the htree flag forcibly */
-       { PR_2_HTREE_FCLR,
-         N_("Forcibly clearing HTREE flag on @i %d (%q).  (Beta test code)\n"),
-                 PROMPT_NONE, 0 },
-
        /* Bad block in htree interior node */
        { PR_2_HTREE_BADBLK,
          N_("@p @h %d (%q): bad @b number %b.\n"),

diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index aa0d30e..f9d2ffc 100644 (file)
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -640,7 +640,7 @@ struct problem_context {
 #define PR_2_HTREE_CLEAR       0x020038
 
 /* Clear the htree flag forcibly */
-#define PR_2_HTREE_FCLR                0x020039
+/* #define PR_2_HTREE_FCLR     0x020039 */
 
 /* Bad block in htree interior node */
 #define PR_2_HTREE_BADBLK      0x02003A

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a05d683..63fbc49 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-05  Theodore Ts'o  <tytso@mit.edu>
+
+       * Makefile.in, f_h_badnode, f_dup_de, f_h_reindex, f_h_normal,
+               f_h_badroot: Remove support for --enable-htree-clear
+
 2005-01-28  Theodore Ts'o  <tytso@mit.edu>
 
        * f_bad_inode, f_recnect_bad: Adjust test cases to take into

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 945b1d6..46c4435 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -17,7 +17,6 @@ test_script: test_script.in Makefile
        @echo "Creating test_script..."
        @echo "#!/bin/sh" > test_script
 @HTREE_CMT@    @echo "HTREE=y" >> test_script
-@HTREE_CLR_CMT@        @echo "HTREE_CLR=y" >> test_script
        @echo 'EGREP="@EGREP@"' >> test_script
        @echo "SRCDIR=@srcdir@" >> test_script
        @cat $(srcdir)/test_script.in >> test_script

diff --git a/tests/f_dup_de/script b/tests/f_dup_de/script
index 0cef9ba..84c8bff 100644 (file)
--- a/tests/f_dup_de/script
+++ b/tests/f_dup_de/script
@@ -1,4 +1,4 @@
-if test "$HTREE"x = x -o "$HTREE_CLR"x = yx; then
+if test "$HTREE"x = x ; then
        gunzip < $test_dir/image.gz > $TMPFILE
        $DEBUGFS -w -R "feature ^dir_index" $TMPFILE >/dev/null 2>&1
        gzip $TMPFILE

diff --git a/tests/f_h_badnode/script b/tests/f_h_badnode/script
index 9353ec7..9eec084 100644 (file)
--- a/tests/f_h_badnode/script
+++ b/tests/f_h_badnode/script
@@ -1,4 +1,4 @@
-if test "$HTREE"x = yx -a "$HTREE_CLR"x = x; then
+if test "$HTREE"x = yx ; then
 . $cmd_dir/run_e2fsck
 else
        rm -f $test_name.ok $test_name.failed

diff --git a/tests/f_h_badroot/script b/tests/f_h_badroot/script
index 9353ec7..9eec084 100644 (file)
--- a/tests/f_h_badroot/script
+++ b/tests/f_h_badroot/script
@@ -1,4 +1,4 @@
-if test "$HTREE"x = yx -a "$HTREE_CLR"x = x; then
+if test "$HTREE"x = yx ; then
 . $cmd_dir/run_e2fsck
 else
        rm -f $test_name.ok $test_name.failed

diff --git a/tests/f_h_normal/script b/tests/f_h_normal/script
index 9353ec7..9eec084 100644 (file)
--- a/tests/f_h_normal/script
+++ b/tests/f_h_normal/script
@@ -1,4 +1,4 @@
-if test "$HTREE"x = yx -a "$HTREE_CLR"x = x; then
+if test "$HTREE"x = yx ; then
 . $cmd_dir/run_e2fsck
 else
        rm -f $test_name.ok $test_name.failed

diff --git a/tests/f_h_reindex/script b/tests/f_h_reindex/script
index 9353ec7..9eec084 100644 (file)
--- a/tests/f_h_reindex/script
+++ b/tests/f_h_reindex/script
@@ -1,4 +1,4 @@
-if test "$HTREE"x = yx -a "$HTREE_CLR"x = x; then
+if test "$HTREE"x = yx ; then
 . $cmd_dir/run_e2fsck
 else
        rm -f $test_name.ok $test_name.failed