aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChengyu Song <csong84@gatech.edu>2015-03-24 18:12:56 -0400
committerSasha Levin <sasha.levin@oracle.com>2015-08-27 13:25:56 -0400
commitd421e91fe7e975b095e5b909e4712a07e0acaee5 (patch)
tree54b1a41697daad40ca76d387da588737fc5c1477
parent17e0dfc79801744d54534bc3bf22003ccf3de8e4 (diff)
downloadlinux-linaro-stable-d421e91fe7e975b095e5b909e4712a07e0acaee5.tar.gz
btrfs: incorrect handling for fiemap_fill_next_extent return
[ Upstream commit 26e726afe01c1c82072cf23a5ed89ce25f39d9f2 ] 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> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rw-r--r--fs/btrfs/extent_io.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index bf3f424e0013..02391f3eb9b0 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4484,8 +4484,11 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
}
ret = fiemap_fill_next_extent(fieinfo, em_start, disko,
em_len, flags);
- if (ret)
+ if (ret) {
+ if (ret == 1)
+ ret = 0;
goto out_free;
+ }
}
out_free:
free_extent_map(em);