e2fsck: update global free blocks/inodes count when truncating orphan inodes

By the time we start processing the orphan inode list, we have already
calculated the total expected number of free blocks and inodes in
ctx->free_{blocks,inodes}.  This is used to set the free blocks/inodes
count in the superblock in the case where we don't need to do a full
e2fsck.

We need to update these expected free block counts as we process the
orphan inode list so that superblock values are set correctly.
Otherwise we could have the following happen:

% e2fsck /tmp/test.img
e2fsck 1.42.3 (14-May-2012)
Truncating orphaned inode 12 (uid=0, gid=0, mode=0100644, size=0)
Setting free blocks count to 46 (was 79)
/tmp/test.img: clean, 12/16 files, 54/100 blocks

% e2fsck /tmp/test.img
e2fsck 1.42.3 (14-May-2012)
Setting free blocks count to 79 (was 46)
/tmp/test.img: clean, 12/16 files, 21/100 blocks

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/e2fsck/super.c b/e2fsck/super.c
index 6c18d0e..160991d 100644 (file)
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -143,6 +143,7 @@ static int release_inode_block(ext2_filsys fs,
        }
 
        ext2fs_block_alloc_stats2(fs, blk, -1);
+       ctx->free_blocks++;
        return retval;
 }
 
@@ -211,9 +212,11 @@ static int release_inode_blocks(e2fsck_t ctx, ext2_ino_t ino,
                                ino);
                        return 1;
                }
-               if (count == 0)
+               if (count == 0) {
                        ext2fs_block_alloc_stats2(fs,
                                        ext2fs_file_acl_block(fs, inode), -1);
+                       ctx->free_blocks++;
+               }
                ext2fs_file_acl_block_set(fs, inode, 0);
        }
        return 0;
@@ -286,6 +289,7 @@ static int release_orphan_inodes(e2fsck_t ctx)
                if (!inode.i_links_count) {
                        ext2fs_inode_alloc_stats2(fs, ino, -1,
                                                  LINUX_S_ISDIR(inode.i_mode));
+                       ctx->free_inodes++;
                        inode.i_dtime = ctx->now;
                } else {
                        inode.i_dtime = 0;