btrfs: tests: use standard error message after fs_info allocation failure

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

7 files changed, 11 insertions, 10 deletions

diff --git a/fs/btrfs/tests/extent-buffer-tests.c b/fs/btrfs/tests/extent-buffer-tests.c
index 7d72eab6d32c..74c7975882d1 100644
--- a/fs/btrfs/tests/extent-buffer-tests.c
+++ b/fs/btrfs/tests/extent-buffer-tests.c
@@ -30,7 +30,7 @@ static int test_btrfs_split_item(u32 sectorsize, u32 nodesize)
 
         fs_info = btrfs_alloc_dummy_fs_info(nodesize, sectorsize);
         if (!fs_info) {
-                test_err("could not allocate fs_info");
+                test_std_err(TEST_ALLOC_FS_INFO);
                 return -ENOMEM;
         }
 
diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index 24003e97e797..5e92ee074bd0 100644
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -393,7 +393,7 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)
 
         fs_info = btrfs_alloc_dummy_fs_info(len, len);
         if (!fs_info) {
-                test_err("could not allocate fs_info");
+                test_std_err(TEST_ALLOC_FS_INFO);
                 return -ENOMEM;
         }
 
diff --git a/fs/btrfs/tests/extent-map-tests.c b/fs/btrfs/tests/extent-map-tests.c
index bf15d3a7f20e..662b718506b9 100644
--- a/fs/btrfs/tests/extent-map-tests.c
+++ b/fs/btrfs/tests/extent-map-tests.c
@@ -349,7 +349,7 @@ int btrfs_test_extent_map(void)
          */
         fs_info = btrfs_alloc_dummy_fs_info(PAGE_SIZE, PAGE_SIZE);
         if (!fs_info) {
-                test_msg("Couldn't allocate dummy fs info");
+                test_std_err(TEST_ALLOC_FS_INFO);
                 return -ENOMEM;
         }
 
diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
index 5c2f77e9439b..2051e1a19104 100644
--- a/fs/btrfs/tests/free-space-tests.c
+++ b/fs/btrfs/tests/free-space-tests.c
@@ -834,9 +834,10 @@ int btrfs_test_free_space_cache(u32 sectorsize, u32 nodesize)
 
         test_msg("running btrfs free space cache tests");
         fs_info = btrfs_alloc_dummy_fs_info(nodesize, sectorsize);
-        if (!fs_info)
+        if (!fs_info) {
+                test_std_err(TEST_ALLOC_FS_INFO);
                 return -ENOMEM;
-
+        }
 
         /*
          * For ppc64 (with 64k page size), bytes per bitmap might be
diff --git a/fs/btrfs/tests/free-space-tree-tests.c b/fs/btrfs/tests/free-space-tree-tests.c
index 89346da890cf..49fbf73c7f2b 100644
--- a/fs/btrfs/tests/free-space-tree-tests.c
+++ b/fs/btrfs/tests/free-space-tree-tests.c
@@ -444,7 +444,7 @@ 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;
         }
diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c
index af0c8e30d9e2..510365370d81 100644
--- a/fs/btrfs/tests/inode-tests.c
+++ b/fs/btrfs/tests/inode-tests.c
@@ -238,7 +238,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
 
         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);
                 goto out;
         }
 
@@ -839,7 +839,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)
 
         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);
                 goto out;
         }
 
@@ -935,7 +935,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
 
         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);
                 goto out;
         }
 
diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c
index 412b910b04cc..c620f68462be 100644
--- a/fs/btrfs/tests/qgroup-tests.c
+++ b/fs/btrfs/tests/qgroup-tests.c
@@ -457,7 +457,7 @@ int btrfs_test_qgroups(u32 sectorsize, u32 nodesize)
 
         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);
                 return -ENOMEM;
         }