Convert ext2fs_block_alloc_stats() calls to block_alloc_stats2()

Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
index 5142367f08333639281aecc2f11287de64d45c5d..0c8cefa5c1a9a62e9577a149b844696d0787a8e6 100644 (file)
--- a/e2fsck/pass1b.c
+++ b/e2fsck/pass1b.c
@@ -585,7 +585,7 @@ static int delete_file_block(ext2_filsys fs,
                                *block_nr);
        } else {
                ext2fs_unmark_block_bitmap2(ctx->block_found_map, *block_nr);
-               ext2fs_block_alloc_stats(fs, *block_nr, -1);
+               ext2fs_block_alloc_stats2(fs, *block_nr, -1);
        }
 
        return 0;

diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index df969caa7e86641bb00814be02759681a462dff0..1e91e6d01f255964309655406dacda8e9de3d710 100644 (file)
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -1168,7 +1168,7 @@ static int deallocate_inode_block(ext2_filsys fs,
            (*block_nr >= ext2fs_blocks_count(fs->super)))
                return 0;
        ext2fs_unmark_block_bitmap2(ctx->block_found_map, *block_nr);
-       ext2fs_block_alloc_stats(fs, *block_nr, -1);
+       ext2fs_block_alloc_stats2(fs, *block_nr, -1);
        return 0;
 }
 
@@ -1209,8 +1209,10 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf)
                }
                if (count == 0) {
                        ext2fs_unmark_block_bitmap2(ctx->block_found_map,
-                                                  ext2fs_file_acl_block(&inode));
-                       ext2fs_block_alloc_stats(fs, ext2fs_file_acl_block(&inode), -1);
+                                               ext2fs_file_acl_block(&inode));
+                       ext2fs_block_alloc_stats2(fs,
+                                               ext2fs_file_acl_block(&inode),
+                                               -1);
                }
                ext2fs_file_acl_block_set(&inode, 0);
        }

diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
index efbecee40e7772137cb8fc7f5e1269207fb7d33d..fc5374f1b63c8dfd8203a2156681da0797888b9c 100644 (file)
--- a/e2fsck/pass3.c
+++ b/e2fsck/pass3.c
@@ -416,7 +416,7 @@ ext2_ino_t e2fsck_get_lost_and_found(e2fsck_t ctx, int fix)
                return 0;
        }
        ext2fs_mark_block_bitmap2(ctx->block_found_map, blk);
-       ext2fs_block_alloc_stats(fs, blk, +1);
+       ext2fs_block_alloc_stats2(fs, blk, +1);
 
        /*
         * Next find a free inode.
@@ -738,7 +738,7 @@ static int expand_dir_proc(ext2_filsys fs,
        ext2fs_free_mem(&block);
        *blocknr = new_blk;
        ext2fs_mark_block_bitmap2(ctx->block_found_map, new_blk);
-       ext2fs_block_alloc_stats(fs, new_blk, +1);
+       ext2fs_block_alloc_stats2(fs, new_blk, +1);
        es->newblocks++;
 
        if (es->num == 0)

diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
index 2f86085bd331914eb819f2ba96e1bcb4f03785ed..bf033a90550ef718e1118e30ad51ac4562818a39 100644 (file)
--- a/e2fsck/rehash.c
+++ b/e2fsck/rehash.c
@@ -648,7 +648,7 @@ static int write_dir_block(ext2_filsys fs,
                e2fsck_read_bitmaps(wd->ctx);
                blk = *block_nr;
                ext2fs_unmark_block_bitmap2(wd->ctx->block_found_map, blk);
-               ext2fs_block_alloc_stats(fs, blk, -1);
+               ext2fs_block_alloc_stats2(fs, blk, -1);
                *block_nr = 0;
                wd->cleared++;
                return BLOCK_CHANGED;

diff --git a/e2fsck/super.c b/e2fsck/super.c
index 4c989cc93685df91b16b5854b1c6b8aa74790ad3..3ae2a41b98c6dc8381a66abe2e660579427de854 100644 (file)
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -141,7 +141,7 @@ static int release_inode_block(ext2_filsys fs,
                retval |= BLOCK_CHANGED;
        }
 
-       ext2fs_block_alloc_stats(fs, blk, -1);
+       ext2fs_block_alloc_stats2(fs, blk, -1);
        return retval;
 }
 
@@ -211,7 +211,7 @@ static int release_inode_blocks(e2fsck_t ctx, ext2_ino_t ino,
                        return 1;
                }
                if (count == 0)
-                       ext2fs_block_alloc_stats(fs,
+                       ext2fs_block_alloc_stats2(fs,
                                                 ext2fs_file_acl_block(inode),
                                                 -1);
                ext2fs_file_acl_block_set(inode, 0);

diff --git a/lib/ext2fs/bb_inode.c b/lib/ext2fs/bb_inode.c
index f5a093dc20d53b46ef0331973a4f89ed63e35639..aeae3da6d3a0c66a2cc8d45dae04ca897f09cb40 100644 (file)
--- a/lib/ext2fs/bb_inode.c
+++ b/lib/ext2fs/bb_inode.c
@@ -191,7 +191,7 @@ static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
        /*
         * Mark the block as unused, and update accounting information
         */
-       ext2fs_block_alloc_stats(fs, *block_nr, -1);
+       ext2fs_block_alloc_stats2(fs, *block_nr, -1);
 
        *block_nr = 0;
        return BLOCK_CHANGED;
@@ -254,7 +254,7 @@ static int set_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
        /*
         * Update block counts
         */
-       ext2fs_block_alloc_stats(fs, blk, +1);
+       ext2fs_block_alloc_stats2(fs, blk, +1);
 
        *block_nr = blk;
        return BLOCK_CHANGED;

diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c
index 613f7bc3a14571840461a6f22541e9eeac9fc1b9..baee5fe149de0871daa568ca0e647a854addfd3d 100644 (file)
--- a/lib/ext2fs/expanddir.c
+++ b/lib/ext2fs/expanddir.c
@@ -69,7 +69,7 @@ static int expand_dir_proc(ext2_filsys        fs,
        }
        ext2fs_free_mem(&block);
        *blocknr = new_blk;
-       ext2fs_block_alloc_stats(fs, new_blk, +1);
+       ext2fs_block_alloc_stats2(fs, new_blk, +1);
        es->newblocks++;
 
        if (es->done)

diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c
index 0b3b60c383878b68fda85c6c61f03f825b678f97..b07915d1d60056743ec22c0016dfd753e08a68d6 100644 (file)
--- a/lib/ext2fs/extent.c
+++ b/lib/ext2fs/extent.c
@@ -1507,7 +1507,8 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags)
                        handle->inode->i_blocks -= handle->fs->blocksize / 512;
                        retval = ext2fs_write_inode(handle->fs, handle->ino,
                                                    handle->inode);
-                       ext2fs_block_alloc_stats(handle->fs, extent.e_pblk, -1);
+                       ext2fs_block_alloc_stats2(handle->fs,
+                                                 extent.e_pblk, -1);
                }
        } else {
                eh = (struct ext3_extent_header *) path->buf;

diff --git a/lib/ext2fs/mkdir.c b/lib/ext2fs/mkdir.c
index 88bc6fa2cd6614c9aa7abbc069a2c52b6f197b1a..580240c38a647fbdf6ee74e681cede96c0eb73b6 100644 (file)
--- a/lib/ext2fs/mkdir.c
+++ b/lib/ext2fs/mkdir.c
@@ -128,7 +128,7 @@ errcode_t ext2fs_mkdir(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t inum,
        /*
         * Update accounting....
         */
-       ext2fs_block_alloc_stats(fs, blk, +1);
+       ext2fs_block_alloc_stats2(fs, blk, +1);
        ext2fs_inode_alloc_stats2(fs, ino, +1, 1);
 
 cleanup:

diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c
index eff177fcd9c29f9657c9c257e8f398687e3665d8..8d5bf01d13b4bb7a5cb61f3fba7034d2dda007d3 100644 (file)
--- a/lib/ext2fs/mkjournal.c
+++ b/lib/ext2fs/mkjournal.c
@@ -271,7 +271,7 @@ static int mkjournal_proc(ext2_filsys       fs,
                return BLOCK_ABORT;
        }
        *blocknr = es->goal = new_blk;
-       ext2fs_block_alloc_stats(fs, new_blk, +1);
+       ext2fs_block_alloc_stats2(fs, new_blk, +1);
 
        if (es->num_blocks == 0)
                return (BLOCK_CHANGED | BLOCK_ABORT);

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index abab8f347ce5402bd613b108e41298268a125d50..76aa51f891b40b1507a5e00690c32e25340d7cd4 100644 (file)
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -514,7 +514,7 @@ retry:
 
                has_super = ext2fs_bg_has_super(fs, i);
                if (has_super) {
-                       ext2fs_block_alloc_stats(fs, group_block, +1);
+                       ext2fs_block_alloc_stats2(fs, group_block, +1);
                        adjblocks++;
                }
                meta_bg_size = EXT2_DESC_PER_BLOCK(fs->super);
@@ -524,7 +524,7 @@ retry:
                    (meta_bg < fs->super->s_first_meta_bg)) {
                        if (has_super) {
                                for (j=0; j < old_desc_blocks; j++)
-                                       ext2fs_block_alloc_stats(fs,
+                                       ext2fs_block_alloc_stats2(fs,
                                                 group_block + 1 + j, +1);
                                adjblocks += old_desc_blocks;
                        }
@@ -534,7 +534,7 @@ retry:
                        if (((i % meta_bg_size) == 0) ||
                            ((i % meta_bg_size) == 1) ||
                            ((i % meta_bg_size) == (meta_bg_size-1)))
-                               ext2fs_block_alloc_stats(fs,
+                               ext2fs_block_alloc_stats2(fs,
                                                 group_block + has_super, +1);
                }
 
@@ -734,7 +734,7 @@ static void mark_fs_metablock(ext2_resize_t rfs,
        ext2_filsys     fs = rfs->new_fs;
 
        ext2fs_mark_block_bitmap2(rfs->reserve_blocks, blk);
-       ext2fs_block_alloc_stats(fs, blk, +1);
+       ext2fs_block_alloc_stats2(fs, blk, +1);
 
        /*
         * Check to see if we overlap with the inode or block bitmap,
@@ -860,7 +860,7 @@ static errcode_t blocks_to_move(ext2_resize_t rfs)
                        }
                        for (blk = group_blk+1+new_blocks;
                             blk < group_blk+1+old_blocks; blk++) {
-                               ext2fs_block_alloc_stats(fs, blk, -1);
+                               ext2fs_block_alloc_stats2(fs, blk, -1);
                                rfs->needed_blocks--;
                        }
                        group_blk += fs->super->s_blocks_per_group;
@@ -953,7 +953,7 @@ static errcode_t blocks_to_move(ext2_resize_t rfs)
                 */
                if (ext2fs_block_bitmap_loc(old_fs, i) !=
                    (blk = ext2fs_block_bitmap_loc(fs, i))) {
-                       ext2fs_block_alloc_stats(fs, blk, +1);
+                       ext2fs_block_alloc_stats2(fs, blk, +1);
                        if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) &&
                            !ext2fs_test_block_bitmap2(meta_bmap, blk))
                                ext2fs_mark_block_bitmap2(rfs->move_blocks,
@@ -961,7 +961,7 @@ static errcode_t blocks_to_move(ext2_resize_t rfs)
                }
                if (ext2fs_inode_bitmap_loc(old_fs, i) !=
                    (blk = ext2fs_inode_bitmap_loc(fs, i))) {
-                       ext2fs_block_alloc_stats(fs, blk, +1);
+                       ext2fs_block_alloc_stats2(fs, blk, +1);
                        if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) &&
                            !ext2fs_test_block_bitmap2(meta_bmap, blk))
                                ext2fs_mark_block_bitmap2(rfs->move_blocks,
@@ -987,7 +987,7 @@ static errcode_t blocks_to_move(ext2_resize_t rfs)
                 */
                for (blk = ext2fs_inode_table_loc(fs, i), j=0;
                     j < fs->inode_blocks_per_group ; j++, blk++) {
-                       ext2fs_block_alloc_stats(fs, blk, +1);
+                       ext2fs_block_alloc_stats2(fs, blk, +1);
                        if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) &&
                            !ext2fs_test_block_bitmap2(meta_bmap, blk))
                                ext2fs_mark_block_bitmap2(rfs->move_blocks,
@@ -1149,7 +1149,7 @@ static errcode_t block_mover(ext2_resize_t rfs)
                        retval = ENOSPC;
                        goto errout;
                }
-               ext2fs_block_alloc_stats(fs, new_blk, +1);
+               ext2fs_block_alloc_stats2(fs, new_blk, +1);
                ext2fs_add_extent_entry(rfs->bmap, blk, new_blk);
                to_move++;
        }
@@ -1678,7 +1678,7 @@ static errcode_t move_itables(ext2_resize_t rfs)
 
                for (blk = ext2fs_inode_table_loc(rfs->old_fs, i), j=0;
                     j < fs->inode_blocks_per_group ; j++, blk++)
-                       ext2fs_block_alloc_stats(fs, blk, -1);
+                       ext2fs_block_alloc_stats2(fs, blk, -1);
 
                ext2fs_inode_table_loc_set(rfs->old_fs, i, new_blk);
                ext2fs_group_desc_csum_set(rfs->old_fs, i);
@@ -1730,7 +1730,7 @@ static errcode_t fix_resize_inode(ext2_filsys fs)
                ext2fs_mark_super_dirty(fs);
 
                if ((blk = inode.i_block[EXT2_DIND_BLOCK]) != 0)
-                       ext2fs_block_alloc_stats(fs, blk, -1);
+                       ext2fs_block_alloc_stats2(fs, blk, -1);
 
                memset(&inode, 0, sizeof(inode));