From: Colin Ian King <colin.king@canonical.com>
Date: Tue, 9 May 2017 17:14:01 +0000 (+0100)
Subject: btrfs: fix incorrect error return ret being passed to mapping_set_error
X-Git-Tag: v4.4.128~153
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef51fe4d409b8f944345875345d75702a6b31a65;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

btrfs: fix incorrect error return ret being passed to mapping_set_error


[ 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index e767f34..88bee67 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;