Merge tag 'for-5.2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

[linux-2.6-microblaze.git] / fs / btrfs / tests / free-space-tree-tests.c

diff --git a/fs/btrfs/tests/free-space-tree-tests.c b/fs/btrfs/tests/free-space-tree-tests.c
index f7a969b..a90dad1 100644 (file)
--- a/fs/btrfs/tests/free-space-tree-tests.c
+++ b/fs/btrfs/tests/free-space-tree-tests.c
@@ -30,7 +30,7 @@ static int __check_free_space_extents(struct btrfs_trans_handle *trans,
        unsigned int i;
        int ret;
 
-       info = search_free_space_info(trans, fs_info, cache, path, 0);
+       info = search_free_space_info(trans, cache, path, 0);
        if (IS_ERR(info)) {
                test_err("could not find free space info");
                ret = PTR_ERR(info);
@@ -115,7 +115,7 @@ static int check_free_space_extents(struct btrfs_trans_handle *trans,
        u32 flags;
        int ret;
 
-       info = search_free_space_info(trans, fs_info, cache, path, 0);
+       info = search_free_space_info(trans, cache, path, 0);
        if (IS_ERR(info)) {
                test_err("could not find free space info");
                btrfs_release_path(path);
@@ -444,14 +444,14 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize,
 
        fs_info = btrfs_alloc_dummy_fs_info(nodesize, sectorsize);
        if (!fs_info) {
-               test_err("couldn't allocate dummy fs info");
+               test_std_err(TEST_ALLOC_FS_INFO);
                ret = -ENOMEM;
                goto out;
        }
 
        root = btrfs_alloc_dummy_root(fs_info);
        if (IS_ERR(root)) {
-               test_err("couldn't allocate dummy root");
+               test_std_err(TEST_ALLOC_ROOT);
                ret = PTR_ERR(root);
                goto out;
        }
@@ -463,7 +463,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize,
 
        root->node = alloc_test_extent_buffer(root->fs_info, nodesize);
        if (!root->node) {
-               test_err("couldn't allocate dummy buffer");
+               test_std_err(TEST_ALLOC_EXTENT_BUFFER);
                ret = -ENOMEM;
                goto out;
        }
@@ -473,7 +473,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize,
 
        cache = btrfs_alloc_dummy_block_group(fs_info, 8 * alignment);
        if (!cache) {
-               test_err("couldn't allocate dummy block group cache");
+               test_std_err(TEST_ALLOC_BLOCK_GROUP);
                ret = -ENOMEM;
                goto out;
        }
@@ -486,7 +486,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize,
 
        path = btrfs_alloc_path();
        if (!path) {
-               test_err("couldn't allocate path");
+               test_std_err(TEST_ALLOC_ROOT);
                ret = -ENOMEM;
                goto out;
        }