From 10390b39effad45605f93d9740631af8117c7026 Mon Sep 17 00:00:00 2001
From: Ashish Sangwan <a.sangwan@samsung.com>
Date: Mon, 1 Jul 2013 08:12:41 -0400
Subject: [PATCH] --- yaml --- r: 377640 b: refs/heads/master c:
 6ae06ff51eab5dcbbf959b05ce0f11003a305ba5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5aa7cca5d913..d7e2183380c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41a5b913197c3a25fddef1735dc9b3d1fdc57428
+refs/heads/master: 6ae06ff51eab5dcbbf959b05ce0f11003a305ba5
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 575faa090253..7097b0f680e6 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -2504,7 +2504,9 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode,
 		return -EIO;
 	}
 	/* find where to start removing */
-	ex = EXT_LAST_EXTENT(eh);
+	ex = path[depth].p_ext;
+	if (!ex)
+		ex = EXT_LAST_EXTENT(eh);
 
 	ex_ee_block = le32_to_cpu(ex->ee_block);
 	ex_ee_len = ext4_ext_get_actual_len(ex);