Commit 9206c561 authored by Andreas Dilger's avatar Andreas Dilger Committed by Theodore Ts'o

ext4: return non-zero st_blocks for inline data

Return a non-zero st_blocks to userspace for statfs() and friends.
Some versions of tar will assume that files with st_blocks == 0
do not contain any data and will skip reading them entirely.
Signed-off-by: default avatarAndreas Dilger <>
Signed-off-by: default avatar"Theodore Ts'o" <>
parent dd1f723b
......@@ -4693,6 +4693,15 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry,
inode = dentry->d_inode;
generic_fillattr(inode, stat);
* If there is inline data in the inode, the inode will normally not
* have data blocks allocated (it may have an external xattr block).
* Report at least one sector for such files, so tools like tar, rsync,
* others doen't incorrectly think the file is completely sparse.
if (unlikely(ext4_has_inline_data(inode)))
stat->blocks += (stat->size + 511) >> 9;
* We can't update i_blocks if the block allocation is delayed
* otherwise in the case of system crash before the real block
......@@ -4704,9 +4713,8 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry,
* blocks for this file.
delalloc_blocks = EXT4_C2B(EXT4_SB(inode->i_sb),
stat->blocks += delalloc_blocks << (inode->i_sb->s_blocksize_bits-9);
stat->blocks += delalloc_blocks << (inode->i_sb->s_blocksize_bits - 9);
return 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment