Many files:

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

diff --git a/e2fsck/pass4.c b/e2fsck/pass4.c
index 9b814b4..40bc20b 100644 (file)
--- a/e2fsck/pass4.c
+++ b/e2fsck/pass4.c
@@ -10,6 +10,7 @@
  *
  * Pass 4 frees the following data structures:
  *     - A bitmap of which inodes are in bad blocks.   (inode_bb_map)
+ *     - A bitmap of which inodes are imagic inodes.   (inode_imagic_map)
  */
 
 #include "e2fsck.h"
@@ -22,13 +23,13 @@
  * This subroutine returns 1 then the caller shouldn't bother with the
  * rest of the pass 4 tests.
  */
-static int disconnect_inode(e2fsck_t ctx, ino_t i)
+static int disconnect_inode(e2fsck_t ctx, ext2_ino_t i)
 {
        ext2_filsys fs = ctx->fs;
        struct ext2_inode       inode;
        struct problem_context  pctx;
 
-       e2fsck_read_inode(fs, i, &inode, "pass4: disconnect_inode");
+       e2fsck_read_inode(ctx, i, &inode, "pass4: disconnect_inode");
        clear_problem_context(&pctx);
        pctx.ino = i;
        pctx.inode = &inode;
@@ -42,12 +43,12 @@ static int disconnect_inode(e2fsck_t ctx, ino_t i)
                        ext2fs_icount_store(ctx->inode_link_info, i, 0);
                        inode.i_links_count = 0;
                        inode.i_dtime = time(0);
-                       e2fsck_write_inode(fs, i, &inode,
+                       e2fsck_write_inode(ctx, i, &inode,
                                           "disconnect_inode");
                        /*
                         * Fix up the bitmaps...
                         */
-                       read_bitmaps(ctx);
+                       e2fsck_read_bitmaps(ctx);
                        ext2fs_unmark_inode_bitmap(ctx->inode_used_map, i);
                        ext2fs_unmark_inode_bitmap(ctx->inode_dir_map, i);
                        ext2fs_unmark_inode_bitmap(fs->inode_map, i);
@@ -60,7 +61,7 @@ static int disconnect_inode(e2fsck_t ctx, ino_t i)
         * Prompt to reconnect.
         */
        if (fix_problem(ctx, PR_4_UNATTACHED_INODE, &pctx)) {
-               if (reconnect_file(ctx, i))
+               if (e2fsck_reconnect_file(ctx, i))
                        ext2fs_unmark_valid(fs);
        } else {
                /*
@@ -75,16 +76,17 @@ static int disconnect_inode(e2fsck_t ctx, ino_t i)
 }
 
 
-void pass4(e2fsck_t ctx)
+void e2fsck_pass4(e2fsck_t ctx)
 {
        ext2_filsys fs = ctx->fs;
-       ino_t   i;
+       ext2_ino_t      i;
        struct ext2_inode       inode;
 #ifdef RESOURCE_TRACK
        struct resource_track   rtrack;
 #endif
        struct problem_context  pctx;
        __u16   link_count, link_counted;
+       int     group, maxgroup;
        
 #ifdef RESOURCE_TRACK
        init_resource_track(&rtrack);
@@ -99,17 +101,33 @@ void pass4(e2fsck_t ctx)
        if (!(ctx->options & E2F_OPT_PREEN))
                fix_problem(ctx, PR_4_PASS_HEADER, &pctx);
 
+       group = 0;
+       maxgroup = fs->group_desc_count;
+       if (ctx->progress)
+               if ((ctx->progress)(ctx, 4, 0, maxgroup))
+                       return;
+       
        for (i=1; i <= fs->super->s_inodes_count; i++) {
+               if ((i % fs->super->s_inodes_per_group) == 0) {
+                       group++;
+                       if (ctx->progress)
+                               if ((ctx->progress)(ctx, 4, group, maxgroup))
+                                       return;
+               }
                if (i == EXT2_BAD_INO ||
                    (i > EXT2_ROOT_INO && i < EXT2_FIRST_INODE(fs->super)))
                        continue;
                if (!(ext2fs_test_inode_bitmap(ctx->inode_used_map, i)) ||
+                   (ctx->inode_imagic_map &&
+                    ext2fs_test_inode_bitmap(ctx->inode_imagic_map, i)) ||
                    (ctx->inode_bb_map &&
                     ext2fs_test_inode_bitmap(ctx->inode_bb_map, i)))
                        continue;
                ext2fs_icount_fetch(ctx->inode_link_info, i, &link_count);
                ext2fs_icount_fetch(ctx->inode_count, i, &link_counted);
                if (link_counted == 0) {
+                       if (e2fsck_process_bad_inode(ctx, 0, i))
+                               continue;
                        if (disconnect_inode(ctx, i))
                                continue;
                        ext2fs_icount_fetch(ctx->inode_link_info, i,
@@ -118,7 +136,7 @@ void pass4(e2fsck_t ctx)
                                            &link_counted);
                }
                if (link_counted != link_count) {
-                       e2fsck_read_inode(fs, i, &inode, "pass4");
+                       e2fsck_read_inode(ctx, i, &inode, "pass4");
                        pctx.ino = i;
                        pctx.inode = &inode;
                        if (link_count != inode.i_links_count) {
@@ -129,7 +147,7 @@ void pass4(e2fsck_t ctx)
                        pctx.num = link_counted;
                        if (fix_problem(ctx, PR_4_BAD_REF_COUNT, &pctx)) {
                                inode.i_links_count = link_counted;
-                               e2fsck_write_inode(fs, i, &inode, "pass4");
+                               e2fsck_write_inode(ctx, i, &inode, "pass4");
                        }
                }
        }
@@ -137,9 +155,13 @@ void pass4(e2fsck_t ctx)
        ext2fs_free_icount(ctx->inode_count); ctx->inode_count = 0;
        ext2fs_free_inode_bitmap(ctx->inode_bb_map);
        ctx->inode_bb_map = 0;
+       ext2fs_free_inode_bitmap(ctx->inode_imagic_map);
+       ctx->inode_imagic_map = 0;
 #ifdef RESOURCE_TRACK
-       if (ctx->options & E2F_OPT_TIME2)
-               print_resource_track("Pass 4", &rtrack);
+       if (ctx->options & E2F_OPT_TIME2) {
+               e2fsck_clear_progbar(ctx);
+               print_resource_track(_("Pass 4"), &rtrack);
+       }
 #endif
 }