From f770de897cb05fee6c2ea349d343f3b290c6e595 Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Mon, 28 Jan 2008 23:58:27 -0500
Subject: [PATCH] --- yaml --- r: 77914 b: refs/heads/master c:
 dbf9d7da33f79302fb1e4d7c6b2f6598e8608e72 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/extents.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b0c25172ad2f..fc7db03aaf5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce40733ce93de402ed629762f0e912d9af187cef
+refs/heads/master: dbf9d7da33f79302fb1e4d7c6b2f6598e8608e72
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 0cffb59fff46..ce9aa5860569 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -2373,9 +2373,10 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode,
 			ret = ext4_ext_convert_to_initialized(handle, inode,
 								path, iblock,
 								max_blocks);
-			if (ret <= 0)
+			if (ret <= 0) {
+				err = ret;
 				goto out2;
-			else
+			} else
 				allocated = ret;
 			goto outnew;
 		}