tests: add basic tests for dir_data feature

[tools/e2fsprogs.git] / lib / ext2fs / alloc_stats.c

diff --git a/lib/ext2fs/alloc_stats.c b/lib/ext2fs/alloc_stats.c
index 5ac5205..adec363 100644 (file)
--- a/lib/ext2fs/alloc_stats.c
+++ b/lib/ext2fs/alloc_stats.c
@@ -9,6 +9,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 
 #include "ext2_fs.h"
@@ -27,26 +28,24 @@ void ext2fs_inode_alloc_stats2(ext2_filsys fs, ext2_ino_t ino,
        }
 #endif
        if (inuse > 0)
-               ext2fs_mark_inode_bitmap(fs->inode_map, ino);
+               ext2fs_mark_inode_bitmap2(fs->inode_map, ino);
        else
-               ext2fs_unmark_inode_bitmap(fs->inode_map, ino);
-       fs->group_desc[group].bg_free_inodes_count -= inuse;
+               ext2fs_unmark_inode_bitmap2(fs->inode_map, ino);
+       ext2fs_bg_free_inodes_count_set(fs, group, ext2fs_bg_free_inodes_count(fs, group) - inuse);
        if (isdir)
-               fs->group_desc[group].bg_used_dirs_count += inuse;
+               ext2fs_bg_used_dirs_count_set(fs, group, ext2fs_bg_used_dirs_count(fs, group) + inuse);
 
        /* We don't strictly need to be clearing the uninit flag if inuse < 0
         * (i.e. freeing inodes) but it also means something is bad. */
-       fs->group_desc[group].bg_flags &= ~EXT2_BG_INODE_UNINIT;
+       ext2fs_bg_flags_clear(fs, group, EXT2_BG_INODE_UNINIT);
        if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
                                       EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
                ext2_ino_t first_unused_inode = fs->super->s_inodes_per_group -
-                       fs->group_desc[group].bg_itable_unused +
+                       ext2fs_bg_itable_unused(fs, group) +
                        group * fs->super->s_inodes_per_group + 1;
 
                if (ino >= first_unused_inode)
-                       fs->group_desc[group].bg_itable_unused =
-                               group * fs->super->s_inodes_per_group +
-                               fs->super->s_inodes_per_group - ino;
+                       ext2fs_bg_itable_unused_set(fs, group, group * fs->super->s_inodes_per_group + fs->super->s_inodes_per_group - ino);
                ext2fs_group_desc_csum_set(fs, group);
        }
 
@@ -60,32 +59,38 @@ void ext2fs_inode_alloc_stats(ext2_filsys fs, ext2_ino_t ino, int inuse)
        ext2fs_inode_alloc_stats2(fs, ino, inuse, 0);
 }
 
-void ext2fs_block_alloc_stats(ext2_filsys fs, blk_t blk, int inuse)
+void ext2fs_block_alloc_stats2(ext2_filsys fs, blk64_t blk, int inuse)
 {
-       int     group = ext2fs_group_of_blk(fs, blk);
+       int     group = ext2fs_group_of_blk2(fs, blk);
 
 #ifndef OMIT_COM_ERR
-       if (blk >= fs->super->s_blocks_count) {
+       if (blk >= ext2fs_blocks_count(fs->super)) {
                com_err("ext2fs_block_alloc_stats", 0,
                        "Illegal block number: %lu", (unsigned long) blk);
                return;
        }
 #endif
        if (inuse > 0)
-               ext2fs_mark_block_bitmap(fs->block_map, blk);
+               ext2fs_mark_block_bitmap2(fs->block_map, blk);
        else
-               ext2fs_unmark_block_bitmap(fs->block_map, blk);
-       fs->group_desc[group].bg_free_blocks_count -= inuse;
-       fs->group_desc[group].bg_flags &= ~EXT2_BG_BLOCK_UNINIT;
+               ext2fs_unmark_block_bitmap2(fs->block_map, blk);
+       ext2fs_bg_free_blocks_count_set(fs, group, ext2fs_bg_free_blocks_count(fs, group) - inuse);
+       ext2fs_bg_flags_clear(fs, group, EXT2_BG_BLOCK_UNINIT);
        ext2fs_group_desc_csum_set(fs, group);
 
-       fs->super->s_free_blocks_count -= inuse;
+       ext2fs_free_blocks_count_add(fs->super,
+                                    -inuse * EXT2FS_CLUSTER_RATIO(fs));
        ext2fs_mark_super_dirty(fs);
        ext2fs_mark_bb_dirty(fs);
        if (fs->block_alloc_stats)
                (fs->block_alloc_stats)(fs, (blk64_t) blk, inuse);
 }
 
+void ext2fs_block_alloc_stats(ext2_filsys fs, blk_t blk, int inuse)
+{
+       ext2fs_block_alloc_stats2(fs, blk, inuse);
+}
+
 void ext2fs_set_block_alloc_stats_callback(ext2_filsys fs,
                                           void (*func)(ext2_filsys fs,
                                                        blk64_t blk,