Many files:

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

diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
index be2edd9..7561e79 100644 (file)
--- a/e2fsck/pass5.c
+++ b/e2fsck/pass5.c
@@ -18,7 +18,7 @@ static void check_inode_bitmaps(e2fsck_t ctx);
 static void check_inode_end(e2fsck_t ctx);
 static void check_block_end(e2fsck_t ctx);
 
-void pass5(e2fsck_t ctx)
+void e2fsck_pass5(e2fsck_t ctx)
 {
 #ifdef RESOURCE_TRACK
        struct resource_track   rtrack;
@@ -38,12 +38,32 @@ void pass5(e2fsck_t ctx)
        if (!(ctx->options & E2F_OPT_PREEN))
                fix_problem(ctx, PR_5_PASS_HEADER, &pctx);
 
-       read_bitmaps(ctx);
+       if (ctx->progress)
+               if ((ctx->progress)(ctx, 5, 0, 3))
+                       return;
+
+       e2fsck_read_bitmaps(ctx);
+
+       if (ctx->progress)
+               if ((ctx->progress)(ctx, 5, 2, 3))
+                       return;
 
        check_block_bitmaps(ctx);
+       if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
+               return;
        check_inode_bitmaps(ctx);
+       if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
+               return;
        check_inode_end(ctx);
+       if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
+               return;
        check_block_end(ctx);
+       if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
+               return;
+
+       if (ctx->progress)
+               if ((ctx->progress)(ctx, 5, 3, 3))
+                       return;
 
        ext2fs_free_inode_bitmap(ctx->inode_used_map);
        ctx->inode_used_map = 0;
@@ -69,12 +89,12 @@ 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);
-       free_array = allocate_memory(fs->group_desc_count * sizeof(int),
-                                    "free block count array");
+       free_array = (int *) e2fsck_allocate_memory(ctx,
+           fs->group_desc_count * sizeof(int), "free block count array");
 
        if ((fs->super->s_first_data_block <
             ext2fs_get_block_bitmap_start(ctx->block_found_map)) ||
@@ -86,8 +106,9 @@ static void check_block_bitmaps(e2fsck_t ctx)
                pctx.ino = ext2fs_get_block_bitmap_start(ctx->block_found_map);
                pctx.ino2 = ext2fs_get_block_bitmap_end(ctx->block_found_map);
                fix_problem(ctx, PR_5_BMAP_ENDPOINTS, &pctx);
-               /* fatal */
-               fatal_error(0);
+
+               ctx->flags |= E2F_FLAG_ABORT; /* fatal */
+               return;
        }
                       
        if ((fs->super->s_first_data_block <
@@ -100,11 +121,13 @@ static void check_block_bitmaps(e2fsck_t ctx)
                pctx.ino = ext2fs_get_block_bitmap_start(fs->block_map);
                pctx.ino2 = ext2fs_get_block_bitmap_end(fs->block_map);
                fix_problem(ctx, PR_5_BMAP_ENDPOINTS, &pctx);
-               /* fatal */
-               fatal_error(0);
+
+               ctx->flags |= E2F_FLAG_ABORT; /* fatal */
+               return;
        }
                       
-redo_counts:                  
+redo_counts:
+       had_problem = 0;
        for (i = fs->super->s_first_data_block;
             i < fs->super->s_blocks_count;
             i++) {
@@ -127,6 +150,7 @@ redo_counts:
                }
                pctx.blk = i;
                fix_problem(ctx, problem, &pctx);
+               had_problem++;
                
        do_counts:
                if (!bitmap) {
@@ -142,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,
@@ -184,7 +211,7 @@ redo_counts:
                } else
                        ext2fs_unmark_valid(fs);
        }
-       free(free_array);
+       ext2fs_free_mem((void **) &free_array);
 }
                        
 static void check_inode_bitmaps(e2fsck_t ctx)
@@ -201,14 +228,14 @@ 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 = allocate_memory(fs->group_desc_count * sizeof(int),
-                                    "free inode count array");
+       free_array = (int *) e2fsck_allocate_memory(ctx,
+           fs->group_desc_count * sizeof(int), "free inode count array");
                                     
-       dir_array = allocate_memory(fs->group_desc_count * sizeof(int),
-                                   "directory count array");
+       dir_array = (int *) e2fsck_allocate_memory(ctx,
+          fs->group_desc_count * sizeof(int), "directory count array");
                                     
        if ((1 < ext2fs_get_inode_bitmap_start(ctx->inode_used_map)) ||
            (fs->super->s_inodes_count > 
@@ -219,8 +246,9 @@ static void check_inode_bitmaps(e2fsck_t ctx)
                pctx.ino = ext2fs_get_inode_bitmap_start(ctx->inode_used_map);
                pctx.ino2 = ext2fs_get_inode_bitmap_end(ctx->inode_used_map);
                fix_problem(ctx, PR_5_BMAP_ENDPOINTS, &pctx);
-               /* fatal */
-               fatal_error(0);
+
+               ctx->flags |= E2F_FLAG_ABORT; /* fatal */
+               return;
        }
        if ((1 < ext2fs_get_inode_bitmap_start(fs->inode_map)) ||
            (fs->super->s_inodes_count > 
@@ -231,11 +259,13 @@ static void check_inode_bitmaps(e2fsck_t ctx)
                pctx.ino = ext2fs_get_inode_bitmap_start(fs->inode_map);
                pctx.ino2 = ext2fs_get_inode_bitmap_end(fs->inode_map);
                fix_problem(ctx, PR_5_BMAP_ENDPOINTS, &pctx);
-               /* fatal */
-               fatal_error(0);
+
+               ctx->flags |= E2F_FLAG_ABORT; /* fatal */
+               return;
        }
 
 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);
@@ -256,6 +286,7 @@ redo_counts:
                }
                pctx.ino = i;
                fix_problem(ctx, problem, &pctx);
+               had_problem++;
                
 do_counts:
                if (!bitmap) {
@@ -276,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,
@@ -332,8 +366,8 @@ do_counts:
                } else
                        ext2fs_unmark_valid(fs);
        }
-       free(free_array);
-       free(dir_array);
+       ext2fs_free_mem((void **) &free_array);
+       ext2fs_free_mem((void **) &dir_array);
 }
 
 static void check_inode_end(e2fsck_t ctx)
@@ -350,7 +384,8 @@ static void check_inode_end(e2fsck_t ctx)
        if (pctx.errcode) {
                pctx.num = 1;
                fix_problem(ctx, PR_5_FUDGE_BITMAP_ERROR, &pctx);
-               fatal_error(0);
+               ctx->flags |= E2F_FLAG_ABORT; /* fatal */
+               return;
        }
        if (save_inodes_count == end)
                return;
@@ -373,7 +408,8 @@ static void check_inode_end(e2fsck_t ctx)
        if (pctx.errcode) {
                pctx.num = 2;
                fix_problem(ctx, PR_5_FUDGE_BITMAP_ERROR, &pctx);
-               fatal_error(0);
+               ctx->flags |= E2F_FLAG_ABORT; /* fatal */
+               return;
        }
 }
 
@@ -392,7 +428,8 @@ static void check_block_end(e2fsck_t ctx)
        if (pctx.errcode) {
                pctx.num = 3;
                fix_problem(ctx, PR_5_FUDGE_BITMAP_ERROR, &pctx);
-               fatal_error(0);
+               ctx->flags |= E2F_FLAG_ABORT; /* fatal */
+               return;
        }
        if (save_blocks_count == end)
                return;
@@ -415,7 +452,8 @@ static void check_block_end(e2fsck_t ctx)
        if (pctx.errcode) {
                pctx.num = 4;
                fix_problem(ctx, PR_5_FUDGE_BITMAP_ERROR, &pctx);
-               fatal_error(0);
+               ctx->flags |= E2F_FLAG_ABORT; /* fatal */
+               return;
        }
 }