btrfs: incorrect handling for fiemap_fill_next_extent return

fiemap_fill_next_extent returns 0 on success, -errno on error, 1 if this was
the last extent that will fit in user array. If 1 is returned, the return
value may eventually returned to user space, which should not happen, according
to manpage of ioctl.

Signed-off-by: Chengyu Song <csong84@gatech.edu>
Reviewed-by: David Sterba <dsterba@suse.cz>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Chengyu Song 2015-03-24 18:12:56 -04:00 committed by Chris Mason
parent 3c3b04d10f
commit 26e726afe0
1 changed files with 4 additions and 1 deletions

View File

@ -4514,9 +4514,12 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
} }
ret = fiemap_fill_next_extent(fieinfo, em_start, disko, ret = fiemap_fill_next_extent(fieinfo, em_start, disko,
em_len, flags); em_len, flags);
if (ret) if (ret) {
if (ret == 1)
ret = 0;
goto out_free; goto out_free;
} }
}
out_free: out_free:
free_extent_map(em); free_extent_map(em);
out: out: