diff --git a/[refs] b/[refs]
index 42dc2d40bac9..b9e5b3cd1493 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf6e693212263d33c5882e4653df89a2fca4c0c4
+refs/heads/master: 47f365eb575735c6b2edf5d08e0d16d26a9c23bd
diff --git a/trunk/fs/hfs/btree.c b/trunk/fs/hfs/btree.c
index 9b9d6395bad3..052f214ea6f0 100644
--- a/trunk/fs/hfs/btree.c
+++ b/trunk/fs/hfs/btree.c
@@ -58,6 +58,11 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
 	}
 	unlock_new_inode(tree->inode);
 
+	if (!HFS_I(tree->inode)->first_blocks) {
+		printk(KERN_ERR "hfs: invalid btree extent records (0 size).\n");
+		goto free_inode;
+	}
+
 	mapping = tree->inode->i_mapping;
 	page = read_mapping_page(mapping, 0, NULL);
 	if (IS_ERR(page))