Many files:

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

diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
index 7215a58..7561e79 100644 (file)
--- a/e2fsck/pass5.c
+++ b/e2fsck/pass5.c
@@ -39,28 +39,31 @@ void e2fsck_pass5(e2fsck_t ctx)
                fix_problem(ctx, PR_5_PASS_HEADER, &pctx);
 
        if (ctx->progress)
-               (ctx->progress)(ctx, 5, 0, 3);
+               if ((ctx->progress)(ctx, 5, 0, 3))
+                       return;
 
        e2fsck_read_bitmaps(ctx);
 
        if (ctx->progress)
-               (ctx->progress)(ctx, 5, 2, 3);
+               if ((ctx->progress)(ctx, 5, 2, 3))
+                       return;
 
        check_block_bitmaps(ctx);
-       if (ctx->flags & E2F_FLAG_ABORT)
+       if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
                return;
        check_inode_bitmaps(ctx);
-       if (ctx->flags & E2F_FLAG_ABORT)
+       if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
                return;
        check_inode_end(ctx);
-       if (ctx->flags & E2F_FLAG_ABORT)
+       if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
                return;
        check_block_end(ctx);
-       if (ctx->flags & E2F_FLAG_ABORT)
+       if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
                return;
 
        if (ctx->progress)
-               (ctx->progress)(ctx, 5, 3, 3);
+               if ((ctx->progress)(ctx, 5, 3, 3))
+                       return;
 
        ext2fs_free_inode_bitmap(ctx->inode_used_map);
        ctx->inode_used_map = 0;
@@ -86,7 +89,7 @@ static void check_block_bitmaps(e2fsck_t ctx)
        int     group_free = 0;
        int     actual, bitmap;
        struct problem_context  pctx;
-       int     problem, fixit;
+       int     problem, fixit, had_problem;
        errcode_t       retval;
        
        clear_problem_context(&pctx);
@@ -123,7 +126,8 @@ static void check_block_bitmaps(e2fsck_t ctx)
                return;
        }
                       
-redo_counts:                  
+redo_counts:
+       had_problem = 0;
        for (i = fs->super->s_first_data_block;
             i < fs->super->s_blocks_count;
             i++) {
@@ -146,6 +150,7 @@ redo_counts:
                }
                pctx.blk = i;
                fix_problem(ctx, problem, &pctx);
+               had_problem++;
                
        do_counts:
                if (!bitmap) {
@@ -161,7 +166,10 @@ redo_counts:
                        group_free = 0;
                }
        }
-       fixit = end_problem_latch(ctx,  PR_LATCH_BBITMAP);
+       if (had_problem)
+               fixit = end_problem_latch(ctx,  PR_LATCH_BBITMAP);
+       else
+               fixit = -1;
        if (fixit == 1) {
                ext2fs_free_block_bitmap(fs->block_map);
                retval = ext2fs_copy_bitmap(ctx->block_found_map,
@@ -220,7 +228,7 @@ static void check_inode_bitmaps(e2fsck_t ctx)
        int     actual, bitmap;
        errcode_t       retval;
        struct problem_context  pctx;
-       int     problem, fixit;
+       int     problem, fixit, had_problem;
        
        clear_problem_context(&pctx);
        free_array = (int *) e2fsck_allocate_memory(ctx,
@@ -257,6 +265,7 @@ static void check_inode_bitmaps(e2fsck_t ctx)
        }
 
 redo_counts:
+       had_problem = 0;
        for (i = 1; i <= fs->super->s_inodes_count; i++) {
                actual = ext2fs_fast_test_inode_bitmap(ctx->inode_used_map, i);
                bitmap = ext2fs_fast_test_inode_bitmap(fs->inode_map, i);
@@ -277,6 +286,7 @@ redo_counts:
                }
                pctx.ino = i;
                fix_problem(ctx, problem, &pctx);
+               had_problem++;
                
 do_counts:
                if (!bitmap) {
@@ -297,7 +307,10 @@ do_counts:
                        dirs_count = 0;
                }
        }
-       fixit = end_problem_latch(ctx, PR_LATCH_IBITMAP);
+       if (had_problem)
+               fixit = end_problem_latch(ctx, PR_LATCH_IBITMAP);
+       else
+               fixit = -1;
        if (fixit == 1) {
                ext2fs_free_inode_bitmap(fs->inode_map);
                retval = ext2fs_copy_bitmap(ctx->inode_used_map,