From 747a49e5966613bf295e716f4b68f29f2ce97ada Mon Sep 17 00:00:00 2001
From: Curt Wohlgemuth <curtw@google.com>
Date: Wed, 26 Oct 2011 04:38:59 -0400
Subject: [PATCH] --- yaml --- r: 273156 b: refs/heads/master c:
 6f8ff537266ee5396c920fb0c842a21df3055ff3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index abb4177c3b60..7f08e2888f0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f85b287a01237857a50c93868231f7e831581a27
+refs/heads/master: 6f8ff537266ee5396c920fb0c842a21df3055ff3
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 02a4d80573a1..797b63b59740 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -1392,7 +1392,8 @@ ext4_ext_next_allocated_block(struct ext4_ext_path *path)
 	while (depth >= 0) {
 		if (depth == path->p_depth) {
 			/* leaf */
-			if (path[depth].p_ext !=
+			if (path[depth].p_ext &&
+				path[depth].p_ext !=
 					EXT_LAST_EXTENT(path[depth].p_hdr))
 			  return le32_to_cpu(path[depth].p_ext[1].ee_block);
 		} else {