diff --git a/[refs] b/[refs]
index d5a12e4c4f72..82f9c2d3aa68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f5aa215088b817add9c71914b83650bdd49f8a9
+refs/heads/master: 7be2baaa0322c59ba888aa5260a8c130666acd41
diff --git a/trunk/fs/ext4/ext4.h b/trunk/fs/ext4/ext4.h
index aafc9eba1c25..b0c87dce66a3 100644
--- a/trunk/fs/ext4/ext4.h
+++ b/trunk/fs/ext4/ext4.h
@@ -868,7 +868,7 @@ static inline unsigned ext4_rec_len_from_disk(__le16 dlen)
 {
 	unsigned len = le16_to_cpu(dlen);
 
-	if (len == EXT4_MAX_REC_LEN)
+	if (len == EXT4_MAX_REC_LEN || len == 0)
 		return 1 << 16;
 	return len;
 }