| Message ID | 1427235176-19381-1-git-send-email-csong84@gatech.edu (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Mar 24, 2015 at 06:12:56PM -0400, Chengyu Song wrote: > 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> Good catch, thanks. Reviewed-by: David Sterba <dsterba@suse.cz> Should go to stable. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Mar 24, 2015 at 06:12:56PM -0400, Chengyu Song wrote: > 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. Reviewed-by: Liu Bo <bo.li.liu@oracle.com> > > Signed-off-by: Chengyu Song <csong84@gatech.edu> > --- > fs/btrfs/extent_io.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index d688cfe..782f3bc 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, > } > 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); > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index d688cfe..782f3bc 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, } 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);
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> --- fs/btrfs/extent_io.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)