| Message ID | 20140805010536.2611.51390.stgit@birch.djwong.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Mon, Aug 04, 2014 at 06:05:36PM -0700, Darrick J. Wong wrote: > If we're doing a strict overwrite (same data size) of data in an > inline data file, we should be able to skip the size check. If the > in-core EA representation is fine but the on-disk EA is slightly > corrupt (this happens when fixing minor errors in an inline dir), the > ext2fs_xattr_inode_max_size() call, which reads the disk EA, can lead > us to think that there's no space when in reality there is no issue > with doing a strict overwrite. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Applied, thanks. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/lib/ext2fs/inline_data.c b/lib/ext2fs/inline_data.c index c188d75..b9bda50 100644 --- a/lib/ext2fs/inline_data.c +++ b/lib/ext2fs/inline_data.c @@ -574,7 +574,8 @@ errcode_t ext2fs_inline_data_set(ext2_filsys fs, ext2_ino_t ino, else free_inode_size = 0; - if (size > existing_size + free_ea_size + free_inode_size) + if (size != existing_size && + size > existing_size + free_ea_size + free_inode_size) return EXT2_ET_INLINE_DATA_NO_SPACE; memcpy((void *)inode->i_block, buf, EXT4_MIN_INLINE_DATA_SIZE);
If we're doing a strict overwrite (same data size) of data in an inline data file, we should be able to skip the size check. If the in-core EA representation is fine but the on-disk EA is slightly corrupt (this happens when fixing minor errors in an inline dir), the ext2fs_xattr_inode_max_size() call, which reads the disk EA, can lead us to think that there's no space when in reality there is no issue with doing a strict overwrite. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- lib/ext2fs/inline_data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html