Merge branch 'maint' into next

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

diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
index 8100909..c1d45a5 100644 (file)
--- a/e2fsck/pass5.c
+++ b/e2fsck/pass5.c
@@ -842,7 +842,7 @@ static void check_inode_end(e2fsck_t ctx)
 
        clear_problem_context(&pctx);
 
-       end = EXT2_INODES_PER_GROUP(fs->super) * fs->group_desc_count;
+       end = (__u64)EXT2_INODES_PER_GROUP(fs->super) * fs->group_desc_count;
        pctx.errcode = ext2fs_fudge_inode_bitmap_end(fs->inode_map, end,
                                                     &save_inodes_count);
        if (pctx.errcode) {
@@ -886,11 +886,12 @@ static void check_inode_end(e2fsck_t ctx)
         * be written back to disk.
         */
 check_intra_bg_tail:
-       if (!asked && fs->flags & EXT2_FLAG_IBITMAP_TAIL_PROBLEM)
+       if (!asked && fs->flags & EXT2_FLAG_IBITMAP_TAIL_PROBLEM) {
                if (fix_problem(ctx, PR_5_INODE_BMAP_PADDING, &pctx))
                        ext2fs_mark_ib_dirty(fs);
                else
                        ext2fs_unmark_valid(fs);
+       }
 }
 
 static void check_block_end(e2fsck_t ctx)