ChangeLog, mke2fs.c:

  mke2fs.c (PRS): Applied Andreas Dilger's patch to make the -r -s
  	handling a bit more sane.  (Even though -s is deprecated at this
  	point.)
ChangeLog, expect.1:
  f_journal: Update to take into account new printing by the e2fsck
  	program.
version.h:
  Update for upcoming WIP release.

5 files changed, 19 insertions, 5 deletions

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 94178008..5da2e14a 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,9 @@
 2000-10-24    <tytso@snap.thunk.org>
 
+	* mke2fs.c (PRS): Applied Andreas Dilger's patch to make the -r -s
+		handling a bit more sane.  (Even though -s is deprecated
+		at this point.)
+
 	* get_device_by_label.c: Apply fix from Erik Troan to support 16
 		character labels.
 
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 4062bb42..a19b3962 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -737,12 +737,12 @@ static void PRS(int argc, char *argv[])
 	int		reserved_ratio = 5;
 	ino_t		num_inodes = 0;
 	errcode_t	retval;
-	int		sparse_option = 0;
+	int		sparse_option = 1;
 	char *		oldpath = getenv("PATH");
 	struct ext2fs_sb *param_ext2 = (struct ext2fs_sb *) &param;
 	char *		raid_opts = 0;
 	char *		fs_type = 0;
-	const char *	feature_set = "filetype,sparse_super";
+	const char *	feature_set = "filetype";
 	blk_t		dev_size;
 #ifdef linux
 	struct 		utsname ut;
@@ -1003,11 +1003,15 @@ static void PRS(int argc, char *argv[])
 	 */
 	param.s_r_blocks_count = (param.s_blocks_count * reserved_ratio) / 100;
 
-#ifdef EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER
+	/* Turn off features not supported by the earlier filesystem version */
+	if (param.s_rev_level == 0) {
+		sparse_option = 0;
+		feature_set = NULL;
+	}
 	if (sparse_option)
 		param_ext2->s_feature_ro_compat |=
 			EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
-#endif
+
 	if (feature_set && !strncasecmp(feature_set, "none", 4))
 		feature_set = NULL;
 	if (feature_set && e2p_edit_feature(feature_set,
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0672e40e..28039542 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-24    <tytso@snap.thunk.org>
+
+	* f_journal: Update to take into account new printing by the
+		e2fsck program.
+
 2000-08-22    <tytso@valinux.com>
 
 	* f_journal: Make the test check for a wide variety of mixed sizes
diff --git a/tests/f_journal/expect.1 b/tests/f_journal/expect.1
index 4f7cd871..b3ea369c 100644
--- a/tests/f_journal/expect.1
+++ b/tests/f_journal/expect.1
@@ -1,3 +1,4 @@
+test_filesys: recovering journal
 Clearing orphaned inode 37 (uid=0, gid=0, mode=0100600, size=4096)
 Clearing orphaned inode 90 (uid=0, gid=0, mode=040700, size=1024)
 Clearing orphaned inode 67 (uid=0, gid=0, mode=0100600, size=4096)
diff --git a/version.h b/version.h
index 15bf0892..b41cf99c 100644
--- a/version.h
+++ b/version.h
@@ -7,4 +7,4 @@
  */
 
 #define E2FSPROGS_VERSION "1.20-WIP"
-#define E2FSPROGS_DATE "20-Aug-2000"
+#define E2FSPROGS_DATE "24-Oct-2000"