From: Artem Blagodarenko Date: Tue, 31 Jan 2017 02:51:14 +0000 (-0500) Subject: During filesystem creation with -d option files copied from given X-Git-Tag: 1.43.4~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75a790455c43abf623be10b52007b211b25ded3c;p=thirdparty%2Fe2fsprogs.git During filesystem creation with -d option files copied from given directory. If supported, FS_IOC_FIEMAP ioctl is used to get file extents. For empty file fm_mapped_extents is 0 and no error code is returned, because this is not fail situation. Without this patch errno from previous operation is returned and successful FS_IOC_FIEMAP ioctl call for empty file is interpreted as error. Signed-off-by: Artem Blagodarenko Signed-off-by: Theodore Ts'o Reviewed-by: Darrick J. Wong --- diff --git a/misc/create_inode.c b/misc/create_inode.c index 5122e56cf..ae22ff6fe 100644 --- a/misc/create_inode.c +++ b/misc/create_inode.c @@ -510,10 +510,11 @@ static errcode_t try_fiemap_copy(ext2_filsys fs, int fd, ext2_file_t e2_file, if (err < 0 && (errno == EOPNOTSUPP || errno == ENOTTY)) { err = EXT2_ET_UNIMPLEMENTED; goto out; - } else if (err < 0 || fiemap_buf->fm_mapped_extents == 0) { + } else if (err < 0) { err = errno; goto out; - } + } else if (fiemap_buf->fm_mapped_extents == 0) + goto out; for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents; i++, ext++) { err = copy_file_range(fs, fd, e2_file, ext->fe_logical,