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 16:55:55 -0700 |
| commit | 8d1529ce127e87e98782c3d23302171cc8627ee6 (patch) | |
| tree | ca0917683d9f6dd9d2252729789bf5287d635f9e | |
| parent | 98d94f20a39ab94559783c0556142f7bf4d0788f (diff) | |
| download | linux-stable-8d1529ce127e87e98782c3d23302171cc8627ee6.tar.gz linux-stable-8d1529ce127e87e98782c3d23302171cc8627ee6.tar.bz2 linux-stable-8d1529ce127e87e98782c3d23302171cc8627ee6.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 84ceff6abbc1..be7e31a933e5 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4080,8 +4080,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); |