btrfs: tests: use standard error message after extent buffer allocation failure

[sfrench/cifs-2.6.git] / fs / btrfs / tests / extent-io-tests.c

diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index 3c46d7f2345663fc384e1e7fcbfdb968d5410952..904addec8aef96c2b7be874d781a67fdcc45696d 100644 (file)
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -77,7 +77,11 @@ static int test_find_delalloc(u32 sectorsize)
                return -ENOMEM;
        }
 
-       extent_io_tree_init(&tmp, NULL);
+       /*
+        * Passing NULL as we don't have fs_info but tracepoints are not used
+        * at this point
+        */
+       extent_io_tree_init(NULL, &tmp, IO_TREE_SELFTEST, NULL);
 
        /*
         * First go through and create and mark all of our pages dirty, we pin
@@ -374,8 +378,8 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)
 {
        struct btrfs_fs_info *fs_info;
        unsigned long len;
-       unsigned long *bitmap;
-       struct extent_buffer *eb;
+       unsigned long *bitmap = NULL;
+       struct extent_buffer *eb = NULL;
        int ret;
 
        test_msg("running extent buffer bitmap tests");
@@ -388,18 +392,23 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)
                ? sectorsize * 4 : sectorsize;
 
        fs_info = btrfs_alloc_dummy_fs_info(len, len);
+       if (!fs_info) {
+               test_std_err(TEST_ALLOC_FS_INFO);
+               return -ENOMEM;
+       }
 
        bitmap = kmalloc(len, GFP_KERNEL);
        if (!bitmap) {
                test_err("couldn't allocate test bitmap");
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto out;
        }
 
        eb = __alloc_dummy_extent_buffer(fs_info, 0, len);
        if (!eb) {
-               test_err("couldn't allocate test extent buffer");
-               kfree(bitmap);
-               return -ENOMEM;
+               test_std_err(TEST_ALLOC_ROOT);
+               ret = -ENOMEM;
+               goto out;
        }
 
        ret = __test_eb_bitmaps(bitmap, eb, len);
@@ -410,15 +419,16 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)
        free_extent_buffer(eb);
        eb = __alloc_dummy_extent_buffer(NULL, nodesize / 2, len);
        if (!eb) {
-               test_err("couldn't allocate test extent buffer");
-               kfree(bitmap);
-               return -ENOMEM;
+               test_std_err(TEST_ALLOC_ROOT);
+               ret = -ENOMEM;
+               goto out;
        }
 
        ret = __test_eb_bitmaps(bitmap, eb, len);
 out:
        free_extent_buffer(eb);
        kfree(bitmap);
+       btrfs_free_dummy_fs_info(fs_info);
        return ret;
 }