ext2fs: move calculate_summary_stats to ext2fs lib

The function calculate_summary_stats sets the global metadata of the
file system. Tune2fs had this function defined statically in
tune2fs.c. Fast commit replay needs this function to set global
metadata at the end of the replay phase. So, move this function to
libext2fs.

Signed-off-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com>
Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 82ce91264af5d69ab3fb28eca4ab69b8300ea5de..b61c8ddee21e614071323aaa69f13d578216e4f5 100644 (file)
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -1493,6 +1493,7 @@ errcode_t ext2fs_write_ind_block(ext2_filsys fs, blk_t blk, void *buf);
 extern errcode_t ext2fs_initialize(const char *name, int flags,
                                   struct ext2_super_block *param,
                                   io_manager manager, ext2_filsys *ret_fs);
+extern errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs, int super_only);
 
 /* icount.c */
 extern void ext2fs_free_icount(ext2_icount_t icount);

diff --git a/lib/ext2fs/initialize.c b/lib/ext2fs/initialize.c
index 96ec1cffd82c8faac95e191f9a79f76e5fbc8bcd..edd692bb9d49cc2adaa1304034d9703011c59f8e 100644 (file)
--- a/lib/ext2fs/initialize.c
+++ b/lib/ext2fs/initialize.c
@@ -575,3 +575,97 @@ cleanup:
        ext2fs_free(fs);
        return retval;
 }
+
+errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs, int super_only)
+{
+       blk64_t         blk;
+       ext2_ino_t      ino;
+       unsigned int    group = 0;
+       unsigned int    count = 0;
+       int             total_free = 0;
+       int             group_free = 0;
+       int             last_allocated = 0;
+       int             uninit;
+
+       /*
+        * First calculate the block statistics
+        */
+       uninit = 1;
+       for (blk = fs->super->s_first_data_block;
+            blk < ext2fs_blocks_count(fs->super); blk++) {
+               if (!ext2fs_fast_test_block_bitmap2(fs->block_map, blk)) {
+                       group_free++;
+                       total_free++;
+               } else {
+                       uninit = 0;
+               }
+               count++;
+               if ((count == fs->super->s_blocks_per_group) ||
+                   (blk == ext2fs_blocks_count(fs->super)-1)) {
+                       ext2fs_bg_free_blocks_count_set(fs, group,
+                                                       group_free);
+                       if (!super_only) {
+                               if (uninit && blk !=
+                                       ext2fs_blocks_count(fs->super) - 1)
+                                       ext2fs_bg_flags_set(fs, group,
+                                                       EXT2_BG_BLOCK_UNINIT);
+                               else
+                                       ext2fs_bg_flags_clear(fs, group,
+                                                       EXT2_BG_BLOCK_UNINIT);
+                       }
+                       count = 0;
+                       group_free = 0;
+                       uninit = 1;
+                       group++;
+               }
+       }
+       total_free = EXT2FS_C2B(fs, total_free);
+       ext2fs_free_blocks_count_set(fs->super, total_free);
+
+       /*
+        * Next, calculate the inode statistics
+        */
+       group_free = 0;
+       total_free = 0;
+       last_allocated = 0;
+       count = 0;
+       group = 0;
+
+       /* Protect loop from wrap-around if s_inodes_count maxed */
+       for (ino = 1; ino <= fs->super->s_inodes_count && ino > 0; ino++) {
+               if (!ext2fs_test_inode_bitmap2(fs->inode_map, ino)) {
+                       group_free++;
+                       total_free++;
+               } else {
+                       last_allocated = ino;
+               }
+               count++;
+               if ((count == fs->super->s_inodes_per_group) ||
+                   (ino == fs->super->s_inodes_count)) {
+                       if (!super_only) {
+                               if (last_allocated) {
+                                       ext2fs_bg_flags_clear(fs, group,
+                                               EXT2_BG_INODE_UNINIT);
+                                       ext2fs_bg_itable_unused_set(fs, group,
+                                               fs->super->s_inodes_per_group -
+                                               (last_allocated %
+                                               fs->super->s_inodes_per_group));
+                               } else {
+                                       ext2fs_bg_flags_set(fs, group,
+                                               EXT2_BG_INODE_UNINIT);
+                                       ext2fs_bg_itable_unused_set(fs, group,
+                                                                       0);
+                               }
+                               ext2fs_bg_free_inodes_count_set(fs, group,
+                                                               group_free);
+                       }
+                       group++;
+                       count = 0;
+                       group_free = 0;
+                       last_allocated = 0;
+               }
+       }
+       fs->super->s_free_inodes_count = total_free;
+       ext2fs_mark_super_dirty(fs);
+       return 0;
+}

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index e5186fe0ca480a237eb6fff2e37313e5df38ed78..69ee578ce1cdde2cac86f551eece7777a379aca4 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -2603,63 +2603,6 @@ err_out:
        return retval;
 }
 
-static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
-{
-       blk64_t         blk;
-       ext2_ino_t      ino;
-       unsigned int    group = 0;
-       unsigned int    count = 0;
-       int             total_free = 0;
-       int             group_free = 0;
-
-       /*
-        * First calculate the block statistics
-        */
-       for (blk = fs->super->s_first_data_block;
-            blk < ext2fs_blocks_count(fs->super); blk++) {
-               if (!ext2fs_fast_test_block_bitmap2(fs->block_map, blk)) {
-                       group_free++;
-                       total_free++;
-               }
-               count++;
-               if ((count == fs->super->s_blocks_per_group) ||
-                   (blk == ext2fs_blocks_count(fs->super)-1)) {
-                       ext2fs_bg_free_blocks_count_set(fs, group++,
-                                                       group_free);
-                       count = 0;
-                       group_free = 0;
-               }
-       }
-       total_free = EXT2FS_C2B(fs, total_free);
-       ext2fs_free_blocks_count_set(fs->super, total_free);
-
-       /*
-        * Next, calculate the inode statistics
-        */
-       group_free = 0;
-       total_free = 0;
-       count = 0;
-       group = 0;
-
-       /* Protect loop from wrap-around if s_inodes_count maxed */
-       for (ino = 1; ino <= fs->super->s_inodes_count && ino > 0; ino++) {
-               if (!ext2fs_fast_test_inode_bitmap2(fs->inode_map, ino)) {
-                       group_free++;
-                       total_free++;
-               }
-               count++;
-               if ((count == fs->super->s_inodes_per_group) ||
-                   (ino == fs->super->s_inodes_count)) {
-                       ext2fs_bg_free_inodes_count_set(fs, group++,
-                                                       group_free);
-                       count = 0;
-                       group_free = 0;
-               }
-       }
-       fs->super->s_free_inodes_count = total_free;
-       ext2fs_mark_super_dirty(fs);
-       return 0;
-}
 
 #define list_for_each_safe(pos, pnext, head) \
        for (pos = (head)->next, pnext = pos->next; pos != (head); \
@@ -2738,7 +2681,7 @@ static int resize_inode(ext2_filsys fs, unsigned long new_size)
        if (retval)
                goto err_out_undo;
 
-       ext2fs_calculate_summary_stats(fs);
+       ext2fs_calculate_summary_stats(fs, 1 /* super only */);
 
        fs->super->s_state |= EXT2_VALID_FS;
        /* mark super block and block bitmap as dirty */

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 2443ff676c652661f8ed1d35855a483febb018ca..270e4deb509dce3d59e63b7359e07ee4fdaeb1ed 100644 (file)
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -49,7 +49,7 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs);
 static errcode_t inode_ref_fix(ext2_resize_t rfs);
 static errcode_t move_itables(ext2_resize_t rfs);
 static errcode_t fix_resize_inode(ext2_filsys fs);
-static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs);
+static errcode_t resize2fs_calculate_summary_stats(ext2_filsys fs);
 static errcode_t fix_sb_journal_backup(ext2_filsys fs);
 static errcode_t mark_table_blocks(ext2_filsys fs,
                                   ext2fs_block_bitmap bmap);
@@ -211,7 +211,7 @@ errcode_t resize_fs(ext2_filsys fs, blk64_t *new_size, int flags,
                goto errout;
 
        init_resource_track(&rtrack, "calculate_summary_stats", fs->io);
-       retval = ext2fs_calculate_summary_stats(rfs->new_fs);
+       retval = resize2fs_calculate_summary_stats(rfs->new_fs);
        if (retval)
                goto errout;
        print_resource_track(rfs, &rtrack, fs->io);
@@ -2740,7 +2740,7 @@ errout:
 /*
  * Finally, recalculate the summary information
  */
-static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
+static errcode_t resize2fs_calculate_summary_stats(ext2_filsys fs)
 {
        blk64_t         blk;
        ext2_ino_t      ino;