Merge branch 'maint' into next

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

diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
index 2086331..0f97704 100644 (file)
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@ -80,7 +80,7 @@ int ext2fs_super_and_bgd_loc(ext2_filsys fs,
                super_blk = group_block;
                numblocks--;
        }
-       meta_bg_size = (fs->blocksize / sizeof (struct ext2_group_desc));
+       meta_bg_size = EXT2_DESC_PER_BLOCK(fs->super);
        meta_bg = group / meta_bg_size;
 
        if (!(fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) ||
@@ -223,8 +223,8 @@ errcode_t ext2fs_flush(ext2_filsys fs)
        retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &super_shadow);
        if (retval)
                goto errout;
-       retval = ext2fs_get_mem((size_t)(fs->blocksize * fs->desc_blocks),
-                               &group_shadow);
+       retval = ext2fs_get_array(fs->desc_blocks, fs->blocksize, 
+                                 &group_shadow);
        if (retval)
                goto errout;
        memset(group_shadow, 0, (size_t) fs->blocksize *