Fix mke2fs error checking when creating revision 0 filesystems

Fix revision 0 error checking so that it doesn't give spurious error
when the user gives a command-line option of "-O none".Add error
checking so that "-r 0 -j", "-r 0 -s 1", and "-r 0 -E resize=XXX" will
print an explanatory error message and abort.

Addresses Debian bug: #392107

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 8d912a2e02accb3fc0e9e9ab0a4c5601cac91d9b..ed8d2fe769140d6a4c10ca0dabd6fb4f5bd19120 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-18  Theodore Tso  <tytso@mit.edu>
+
+       * mke2fs.c: Fix revision 0 error checking so that it doesn't give
+               a spurious error when the user gives a command-line option
+               of "-O none".  (Addresses Debian bug: #392107).  Add 
+               error checking so that "-r 0 -j", "-r 0 -s 1", and 
+               "-r 0 -E resize=XXX" will print an explanatory error
+               message and abort.
+
 2006-10-03  Theodore Tso  <tytso@mit.edu>
 
        * badblocks.c: Fix the interpretation of the last_block parameter

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 87ae687050f7942c08650fb44982f65e10e02877..b83aac1b43aeedbeeccbd5893b56ec8cad49f609 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -831,6 +831,11 @@ static void parse_extended_opts(struct ext2_super_block *param,
                                rsv_gdb = EXT2_ADDR_PER_BLOCK(param);
 
                        if (rsv_gdb > 0) {
+                               if (param->s_rev_level == EXT2_GOOD_OLD_REV) {
+                                       fprintf(stderr, 
+       _("On-line resizing not supported with revision 0 filesystems\n"));
+                                       exit(1);
+                               }
                                param->s_feature_compat |=
                                        EXT2_FEATURE_COMPAT_RESIZE_INODE;
 
@@ -1273,39 +1278,58 @@ static void PRS(int argc, char *argv[])
 
        /* Figure out what features should be enabled */
 
-       if (r_opt == EXT2_GOOD_OLD_REV && fs_features) {
+       tmp = tmp2 = NULL;
+       if (fs_param.s_rev_level != EXT2_GOOD_OLD_REV) {
+               profile_get_string(profile, "defaults", "base_features", 0,
+                                  "filetype,sparse_super", &tmp);
+               profile_get_string(profile, "fs_types", fs_type, 
+                                  "base_features", tmp, &tmp2);
+               edit_feature(tmp2, &fs_param.s_feature_compat);
+               free(tmp);
+               free(tmp2);
+
+               tmp = tmp2 = NULL;
+               profile_get_string(profile, "defaults", "default_features", 0,
+                                  "", &tmp);
+               profile_get_string(profile, "fs_types", fs_type, 
+                                  "default_features", tmp, &tmp2);
+       }
+       edit_feature(fs_features ? fs_features : tmp2, 
+                    &fs_param.s_feature_compat);
+       if (tmp)
+               free(tmp);
+       if (tmp2)
+               free(tmp2);
+
+       if (r_opt == EXT2_GOOD_OLD_REV && 
+           (fs_param.s_feature_compat || fs_param.s_feature_incompat ||
+            fs_param.s_feature_incompat)) {
                fprintf(stderr, _("Filesystem features not supported "
                                  "with revision 0 filesystems\n"));
                exit(1);
        }
 
-       profile_get_string(profile, "defaults", "base_features", 0,
-                          "filetype,sparse_super", &tmp);
-       profile_get_string(profile, "fs_types", fs_type, "base_features",
-                          tmp, &tmp2);
-       edit_feature(tmp2, &fs_param.s_feature_compat);
-       free(tmp);
-       free(tmp2);
-
-       profile_get_string(profile, "defaults", "default_features", 0,
-                          "", &tmp);
-       profile_get_string(profile, "fs_types", fs_type, 
-                          "default_features", tmp, &tmp2);
-       edit_feature(fs_features ? fs_features : tmp2, 
-                    &fs_param.s_feature_compat);
-       free(tmp);
-       free(tmp2);
-
-       if (s_opt > 0)
+       if (s_opt > 0) {
+               if (r_opt == EXT2_GOOD_OLD_REV) {
+                       fprintf(stderr, _("Sparse superblocks not supported "
+                                 "with revision 0 filesystems\n"));
+                       exit(1);
+               }
                fs_param.s_feature_ro_compat |=
                        EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
-       else if (s_opt == 0)
+       } else if (s_opt == 0)
                fs_param.s_feature_ro_compat &=
                        ~EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
 
-       if (journal_size != 0)
+       if (journal_size != 0) {
+               if (r_opt == EXT2_GOOD_OLD_REV) {
+                       fprintf(stderr, _("Journals not supported "
+                                 "with revision 0 filesystems\n"));
+                       exit(1);
+               }
                fs_param.s_feature_compat |= 
                        EXT3_FEATURE_COMPAT_HAS_JOURNAL;
+       }
 
        if (fs_param.s_feature_incompat & 
            EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
@@ -1317,12 +1341,6 @@ static void PRS(int argc, char *argv[])
                fs_param.s_feature_ro_compat = 0;
        }
        
-       if (fs_param.s_rev_level == EXT2_GOOD_OLD_REV) {
-               fs_param.s_feature_incompat = 0;
-               fs_param.s_feature_compat = 0;
-               fs_param.s_feature_ro_compat = 0;
-       }
-
        /* Set first meta blockgroup via an environment variable */
        /* (this is mostly for debugging purposes) */
        if ((fs_param.s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) &&