Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6364627 authored by John Haxby's avatar John Haxby Committed by Linus Torvalds
Browse files

ocfs2: return non-zero st_blocks for inline data 



Some versions of tar assume that files with st_blocks == 0 do not
contain any data and will skip reading them entirely.  See also commit
9206c561 ("ext4: return non-zero st_blocks for inline data").

Signed-off-by: default avatarJohn Haxby <john.haxby@oracle.com>
Reviewed-by: default avatarMark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Acked-by: default avatarGang He <ghe@suse.com>
Reviewed-by: default avatarJunxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3eb5bdf0

fs/ocfs2/file.c

+8 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,14 @@ int ocfs2_getattr(struct vfsmount *mnt, 
	}



	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 don't incorrectly think the file is completely sparse.

	 */

	if (unlikely(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL))

		stat->blocks += (stat->size + 511)>>9;



	/* We set the blksize from the cluster size for performance */

	stat->blksize = osb->s_clustersize;