Merge branch 'maint' into next

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

diff --git a/e2fsck/pass4.c b/e2fsck/pass4.c
index 515cb84..695612b 100644 (file)
--- a/e2fsck/pass4.c
+++ b/e2fsck/pass4.c
@@ -121,7 +121,7 @@ void e2fsck_pass4(e2fsck_t ctx)
 
        /* Protect loop from wrap-around if s_inodes_count maxed */
        for (i=1; i <= fs->super->s_inodes_count && i > 0; i++) {
-               int isdir = ext2fs_test_inode_bitmap(ctx->inode_dir_map, i);
+               int isdir = ext2fs_test_inode_bitmap2(ctx->inode_dir_map, i);
 
                if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
                        goto errout;
@@ -134,11 +134,11 @@ void e2fsck_pass4(e2fsck_t ctx)
                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)) ||
+               if (!(ext2fs_test_inode_bitmap2(ctx->inode_used_map, i)) ||
                    (ctx->inode_imagic_map &&
-                    ext2fs_test_inode_bitmap(ctx->inode_imagic_map, i)) ||
+                    ext2fs_test_inode_bitmap2(ctx->inode_imagic_map, i)) ||
                    (ctx->inode_bb_map &&
-                    ext2fs_test_inode_bitmap(ctx->inode_bb_map, i)))
+                    ext2fs_test_inode_bitmap2(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);