Change the xattr entry hash to use an unsighed char by default

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

diff --git a/lib/ext2fs/alloc_stats.c b/lib/ext2fs/alloc_stats.c
index 5048787..6f98bcc 100644 (file)
--- a/lib/ext2fs/alloc_stats.c
+++ b/lib/ext2fs/alloc_stats.c
@@ -4,12 +4,12 @@
  * Copyright (C) 2001 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
- *
  */
 
+#include "config.h"
 #include <stdio.h>
 
 #include "ext2_fs.h"
@@ -20,34 +20,31 @@ void ext2fs_inode_alloc_stats2(ext2_filsys fs, ext2_ino_t ino,
 {
        int     group = ext2fs_group_of_ino(fs, ino);
 
-#ifndef OMIT_COM_ERR
        if (ino > fs->super->s_inodes_count) {
+#ifndef OMIT_COM_ERR
                com_err("ext2fs_inode_alloc_stats2", 0,
                        "Illegal inode number: %lu", (unsigned long) ino);
+#endif
                return;
        }
-#endif
        if (inuse > 0)
                ext2fs_mark_inode_bitmap2(fs->inode_map, ino);
        else
                ext2fs_unmark_inode_bitmap2(fs->inode_map, ino);
-       fs->group_desc[group].bg_free_inodes_count -= inuse;
+       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;
-       if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
-                                      EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
+       ext2fs_bg_flags_clear(fs, group, EXT2_BG_INODE_UNINIT);
+       if (ext2fs_has_group_desc_csum(fs)) {
                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);
        }
 
@@ -65,22 +62,24 @@ void ext2fs_block_alloc_stats2(ext2_filsys fs, blk64_t blk, int inuse)
 {
        int     group = ext2fs_group_of_blk2(fs, blk);
 
+       if (blk < fs->super->s_first_data_block ||
+           blk >= ext2fs_blocks_count(fs->super)) {
 #ifndef OMIT_COM_ERR
-       if (blk >= fs->super->s_blocks_count) {
                com_err("ext2fs_block_alloc_stats", 0,
                        "Illegal block number: %lu", (unsigned long) blk);
+#endif
                return;
        }
-#endif
        if (inuse > 0)
                ext2fs_mark_block_bitmap2(fs->block_map, blk);
        else
                ext2fs_unmark_block_bitmap2(fs->block_map, blk);
-       fs->group_desc[group].bg_free_blocks_count -= inuse;
-       fs->group_desc[group].bg_flags &= ~EXT2_BG_BLOCK_UNINIT;
+       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);
 
-       ext2fs_free_blocks_count_add(fs->super, -inuse);
+       ext2fs_free_blocks_count_add(fs->super,
+                            -inuse * (blk64_t) EXT2FS_CLUSTER_RATIO(fs));
        ext2fs_mark_super_dirty(fs);
        ext2fs_mark_bb_dirty(fs);
        if (fs->block_alloc_stats)
@@ -107,3 +106,60 @@ void ext2fs_set_block_alloc_stats_callback(ext2_filsys fs,
 
        fs->block_alloc_stats = func;
 }
+
+void ext2fs_block_alloc_stats_range(ext2_filsys fs, blk64_t blk,
+                                   blk_t num, int inuse)
+{
+#ifndef OMIT_COM_ERR
+       if (blk + num > ext2fs_blocks_count(fs->super)) {
+               com_err("ext2fs_block_alloc_stats_range", 0,
+                       "Illegal block range: %llu (%u) ",
+                       (unsigned long long) blk, num);
+               return;
+       }
+#endif
+       if (inuse == 0)
+               return;
+       if (inuse > 0) {
+               ext2fs_mark_block_bitmap_range2(fs->block_map, blk, num);
+               inuse = 1;
+       } else {
+               ext2fs_unmark_block_bitmap_range2(fs->block_map, blk, num);
+               inuse = -1;
+       }
+       while (num) {
+               int group = ext2fs_group_of_blk2(fs, blk);
+               blk64_t last_blk = ext2fs_group_last_block2(fs, group);
+               blk64_t n = num;
+
+               if (blk + num > last_blk)
+                       n = last_blk - blk + 1;
+
+               ext2fs_bg_free_blocks_count_set(fs, group,
+                       ext2fs_bg_free_blocks_count(fs, group) -
+                       inuse*n/EXT2FS_CLUSTER_RATIO(fs));
+               ext2fs_bg_flags_clear(fs, group, EXT2_BG_BLOCK_UNINIT);
+               ext2fs_group_desc_csum_set(fs, group);
+               ext2fs_free_blocks_count_add(fs->super, -inuse * (blk64_t) n);
+               blk += n;
+               num -= n;
+       }
+       ext2fs_mark_super_dirty(fs);
+       ext2fs_mark_bb_dirty(fs);
+       if (fs->block_alloc_stats_range)
+               (fs->block_alloc_stats_range)(fs, blk, num, inuse);
+}
+
+void ext2fs_set_block_alloc_stats_range_callback(ext2_filsys fs,
+       void (*func)(ext2_filsys fs, blk64_t blk,
+                                   blk_t num, int inuse),
+       void (**old)(ext2_filsys fs, blk64_t blk,
+                                   blk_t num, int inuse))
+{
+       if (!fs || fs->magic != EXT2_ET_MAGIC_EXT2FS_FILSYS)
+               return;
+       if (old)
+               *old = fs->block_alloc_stats_range;
+
+       fs->block_alloc_stats_range = func;
+}