diff options
author | Chengyu Song <csong84@gatech.edu> | 2015-03-24 18:12:56 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-03-26 21:10:24 -0400 |
commit | 26e726afe01c1c82072cf23a5ed89ce25f39d9f2 (patch) | |
tree | c67b948abdfe0384c030e1d400e73aea5c488d98 /fs/btrfs | |
parent | 3c3b04d10ff1811a27f86684ccd2f5ba6983211d (diff) |
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>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/extent_io.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index d688cfe5d496..782f3bc4651d 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -4514,8 +4514,11 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, | |||
4514 | } | 4514 | } |
4515 | ret = fiemap_fill_next_extent(fieinfo, em_start, disko, | 4515 | ret = fiemap_fill_next_extent(fieinfo, em_start, disko, |
4516 | em_len, flags); | 4516 | em_len, flags); |
4517 | if (ret) | 4517 | if (ret) { |
4518 | if (ret == 1) | ||
4519 | ret = 0; | ||
4518 | goto out_free; | 4520 | goto out_free; |
4521 | } | ||
4519 | } | 4522 | } |
4520 | out_free: | 4523 | out_free: |
4521 | free_extent_map(em); | 4524 | free_extent_map(em); |