diff --git a/[refs] b/[refs]
index 273b8fb11a2e..735472138f7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 921f266bc6bfe6ebb599c559f10443af314c19ec
+refs/heads/master: cdee78433c138c2f2018a6884673739af2634787
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 25c86aaa38d6..110e85a1f82a 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -3650,6 +3650,10 @@ ext4_ext_handle_uninitialized_extents(handle_t *handle, struct inode *inode,
 						 path, map->m_len);
 		} else
 			err = ret;
+		map->m_flags |= EXT4_MAP_MAPPED;
+		if (allocated > map->m_len)
+			allocated = map->m_len;
+		map->m_len = allocated;
 		goto out2;
 	}
 	/* buffered IO case */