diff options
author | David Sterba <dsterba@suse.com> | 2019-03-15 12:28:46 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2019-04-29 13:02:25 -0400 |
commit | 9e3d9f8462ef020e2e4d256064f15fc7eb657156 (patch) | |
tree | a6428575d02dafab4cd751094e847a6b385750e8 | |
parent | 52ab7bca3583fa7a80b16232874784f8dcc4e560 (diff) |
btrfs: tests: use standard error message after extent buffer allocation failure
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/tests/extent-buffer-tests.c | 2 | ||||
-rw-r--r-- | fs/btrfs/tests/extent-io-tests.c | 4 | ||||
-rw-r--r-- | fs/btrfs/tests/free-space-tree-tests.c | 2 | ||||
-rw-r--r-- | fs/btrfs/tests/inode-tests.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/tests/extent-buffer-tests.c b/fs/btrfs/tests/extent-buffer-tests.c index 83814b769bde..dc2582554cf0 100644 --- a/fs/btrfs/tests/extent-buffer-tests.c +++ b/fs/btrfs/tests/extent-buffer-tests.c | |||
@@ -50,7 +50,7 @@ static int test_btrfs_split_item(u32 sectorsize, u32 nodesize) | |||
50 | 50 | ||
51 | path->nodes[0] = eb = alloc_dummy_extent_buffer(fs_info, nodesize); | 51 | path->nodes[0] = eb = alloc_dummy_extent_buffer(fs_info, nodesize); |
52 | if (!eb) { | 52 | if (!eb) { |
53 | test_err("could not allocate dummy buffer"); | 53 | test_std_err(TEST_ALLOC_EXTENT_BUFFER); |
54 | ret = -ENOMEM; | 54 | ret = -ENOMEM; |
55 | goto out; | 55 | goto out; |
56 | } | 56 | } |
diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c index 5e92ee074bd0..904addec8aef 100644 --- a/fs/btrfs/tests/extent-io-tests.c +++ b/fs/btrfs/tests/extent-io-tests.c | |||
@@ -406,7 +406,7 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize) | |||
406 | 406 | ||
407 | eb = __alloc_dummy_extent_buffer(fs_info, 0, len); | 407 | eb = __alloc_dummy_extent_buffer(fs_info, 0, len); |
408 | if (!eb) { | 408 | if (!eb) { |
409 | test_err("couldn't allocate test extent buffer"); | 409 | test_std_err(TEST_ALLOC_ROOT); |
410 | ret = -ENOMEM; | 410 | ret = -ENOMEM; |
411 | goto out; | 411 | goto out; |
412 | } | 412 | } |
@@ -419,7 +419,7 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize) | |||
419 | free_extent_buffer(eb); | 419 | free_extent_buffer(eb); |
420 | eb = __alloc_dummy_extent_buffer(NULL, nodesize / 2, len); | 420 | eb = __alloc_dummy_extent_buffer(NULL, nodesize / 2, len); |
421 | if (!eb) { | 421 | if (!eb) { |
422 | test_err("couldn't allocate test extent buffer"); | 422 | test_std_err(TEST_ALLOC_ROOT); |
423 | ret = -ENOMEM; | 423 | ret = -ENOMEM; |
424 | goto out; | 424 | goto out; |
425 | } | 425 | } |
diff --git a/fs/btrfs/tests/free-space-tree-tests.c b/fs/btrfs/tests/free-space-tree-tests.c index 79b5d0c97b7b..58fbca92dd0d 100644 --- a/fs/btrfs/tests/free-space-tree-tests.c +++ b/fs/btrfs/tests/free-space-tree-tests.c | |||
@@ -463,7 +463,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize, | |||
463 | 463 | ||
464 | root->node = alloc_test_extent_buffer(root->fs_info, nodesize); | 464 | root->node = alloc_test_extent_buffer(root->fs_info, nodesize); |
465 | if (!root->node) { | 465 | if (!root->node) { |
466 | test_err("couldn't allocate dummy buffer"); | 466 | test_std_err(TEST_ALLOC_EXTENT_BUFFER); |
467 | ret = -ENOMEM; | 467 | ret = -ENOMEM; |
468 | goto out; | 468 | goto out; |
469 | } | 469 | } |
diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c index 5803f342c47b..e63c128c741c 100644 --- a/fs/btrfs/tests/inode-tests.c +++ b/fs/btrfs/tests/inode-tests.c | |||
@@ -250,7 +250,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize) | |||
250 | 250 | ||
251 | root->node = alloc_dummy_extent_buffer(fs_info, nodesize); | 251 | root->node = alloc_dummy_extent_buffer(fs_info, nodesize); |
252 | if (!root->node) { | 252 | if (!root->node) { |
253 | test_err("couldn't allocate dummy buffer"); | 253 | test_std_err(TEST_ALLOC_ROOT); |
254 | goto out; | 254 | goto out; |
255 | } | 255 | } |
256 | 256 | ||
@@ -851,7 +851,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize) | |||
851 | 851 | ||
852 | root->node = alloc_dummy_extent_buffer(fs_info, nodesize); | 852 | root->node = alloc_dummy_extent_buffer(fs_info, nodesize); |
853 | if (!root->node) { | 853 | if (!root->node) { |
854 | test_err("couldn't allocate dummy buffer"); | 854 | test_std_err(TEST_ALLOC_ROOT); |
855 | goto out; | 855 | goto out; |
856 | } | 856 | } |
857 | 857 | ||