From 246634a37e350eb850591d36ba5c066c0517052a Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Wed, 10 Jun 2009 14:22:55 -0400
Subject: [PATCH] --- yaml --- r: 146405 b: refs/heads/master c:
 a41f20716975910d9beb90b7efc61107901492b8 h: refs/heads/master i:   146403:
 af514634232502bed1b981d29423da9f1a94a97d v: v3

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

diff --git a/[refs] b/[refs]
index cb411b33e1e0..928c7b904ad0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eab928221bac8895a0b494a16a8810002bd8645
+refs/heads/master: a41f20716975910d9beb90b7efc61107901492b8
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 9c35a7b1f0ae..2593f748c3a4 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -2083,12 +2083,16 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode,
 	ex = EXT_LAST_EXTENT(eh);
 
 	ex_ee_block = le32_to_cpu(ex->ee_block);
-	if (ext4_ext_is_uninitialized(ex))
-		uninitialized = 1;
 	ex_ee_len = ext4_ext_get_actual_len(ex);
 
 	while (ex >= EXT_FIRST_EXTENT(eh) &&
 			ex_ee_block + ex_ee_len > start) {
+
+		if (ext4_ext_is_uninitialized(ex))
+			uninitialized = 1;
+		else
+			uninitialized = 0;
+
 		ext_debug("remove ext %lu:%u\n", ex_ee_block, ex_ee_len);
 		path[depth].p_ext = ex;