btrfs: tests: return error from all extent map test cases

The way the extent map tests handle errors does not conform to the rest
of the suite, where the first failure is reported and then it stops.
Do the same now that we have the errors returned from all the functions.

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

diff --git a/fs/btrfs/tests/extent-map-tests.c b/fs/btrfs/tests/extent-map-tests.c
index 35cfb65f1016b781344400e1725628aabe525c3e..5e99c7d40ea1147bddb30aa41fd7bdc9f43ec942 100644 (file)
--- a/fs/btrfs/tests/extent-map-tests.c
+++ b/fs/btrfs/tests/extent-map-tests.c
@@ -275,12 +275,20 @@ out:
  *   -> add_extent_mapping()
  *                            -> add_extent_mapping()
  */
-static void test_case_3(struct btrfs_fs_info *fs_info,
+static int test_case_3(struct btrfs_fs_info *fs_info,
                struct extent_map_tree *em_tree)
 {
-       __test_case_3(fs_info, em_tree, 0);
-       __test_case_3(fs_info, em_tree, SZ_8K);
-       __test_case_3(fs_info, em_tree, (12 * 1024ULL));
+       int ret;
+
+       ret = __test_case_3(fs_info, em_tree, 0);
+       if (ret)
+               return ret;
+       ret = __test_case_3(fs_info, em_tree, SZ_8K);
+       if (ret)
+               return ret;
+       ret = __test_case_3(fs_info, em_tree, (12 * 1024ULL));
+
+       return ret;
 }
 
 static int __test_case_4(struct btrfs_fs_info *fs_info,
@@ -379,11 +387,17 @@ out:
  *                                             # handle -EEXIST when adding
  *                                             # [0, 32K)
  */
-static void test_case_4(struct btrfs_fs_info *fs_info,
+static int test_case_4(struct btrfs_fs_info *fs_info,
                struct extent_map_tree *em_tree)
 {
-       __test_case_4(fs_info, em_tree, 0);
-       __test_case_4(fs_info, em_tree, SZ_4K);
+       int ret;
+
+       ret = __test_case_4(fs_info, em_tree, 0);
+       if (ret)
+               return ret;
+       ret = __test_case_4(fs_info, em_tree, SZ_4K);
+
+       return ret;
 }
 
 int btrfs_test_extent_map(void)
@@ -412,13 +426,19 @@ int btrfs_test_extent_map(void)
 
        extent_map_tree_init(em_tree);
 
-       test_case_1(fs_info, em_tree);
-       test_case_2(fs_info, em_tree);
-       test_case_3(fs_info, em_tree);
-       test_case_4(fs_info, em_tree);
+       ret = test_case_1(fs_info, em_tree);
+       if (ret)
+               goto out;
+       ret = test_case_2(fs_info, em_tree);
+       if (ret)
+               goto out;
+       ret = test_case_3(fs_info, em_tree);
+       if (ret)
+               goto out;
+       ret = test_case_4(fs_info, em_tree);
 
-       kfree(em_tree);
 out:
+       kfree(em_tree);
        btrfs_free_dummy_fs_info(fs_info);
 
        return ret;