ext2fs: Handle internal journal over 2^32 bytes

[tools/e2fsprogs.git] / e2fsck / unix.c

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 73cc2cf..a43f0c9 100644 (file)
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -233,7 +233,7 @@ static void check_mount(e2fsck_t ctx)
        printf(_("\n\n\007\007\007\007WARNING!!!  "
               "The filesystem is mounted.   If you continue you ***WILL***\n"
               "cause ***SEVERE*** filesystem damage.\007\007\007\n\n"));
-       cont = ask_yn(_("Do you really want to continue"), -1);
+       cont = ask_yn(_("Do you really want to continue"), 0);
        if (!cont) {
                printf (_("check aborted.\n"));
                exit (0);
@@ -1374,7 +1374,8 @@ print_unsupp_features:
         * find the default journal size.
         */
        if (sb->s_jnl_backup_type == EXT3_JNL_BACKUP_BLOCKS)
-               journal_size = sb->s_jnl_blocks[16] >> 20;
+               journal_size = (sb->s_jnl_blocks[15] << (32 - 20)) |
+                              (sb->s_jnl_blocks[16] >> 20);
        else
                journal_size = -1;