libext2fs: fix iblocks correctly when expanding an inline_data file

i_blocks covers the number of blocks allocated to an inode for data,
extents, and ACL blocks.  Since it's possible for a file to have a
separate ACL block and inline data, we must be careful when expanding
an inline data file to adjust, not set, the value of i_blocks.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/ext2fs/inline_data.c b/lib/ext2fs/inline_data.c
index 72e8fa3d1f45b0b22bb2ecbdc6b279fa0141c673..a9ec92377f2f7ca6f59767b2bc557cdf76525c48 100644 (file)
--- a/lib/ext2fs/inline_data.c
+++ b/lib/ext2fs/inline_data.c
@@ -372,7 +372,9 @@ ext2fs_inline_data_dir_expand(ext2_filsys fs, ext2_ino_t ino,
        if (EXT2_HAS_INCOMPAT_FEATURE(fs->super, EXT3_FEATURE_INCOMPAT_EXTENTS))
                inode->i_flags |= EXT4_EXTENTS_FL;
        inode->i_flags &= ~EXT4_INLINE_DATA_FL;
-       ext2fs_iblk_set(fs, inode, 1);
+       retval = ext2fs_iblk_add_blocks(fs, inode, 1);
+       if (retval)
+               goto errout;
        inode->i_size = fs->blocksize;
        retval = ext2fs_bmap2(fs, ino, inode, 0, BMAP_SET, 0, 0, &blk);
        if (retval)
@@ -410,7 +412,6 @@ ext2fs_inline_data_file_expand(ext2_filsys fs, ext2_ino_t ino,
                inode->i_flags |= EXT4_EXTENTS_FL;
        }
        inode->i_flags &= ~EXT4_INLINE_DATA_FL;
-       ext2fs_iblk_set(fs, inode, 0);
        inode->i_size = 0;
        retval = ext2fs_write_inode(fs, ino, inode);
        if (retval)