---

yaml --- r: 377640 b: refs/heads/master c: 6ae06ff h: refs/heads/master v: v3
git-mirror · Jul 1, 2013 · 10390b3 · 10390b3
1 parent f6ea1dc
commit 10390b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);