lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 040/167] btrfs: fix incorrect error return ret being passed to mapping_set_error
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit bff5baf8aa37a97293725a16c03f49872249c07e ]

    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>
    Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.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 e767f347f2b1..88bee6703cc0 100644
    --- a/fs/btrfs/extent_io.c
    +++ b/fs/btrfs/extent_io.c
    @@ -2534,7 +2534,7 @@ int 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);
    }
    return 0;
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 18:29    [W:4.133 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site