diff options
| author | Chengyu Song <csong84@gatech.edu> | 2015-03-24 18:12:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-22 17:01:23 -0700 |
| commit | e460b5d19ce84217468b6017326785bcd5de6888 (patch) | |
| tree | ef68a372d4672ef9025e3e6f2a0527be61a77f33 | |
| parent | d1d7f2310ab5da6fc92fbf4990d8f6b2d3deb39a (diff) | |
| download | lwn-e460b5d19ce84217468b6017326785bcd5de6888.tar.gz lwn-e460b5d19ce84217468b6017326785bcd5de6888.zip | |
btrfs: incorrect handling for fiemap_fill_next_extent return
commit 26e726afe01c1c82072cf23a5ed89ce25f39d9f2 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: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 fa9f90049099..8adfc65b37dd 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4289,8 +4289,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); |