e2fsck: skip quota update when interrupted

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

diff --git a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c
index 3871840..2002dc0 100644 (file)
--- a/e2fsck/e2fsck.c
+++ b/e2fsck/e2fsck.c
@@ -187,6 +187,9 @@ void e2fsck_free_context(e2fsck_t ctx)
        if (ctx->device_name)
                ext2fs_free_mem(&ctx->device_name);
 
+       if (ctx->log_fn)
+               free(ctx->log_fn);
+
        ext2fs_free_mem(&ctx);
 }
 
@@ -196,12 +199,10 @@ void e2fsck_free_context(e2fsck_t ctx)
  */
 typedef void (*pass_t)(e2fsck_t ctx);
 
-pass_t e2fsck_passes[] = {
+static pass_t e2fsck_passes[] = {
        e2fsck_pass1, e2fsck_pass2, e2fsck_pass3, e2fsck_pass4,
        e2fsck_pass5, 0 };
 
-#define E2F_FLAG_RUN_RETURN    (E2F_FLAG_SIGNAL_MASK|E2F_FLAG_RESTART)
-
 int e2fsck_run(e2fsck_t ctx)
 {
        int     i;
@@ -218,6 +219,8 @@ int e2fsck_run(e2fsck_t ctx)
        for (i=0; (e2fsck_pass = e2fsck_passes[i]); i++) {
                if (ctx->flags & E2F_FLAG_RUN_RETURN)
                        break;
+               if (e2fsck_mmp_update(ctx->fs))
+                       fatal_error(ctx, 0);
                e2fsck_pass(ctx);
                if (ctx->progress)
                        (void) (ctx->progress)(ctx, 0, 0, 0);