libext2fs: allocate clusters to files in expand_dir.c and mkjournal.c

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

diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
index 89416ca..f8c8a9f 100644 (file)
--- a/lib/ext2fs/rw_bitmaps.c
+++ b/lib/ext2fs/rw_bitmaps.c
@@ -37,7 +37,7 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
        char            *block_buf, *inode_buf;
        int             csum_flag = 0;
        blk64_t         blk;
-       blk64_t         blk_itr = fs->super->s_first_data_block;
+       blk64_t         blk_itr = EXT2FS_B2C(fs, fs->super->s_first_data_block);
        ext2_ino_t      ino_itr = 1;
 
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
@@ -51,8 +51,9 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
 
        inode_nbytes = block_nbytes = 0;
        if (do_block) {
-               block_nbytes = EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
-               retval = ext2fs_get_mem(fs->blocksize, &block_buf);
+               block_nbytes = EXT2_CLUSTERS_PER_GROUP(fs->super) / 8;
+               retval = ext2fs_get_memalign(fs->blocksize, fs->blocksize,
+                                            &block_buf);
                if (retval)
                        return retval;
                memset(block_buf, 0xff, fs->blocksize);
@@ -60,7 +61,8 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
        if (do_inode) {
                inode_nbytes = (size_t)
                        ((EXT2_INODES_PER_GROUP(fs->super)+7) / 8);
-               retval = ext2fs_get_mem(fs->blocksize, &inode_buf);
+               retval = ext2fs_get_memalign(fs->blocksize, fs->blocksize,
+                                            &inode_buf);
                if (retval)
                        return retval;
                memset(inode_buf, 0xff, fs->blocksize);
@@ -81,9 +83,10 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
 
                if (i == fs->group_desc_count - 1) {
                        /* Force bitmap padding for the last group */
-                       nbits = ((ext2fs_blocks_count(fs->super)
+                       nbits = EXT2FS_NUM_B2C(fs,
+                               ((ext2fs_blocks_count(fs->super)
                                  - (__u64) fs->super->s_first_data_block)
-                                % (__u64) EXT2_BLOCKS_PER_GROUP(fs->super));
+                                % (__u64) EXT2_BLOCKS_PER_GROUP(fs->super)));
                        if (nbits)
                                for (j = nbits; j < fs->blocksize * 8; j++)
                                        ext2fs_set_bit(j, block_buf);
@@ -139,13 +142,13 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
        char *block_bitmap = 0, *inode_bitmap = 0;
        char *buf;
        errcode_t retval;
-       int block_nbytes = EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
+       int block_nbytes = EXT2_CLUSTERS_PER_GROUP(fs->super) / 8;
        int inode_nbytes = EXT2_INODES_PER_GROUP(fs->super) / 8;
        int csum_flag = 0;
        int do_image = fs->flags & EXT2_FLAG_IMAGE_FILE;
        unsigned int    cnt;
        blk64_t blk;
-       blk64_t blk_itr = fs->super->s_first_data_block;
+       blk64_t blk_itr = EXT2FS_B2C(fs, fs->super->s_first_data_block);
        blk64_t   blk_cnt;
        ext2_ino_t ino_itr = 1;
        ext2_ino_t ino_cnt;
@@ -169,8 +172,13 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
                retval = ext2fs_allocate_block_bitmap(fs, buf, &fs->block_map);
                if (retval)
                        goto cleanup;
-               retval = ext2fs_get_mem(do_image ? fs->blocksize :
-                                       (unsigned) block_nbytes, &block_bitmap);
+               if (do_image)
+                       retval = ext2fs_get_mem(fs->blocksize, &block_bitmap);
+               else
+                       retval = ext2fs_get_memalign((unsigned) block_nbytes,
+                                                    fs->blocksize,
+                                                    &block_bitmap);
+                       
                if (retval)
                        goto cleanup;
        } else
@@ -212,7 +220,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
                }
                blk = (fs->image_header->offset_blockmap /
                       fs->blocksize);
-               blk_cnt = (blk64_t)EXT2_BLOCKS_PER_GROUP(fs->super) *
+               blk_cnt = (blk64_t)EXT2_CLUSTERS_PER_GROUP(fs->super) *
                        fs->group_desc_count;
                while (block_nbytes > 0) {
                        retval = io_channel_read_blk64(fs->image_io, blk++,