Whamcloud - gitweb
e2fsck: avoid unnecessary close/reopen for non-MMP filesystems
authorTheodore Ts'o <tytso@mit.edu>
Thu, 22 Mar 2012 03:18:49 +0000 (23:18 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 22 Mar 2012 03:18:49 +0000 (23:18 -0400)
For file systems that do not use MMP, there's no reason to close the
file system and then re-open the file system a second time, since
EXT2_FLAG_SKIP_MMP has no meaning for non-MMP file systems anyway.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Andreas Dilger <adilger@whamcloud.com>
e2fsck/unix.c

index 59c52ff..d0b10d4 100644 (file)
@@ -1398,12 +1398,10 @@ failure:
            (flags & EXT2_FLAG_SKIP_MMP)) {
                if (e2fsck_check_mmp(fs, ctx))
                        fatal_error(ctx, 0);
-       }
 
-        /*
-         * Restart in order to reopen fs but this time start mmp.
-         */
-       if (flags & EXT2_FLAG_SKIP_MMP) {
+               /*
+                * Restart in order to reopen fs but this time start mmp.
+                */
                ext2fs_close(fs);
                ctx->fs = NULL;
                flags &= ~EXT2_FLAG_SKIP_MMP;