* [PATCH 1/1] btrfs: incorrect handling for fiemap_fill_next_extent return
@ 2015-03-24 22:12 Chengyu Song
2015-03-24 22:25 ` David Sterba
2015-03-25 15:04 ` Liu Bo
0 siblings, 2 replies; 3+ messages in thread
From: Chengyu Song @ 2015-03-24 22:12 UTC (permalink / raw)
To: clm, jbacik, dsterba, linux-btrfs, linux-kernel
Cc: taesoo, changwoo, sanidhya, blee, csong84
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] btrfs: incorrect handling for fiemap_fill_next_extent return
2015-03-24 22:12 [PATCH 1/1] btrfs: incorrect handling for fiemap_fill_next_extent return Chengyu Song
@ 2015-03-24 22:25 ` David Sterba
2015-03-25 15:04 ` Liu Bo
1 sibling, 0 replies; 3+ messages in thread
From: David Sterba @ 2015-03-24 22:25 UTC (permalink / raw)
To: Chengyu Song
Cc: clm, jbacik, linux-btrfs, linux-kernel, taesoo, changwoo,
sanidhya, blee
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] btrfs: incorrect handling for fiemap_fill_next_extent return
2015-03-24 22:12 [PATCH 1/1] btrfs: incorrect handling for fiemap_fill_next_extent return Chengyu Song
2015-03-24 22:25 ` David Sterba
@ 2015-03-25 15:04 ` Liu Bo
1 sibling, 0 replies; 3+ messages in thread
From: Liu Bo @ 2015-03-25 15:04 UTC (permalink / raw)
To: Chengyu Song; +Cc: linux-btrfs
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-25 15:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-24 22:12 [PATCH 1/1] btrfs: incorrect handling for fiemap_fill_next_extent return Chengyu Song
2015-03-24 22:25 ` David Sterba
2015-03-25 15:04 ` Liu Bo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).