diff --git a/[refs] b/[refs]
index 4d8eec102e9d..204a42e1497d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4188188bdc3aed29eb41fb1537305cff7431d062
+refs/heads/master: 31d4f3a2f3c73f279ff96a7135d7202ef6833f12
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 74f23c292e1b..4394a757aa4c 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -300,6 +300,8 @@ static int ext4_valid_extent(struct inode *inode, struct ext4_extent *ext)
 	ext4_fsblk_t block = ext4_ext_pblock(ext);
 	int len = ext4_ext_get_actual_len(ext);
 
+	if (len == 0)
+		return 0;
 	return ext4_data_block_valid(EXT4_SB(inode->i_sb), block, len);
 }