mke2fs: check that auto-detected blocksize <= sys_page_size

Block size can be specified manually via the -b option or deduced
automatically. Unfortunately, the check that it is still smaller than
the system page size is only performed right after the command line
options are parsed.

Therefore, if buggy or inappropriately installed/configured hardware
hints that larger block sizes have to be used, mkfs will silently create
a file system which can not be mounted on the system in question.

By moving the check beyond the last assignment to blocksize it is now
ensured, that mkfs will issue a warning even if inappropriate blocksize
was auto-detected.

The new behavior can be easily tested, by exporting the following
variables before running mkfs:

    export MKE2FS_DEVICE_SECTSIZE=8192
    export MKE2FS_DEVICE_PHYS_SECTSIZE=8192

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index d011dcfc335a199435a3194c0edb7d58bcadd36d..63538cd91e4a8acedd37c5b7b2cf9316697cd993 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1516,17 +1516,6 @@ profile_error:
                ext2fs_close(jfs);
        }
 
-       if (blocksize > sys_page_size) {
-               if (!force) {
-                       com_err(program_name, 0,
-                               _("%d-byte blocks too big for system (max %d)"),
-                               blocksize, sys_page_size);
-                       proceed_question();
-               }
-               fprintf(stderr, _("Warning: %d-byte blocks too big for system "
-                                 "(max %d), forced to continue\n"),
-                       blocksize, sys_page_size);
-       }
        if (optind < argc) {
                fs_blocks_count = parse_num_blocks2(argv[optind++],
                                                   fs_param.s_log_block_size);
@@ -1835,6 +1824,19 @@ profile_error:
 
        blocksize = EXT2_BLOCK_SIZE(&fs_param);
 
+       /* This check should happen beyond the last assignment to blocksize */
+       if (blocksize > sys_page_size) {
+               if (!force) {
+                       com_err(program_name, 0,
+                               _("%d-byte blocks too big for system (max %d)"),
+                               blocksize, sys_page_size);
+                       proceed_question();
+               }
+               fprintf(stderr, _("Warning: %d-byte blocks too big for system "
+                                 "(max %d), forced to continue\n"),
+                       blocksize, sys_page_size);
+       }
+
        lazy_itable_init = 0;
        if (access("/sys/fs/ext4/features/lazy_itable_init", R_OK) == 0)
                lazy_itable_init = 1;