From: Filipe Manana <fdmanana@suse.com>
Date: Mon, 7 Jul 2014 11:35:21 +0000 (+0100)
Subject: Btrfs: set error return value in btrfs_get_blocks_direct
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=555e12864063762964433139dee651c5b859a047;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Btrfs: set error return value in btrfs_get_blocks_direct

We were returning with 0 (success) because we weren't extracting the
error code from em (PTR_ERR(em)). Fix it.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 2370d72972e9..177508abb865 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7143,8 +7143,10 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
 						       block_start, len,
 						       orig_block_len,
 						       ram_bytes, type);
-				if (IS_ERR(em))
+				if (IS_ERR(em)) {
+					ret = PTR_ERR(em);
 					goto unlock_err;
+				}
 			}
 
 			ret = btrfs_add_ordered_extent_dio(inode, start,