btrfs: unify extent buffer allocation api

Make the extent buffer allocation interface consistent.  Cloned eb will
set a valid fs_info.  For dummy eb, we can drop the length parameter and
set it from fs_info.

The built-in sanity checks may pass a NULL fs_info that's queried for
nodesize, but we know it's 4096.

Signed-off-by: David Sterba <dsterba@suse.cz>

3 files changed, 13 insertions, 14 deletions

diff --git a/fs/btrfs/tests/extent-buffer-tests.c b/fs/btrfs/tests/extent-buffer-tests.c
index cc286ce97d1e..f51963a8f929 100644
--- a/fs/btrfs/tests/extent-buffer-tests.c
+++ b/fs/btrfs/tests/extent-buffer-tests.c
@@ -53,7 +53,7 @@ static int test_btrfs_split_item(void)
                 return -ENOMEM;
         }
 
-        path->nodes[0] = eb = alloc_dummy_extent_buffer(0, 4096);
+        path->nodes[0] = eb = alloc_dummy_extent_buffer(NULL, 4096);
         if (!eb) {
                 test_msg("Could not allocate dummy buffer\n");
                 ret = -ENOMEM;
diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c
index 3ae0f5b8bb80..a116b55ce788 100644
--- a/fs/btrfs/tests/inode-tests.c
+++ b/fs/btrfs/tests/inode-tests.c
@@ -255,7 +255,7 @@ static noinline int test_btrfs_get_extent(void)
                 goto out;
         }
 
-        root->node = alloc_dummy_extent_buffer(0, 4096);
+        root->node = alloc_dummy_extent_buffer(NULL, 4096);
         if (!root->node) {
                 test_msg("Couldn't allocate dummy buffer\n");
                 goto out;
@@ -843,7 +843,7 @@ static int test_hole_first(void)
                 goto out;
         }
 
-        root->node = alloc_dummy_extent_buffer(0, 4096);
+        root->node = alloc_dummy_extent_buffer(NULL, 4096);
         if (!root->node) {
                 test_msg("Couldn't allocate dummy buffer\n");
                 goto out;
diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c
index ec3dcb202357..7336b1c09cd8 100644
--- a/fs/btrfs/tests/qgroup-tests.c
+++ b/fs/btrfs/tests/qgroup-tests.c
@@ -404,6 +404,16 @@ int btrfs_test_qgroups(void)
                 ret = -ENOMEM;
                 goto out;
         }
+        /* We are using this root as our extent root */
+        root->fs_info->extent_root = root;
+
+        /*
+         * Some of the paths we test assume we have a filled out fs_info, so we
+         * just need to add the root in there so we don't panic.
+         */
+        root->fs_info->tree_root = root;
+        root->fs_info->quota_root = root;
+        root->fs_info->quota_enabled = 1;
 
         /*
          * Can't use bytenr 0, some things freak out
@@ -448,17 +458,6 @@ int btrfs_test_qgroups(void)
                 goto out;
         }
 
-        /* We are using this root as our extent root */
-        root->fs_info->extent_root = root;
-
-        /*
-         * Some of the paths we test assume we have a filled out fs_info, so we
-         * just need to addt he root in there so we don't panic.
-         */
-        root->fs_info->tree_root = root;
-        root->fs_info->quota_root = root;
-        root->fs_info->quota_enabled = 1;
-
         test_msg("Running qgroup tests\n");
         ret = test_no_shared_qgroup(root);
         if (ret)