Commit bff5baf8 authored May 09, 2017 by Colin Ian King Committed by David Sterba May 16, 2017

btrfs: fix incorrect error return ret being passed to mapping_set_error



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: 5dca6eea ("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>

parent 8d910125

fs/btrfs/extent_io.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

Admin message