Commit 9ee6babb authored by Chengyu Song's avatar Chengyu Song Committed by Luis Henriques

btrfs: incorrect handling for fiemap_fill_next_extent return

commit 26e726af upstream.

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: default avatarChengyu Song <csong84@gatech.edu>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent e8f6216d
...@@ -4359,8 +4359,11 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, ...@@ -4359,8 +4359,11 @@ 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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment