3 files changed, 3 insertions, 8 deletions

diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c
index 0e1e61a7ec23..f54bf450bad3 100644
--- a/fs/btrfs/tests/btrfs-tests.c
+++ b/fs/btrfs/tests/btrfs-tests.c
@@ -137,7 +137,6 @@ static void btrfs_free_dummy_fs_info(struct btrfs_fs_info *fs_info)
         void **slot;
 
         spin_lock(&fs_info->buffer_lock);
-restart:
         radix_tree_for_each_slot(slot, &fs_info->buffer_radix, &iter, 0) {
                 struct extent_buffer *eb;
 
@@ -147,7 +146,7 @@ restart:
                 /* Shouldn't happen but that kind of thinking creates CVE's */
                 if (radix_tree_exception(eb)) {
                         if (radix_tree_deref_retry(eb))
-                                goto restart;
+                                slot = radix_tree_iter_retry(&iter);
                         continue;
                 }
                 spin_unlock(&fs_info->buffer_lock);
@@ -189,12 +188,6 @@ btrfs_alloc_dummy_block_group(unsigned long length)
                 kfree(cache);
                 return NULL;
         }
-        cache->fs_info = btrfs_alloc_dummy_fs_info();
-        if (!cache->fs_info) {
-                kfree(cache->free_space_ctl);
-                kfree(cache);
-                return NULL;
-        }
 
         cache->key.objectid = 0;
         cache->key.offset = length;
diff --git a/fs/btrfs/tests/free-space-tree-tests.c b/fs/btrfs/tests/free-space-tree-tests.c
index d05fe1ab4808..7cea4462acd5 100644
--- a/fs/btrfs/tests/free-space-tree-tests.c
+++ b/fs/btrfs/tests/free-space-tree-tests.c
@@ -485,6 +485,7 @@ static int run_test(test_func_t test_func, int bitmaps)
         cache->bitmap_low_thresh = 0;
         cache->bitmap_high_thresh = (u32)-1;
         cache->needs_free_space = 1;
+        cache->fs_info = root->fs_info;
 
         btrfs_init_dummy_trans(&trans);
 
diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c
index e2d3da02deee..863a6a3af1f8 100644
--- a/fs/btrfs/tests/inode-tests.c
+++ b/fs/btrfs/tests/inode-tests.c
@@ -22,6 +22,7 @@
 #include "../disk-io.h"
 #include "../extent_io.h"
 #include "../volumes.h"
+#include "../compression.h"
 
 static void insert_extent(struct btrfs_root *root, u64 start, u64 len,
                           u64 ram_bytes, u64 offset, u64 disk_bytenr,