Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface

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

diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index 64fd9d41445d98eb3a79c75cbc34d133b8bd93a9..b966b4d50667498fe39e1bf37857b6741691d59f 100644 (file)
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -225,7 +225,7 @@ static void list_desc (ext2_filsys fs)
                                fs->group_desc[i].bg_itable_unused);
                if (block_bitmap) {
                        fputs(_("  Free blocks: "), stdout);
-                       ext2fs_get_block_bitmap_range(fs->block_map,
+                       ext2fs_get_block_bitmap_range2(fs->block_map,
                                 blk_itr, block_nbytes << 3, block_bitmap);
                        print_free (i, block_bitmap,
                                    fs->super->s_blocks_per_group,
@@ -235,7 +235,7 @@ static void list_desc (ext2_filsys fs)
                }
                if (inode_bitmap) {
                        fputs(_("  Free inodes: "), stdout);
-                       ext2fs_get_inode_bitmap_range(fs->inode_map,
+                       ext2fs_get_inode_bitmap_range2(fs->inode_map,
                                 ino_itr, inode_nbytes << 3, inode_bitmap);
                        print_free (i, inode_bitmap,
                                    fs->super->s_inodes_per_group, 1);

diff --git a/misc/e2freefrag.c b/misc/e2freefrag.c
index a4ab9948f2ba9b6a2218d86f907be8dd93231414..7e6abe1d4bf969ef06984b025f11a7ffdff2b916 100644 (file)
--- a/misc/e2freefrag.c
+++ b/misc/e2freefrag.c
@@ -119,7 +119,7 @@ void scan_block_bitmap(ext2_filsys fs, struct chunk_info *info)
                                blk = fs->super->s_first_data_block;
                                chunk_start_blk = blk;
                        }
-                       used = ext2fs_fast_test_block_bitmap(fs->block_map,
+                       used = ext2fs_fast_test_block_bitmap2(fs->block_map,
                                                             chunk_start_blk);
                        if (!used) {
                                last_chunk_size++;

diff --git a/misc/e2image.c b/misc/e2image.c
index 83c1cca93ba33131418125c1e5ecff012c6357cd..7abce296cbed440c9403f2661f31ff74d991703a 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -225,9 +225,9 @@ static int process_dir_block(ext2_filsys fs EXT2FS_ATTR((unused)),
 
        p = (struct process_block_struct *) priv_data;
 
-       ext2fs_mark_block_bitmap(meta_block_map, *block_nr);
+       ext2fs_mark_block_bitmap2(meta_block_map, *block_nr);
        if (scramble_block_map && p->is_dir && blockcnt >= 0)
-               ext2fs_mark_block_bitmap(scramble_block_map, *block_nr);
+               ext2fs_mark_block_bitmap2(scramble_block_map, *block_nr);
        return 0;
 }
 
@@ -239,7 +239,7 @@ static int process_file_block(ext2_filsys fs EXT2FS_ATTR((unused)),
                              void *priv_data EXT2FS_ATTR((unused)))
 {
        if (blockcnt < 0) {
-               ext2fs_mark_block_bitmap(meta_block_map, *block_nr);
+               ext2fs_mark_block_bitmap2(meta_block_map, *block_nr);
        }
        return 0;
 }
@@ -253,13 +253,13 @@ static void mark_table_blocks(ext2_filsys fs)
        /*
         * Mark primary superblock
         */
-       ext2fs_mark_block_bitmap(meta_block_map, first_block);
+       ext2fs_mark_block_bitmap2(meta_block_map, first_block);
 
        /*
         * Mark the primary superblock descriptors
         */
        for (j = 0; j < fs->desc_blocks; j++) {
-               ext2fs_mark_block_bitmap(meta_block_map,
+               ext2fs_mark_block_bitmap2(meta_block_map,
                         ext2fs_descriptor_block_loc(fs, first_block, j));
        }
 
@@ -271,14 +271,14 @@ static void mark_table_blocks(ext2_filsys fs)
                        for (j = 0, b = fs->group_desc[i].bg_inode_table;
                             j < (unsigned) fs->inode_blocks_per_group;
                             j++, b++)
-                               ext2fs_mark_block_bitmap(meta_block_map, b);
+                               ext2fs_mark_block_bitmap2(meta_block_map, b);
                }
 
                /*
                 * Mark block used for the block bitmap
                 */
                if (fs->group_desc[i].bg_block_bitmap) {
-                       ext2fs_mark_block_bitmap(meta_block_map,
+                       ext2fs_mark_block_bitmap2(meta_block_map,
                                     fs->group_desc[i].bg_block_bitmap);
                }
 
@@ -286,7 +286,7 @@ static void mark_table_blocks(ext2_filsys fs)
                 * Mark block used for the inode bitmap
                 */
                if (fs->group_desc[i].bg_inode_bitmap) {
-                       ext2fs_mark_block_bitmap(meta_block_map,
+                       ext2fs_mark_block_bitmap2(meta_block_map,
                                 fs->group_desc[i].bg_inode_bitmap);
                }
        }
@@ -423,14 +423,14 @@ static void output_meta_data_blocks(ext2_filsys fs, int fd)
        memset(zero_buf, 0, fs->blocksize);
        for (blk = 0; blk < fs->super->s_blocks_count; blk++) {
                if ((blk >= fs->super->s_first_data_block) &&
-                   ext2fs_test_block_bitmap(meta_block_map, blk)) {
+                   ext2fs_test_block_bitmap2(meta_block_map, blk)) {
                        retval = io_channel_read_blk(fs->io, blk, 1, buf);
                        if (retval) {
                                com_err(program_name, retval,
                                        "error reading block %u", blk);
                        }
                        if (scramble_block_map &&
-                           ext2fs_test_block_bitmap(scramble_block_map, blk))
+                           ext2fs_test_block_bitmap2(scramble_block_map, blk))
                                scramble_dir_block(fs, blk, buf);
                        if ((fd != 1) && check_zero_block(buf, fs->blocksize))
                                goto sparse_write;
@@ -512,7 +512,7 @@ static void write_raw_image_file(ext2_filsys fs, int fd, int scramble_flag)
                if (!inode.i_links_count)
                        continue;
                if (inode.i_file_acl) {
-                       ext2fs_mark_block_bitmap(meta_block_map,
+                       ext2fs_mark_block_bitmap2(meta_block_map,
                                                 inode.i_file_acl);
                }
                if (!ext2fs_inode_has_valid_blocks(&inode))

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 41a063826659f0ba0a024f1bc9da45c252d0e4c2..ef4861fe421dd6878a854ca7453504f5eee6faba 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -258,7 +258,7 @@ static int release_blocks_proc(ext2_filsys fs, blk_t *blocknr,
        int     group;
 
        block = *blocknr;
-       ext2fs_unmark_block_bitmap(fs->block_map, block);
+       ext2fs_unmark_block_bitmap2(fs->block_map, block);
        group = ext2fs_group_of_blk(fs, block);
        fs->group_desc[group].bg_free_blocks_count++;
        ext2fs_group_desc_csum_set(fs, group);
@@ -986,7 +986,7 @@ static int get_move_bitmaps(ext2_filsys fs, int new_ino_blks_per_grp,
                                        new_ino_blks_per_grp;
 
                for (j = start_blk; j < end_blk; j++) {
-                       if (ext2fs_test_block_bitmap(fs->block_map, j)) {
+                       if (ext2fs_test_block_bitmap2(fs->block_map, j)) {
                                /*
                                 * IF the block is a bad block we fail
                                 */
@@ -995,13 +995,13 @@ static int get_move_bitmaps(ext2_filsys fs, int new_ino_blks_per_grp,
                                        return ENOSPC;
                                }
 
-                               ext2fs_mark_block_bitmap(bmap, j);
+                               ext2fs_mark_block_bitmap2(bmap, j);
                        } else {
                                /*
                                 * We are going to use this block for
                                 * inode table. So mark them used.
                                 */
-                               ext2fs_mark_block_bitmap(fs->block_map, j);
+                               ext2fs_mark_block_bitmap2(fs->block_map, j);
                        }
                }
                needed_blocks += end_blk - start_blk;
@@ -1056,7 +1056,7 @@ static int move_block(ext2_filsys fs, ext2fs_block_bitmap bmap)
 
        for (new_blk = blk = fs->super->s_first_data_block;
             blk < fs->super->s_blocks_count; blk++) {
-               if (!ext2fs_test_block_bitmap(bmap, blk))
+               if (!ext2fs_test_block_bitmap2(bmap, blk))
                        continue;
 
                if (ext2fs_is_meta_block(fs, blk)) {
@@ -1085,7 +1085,7 @@ static int move_block(ext2_filsys fs, ext2fs_block_bitmap bmap)
                }
 
                /* Mark this block as allocated */
-               ext2fs_mark_block_bitmap(fs->block_map, new_blk);
+               ext2fs_mark_block_bitmap2(fs->block_map, new_blk);
 
                /* Add it to block move list */
                retval = ext2fs_get_mem(sizeof(struct blk_move), &bmv);
@@ -1136,7 +1136,7 @@ static int process_block(ext2_filsys fs EXT2FS_ATTR((unused)),
        blk_t new_blk;
        ext2fs_block_bitmap bmap = (ext2fs_block_bitmap) priv_data;
 
-       if (!ext2fs_test_block_bitmap(bmap, *block_nr))
+       if (!ext2fs_test_block_bitmap2(bmap, *block_nr))
                return 0;
        new_blk = translate_block(*block_nr);
        if (new_blk) {
@@ -1186,7 +1186,7 @@ static int inode_scan_and_fix(ext2_filsys fs, ext2fs_block_bitmap bmap)
                 */
 
                if (inode.i_file_acl &&
-                   ext2fs_test_block_bitmap(bmap, inode.i_file_acl)) {
+                   ext2fs_test_block_bitmap2(bmap, inode.i_file_acl)) {
                        blk = translate_block(inode.i_file_acl);
                        if (!blk)
                                continue;
@@ -1230,7 +1230,7 @@ static int group_desc_scan_and_fix(ext2_filsys fs, ext2fs_block_bitmap bmap)
 
        for (i = 0; i < fs->group_desc_count; i++) {
                blk = fs->group_desc[i].bg_block_bitmap;
-               if (ext2fs_test_block_bitmap(bmap, blk)) {
+               if (ext2fs_test_block_bitmap2(bmap, blk)) {
                        new_blk = translate_block(blk);
                        if (!new_blk)
                                continue;
@@ -1238,7 +1238,7 @@ static int group_desc_scan_and_fix(ext2_filsys fs, ext2fs_block_bitmap bmap)
                }
 
                blk = fs->group_desc[i].bg_inode_bitmap;
-               if (ext2fs_test_block_bitmap(bmap, blk)) {
+               if (ext2fs_test_block_bitmap2(bmap, blk)) {
                        new_blk = translate_block(blk);
                        if (!new_blk)
                                continue;
@@ -1336,7 +1336,7 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
         */
        for (blk = fs->super->s_first_data_block;
             blk < fs->super->s_blocks_count; blk++) {
-               if (!ext2fs_fast_test_block_bitmap(fs->block_map, blk)) {
+               if (!ext2fs_fast_test_block_bitmap2(fs->block_map, blk)) {
                        group_free++;
                        total_free++;
                }
@@ -1361,7 +1361,7 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
 
        /* 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_bitmap(fs->inode_map, ino)) {
+               if (!ext2fs_fast_test_inode_bitmap2(fs->inode_map, ino)) {
                        group_free++;
                        total_free++;
                }