diff --git a/[refs] b/[refs]
index 5941cb9ce127..08c6b006690e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bd40a718444b28793283b70286f9e29d464a189
+refs/heads/master: 54641bd17db9fbfc13c7b1d4ee0dd2713bf3e076
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index 4036c62b6671..be2aef1cb7ae 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -3333,6 +3333,11 @@ int btrfs_read_block_groups(struct btrfs_root *root)
 		set_state_private(block_group_cache, found_key.objectid,
 				  (unsigned long)cache);
 
+		/* hack for now */
+		if (cache->flags & BTRFS_BLOCK_GROUP_METADATA) {
+			cache_block_group(root->fs_info->extent_root,
+					  cache);
+		}
 		if (key.objectid >=
 		    btrfs_super_total_bytes(&info->super_copy))
 			break;