libext2fs: handle inline_data in block iterator by returning an error code

An inode with inline data has no data blocks, so we can not iterate
over such an inode.  Return an error code which indicates this fact;
callers can use this to determine whether or not the inode has inline
data, and then call some routine to iterate over the directory intries
in the line data or read the inline data, as appropriate.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2013-10-13 17:42:25 -04:00
parent 00716339da
commit a7f4c6353f
2 changed files with 10 additions and 0 deletions

View File

@ -344,6 +344,13 @@ errcode_t ext2fs_block_iterate3(ext2_filsys fs,
if (ctx.errcode)
return ctx.errcode;
/*
* An inode with inline data has no blocks over which to
* iterate, so return an error code indicating this fact.
*/
if (inode.i_flags & EXT4_INLINE_DATA_FL)
return EXT2_ET_INLINE_DATA_CANT_ITERATE;
/*
* Check to see if we need to limit large files
*/

View File

@ -479,4 +479,7 @@ ec EXT2_ET_FILE_EXISTS,
ec EXT2_ET_BLOCK_BITMAP_CSUM_INVALID,
"Block bitmap checksum does not match bitmap"
ec EXT2_ET_INLINE_DATA_CANT_ITERATE,
"Cannot block iterate on an inode containing inline data"
end