* [PATCH] btrfs: fix incorrect error return ret being passed to mapping_set_error
@ 2017-05-09 17:14 Colin King
2017-05-09 18:58 ` Liu Bo
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2017-05-09 17:14 UTC (permalink / raw)
To: Chris Mason, Josef Bacik, David Sterba, bo.li.liu, linux-btrfs
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The setting of return code ret should be based on the error code
passed into function end_extent_writepage and not on ret. Thanks
to Liu Bo for spotting this mistake in the original fix I submitted.
Detected by CoverityScan, CID#1414312 ("Logically dead code")
Fixes: 5dca6eea91653e ("Btrfs: mark mapping with error flag to report errors to userspace")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
fs/btrfs/extent_io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index d8da3edf2ac3..7c6a032df585 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2458,7 +2458,7 @@ void end_extent_writepage(struct page *page, int err, u64 start, u64 end)
if (!uptodate) {
ClearPageUptodate(page);
SetPageError(page);
- ret = ret < 0 ? ret : -EIO;
+ ret = err < 0 ? err : -EIO;
mapping_set_error(page->mapping, ret);
}
}
--
2.11.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs: fix incorrect error return ret being passed to mapping_set_error
2017-05-09 17:14 [PATCH] btrfs: fix incorrect error return ret being passed to mapping_set_error Colin King
@ 2017-05-09 18:58 ` Liu Bo
2017-05-10 15:10 ` David Sterba
0 siblings, 1 reply; 3+ messages in thread
From: Liu Bo @ 2017-05-09 18:58 UTC (permalink / raw)
To: Colin King
Cc: Chris Mason, Josef Bacik, David Sterba, linux-btrfs,
kernel-janitors, linux-kernel
On Tue, May 09, 2017 at 06:14:01PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The setting of return code ret should be based on the error code
> passed into function end_extent_writepage and not on ret. Thanks
> to Liu Bo for spotting this mistake in the original fix I submitted.
>
> Detected by CoverityScan, CID#1414312 ("Logically dead code")
Looks good.
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Thanks,
-liubo
>
> Fixes: 5dca6eea91653e ("Btrfs: mark mapping with error flag to report errors to userspace")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> fs/btrfs/extent_io.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index d8da3edf2ac3..7c6a032df585 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -2458,7 +2458,7 @@ void end_extent_writepage(struct page *page, int err, u64 start, u64 end)
> if (!uptodate) {
> ClearPageUptodate(page);
> SetPageError(page);
> - ret = ret < 0 ? ret : -EIO;
> + ret = err < 0 ? err : -EIO;
> mapping_set_error(page->mapping, ret);
> }
> }
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs: fix incorrect error return ret being passed to mapping_set_error
2017-05-09 18:58 ` Liu Bo
@ 2017-05-10 15:10 ` David Sterba
0 siblings, 0 replies; 3+ messages in thread
From: David Sterba @ 2017-05-10 15:10 UTC (permalink / raw)
To: Liu Bo
Cc: Colin King, Chris Mason, Josef Bacik, David Sterba, linux-btrfs,
kernel-janitors, linux-kernel
On Tue, May 09, 2017 at 11:58:55AM -0700, Liu Bo wrote:
> On Tue, May 09, 2017 at 06:14:01PM +0100, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > The setting of return code ret should be based on the error code
> > passed into function end_extent_writepage and not on ret. Thanks
> > to Liu Bo for spotting this mistake in the original fix I submitted.
> >
> > Detected by CoverityScan, CID#1414312 ("Logically dead code")
>
> Looks good.
>
> Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Thanks, patch replaced.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-10 15:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-09 17:14 [PATCH] btrfs: fix incorrect error return ret being passed to mapping_set_error Colin King
2017-05-09 18:58 ` Liu Bo
2017-05-10 15:10 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®