diff options
| author | Andreas Dilger <andreas.dilger@intel.com> | 2013-11-11 22:38:12 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-11-11 22:38:12 -0500 |
| commit | 9206c561554c948111d3cf6fc563a0beaaf790b3 (patch) | |
| tree | 0ae1b0bd79963fb9bc3b608581f9b5d6ad6d9efd | |
| parent | dd1f723bf56bd96efc9d90e9e60dc511c79de48f (diff) | |
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: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rw-r--r-- | fs/ext4/inode.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 43015fa69c3..07576347411 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4694,6 +4694,15 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, 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 * allocation is done, we will have i_blocks inconsistent with @@ -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), - EXT4_I(inode)->i_reserved_data_blocks); - - stat->blocks += delalloc_blocks << (inode->i_sb->s_blocksize_bits-9); + EXT4_I(inode)->i_reserved_data_blocks); + stat->blocks += delalloc_blocks << (inode->i_sb->s_blocksize_bits - 9); return 0; } |