[PATCH v8 22/39] btrfs: change insert_dirty_subvol to return errors

[Josef Bacik]

This will be able to return errors in the future, so change it to return
an error and handle the error appropriately.

Signed-off-by: Josef Bacik <jo...@toxicpanda.com>
---
 fs/btrfs/relocation.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 4022649e2365..2187015fc412 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1564,9 +1564,9 @@ static int find_next_key(struct btrfs_path *path, int 
level,
 /*
  * Insert current subvolume into reloc_control::dirty_subvol_roots
  */
-static void insert_dirty_subvol(struct btrfs_trans_handle *trans,
-                               struct reloc_control *rc,
-                               struct btrfs_root *root)
+static int insert_dirty_subvol(struct btrfs_trans_handle *trans,
+                              struct reloc_control *rc,
+                              struct btrfs_root *root)
 {
        struct btrfs_root *reloc_root = root->reloc_root;
        struct btrfs_root_item *reloc_root_item;
@@ -1586,6 +1586,7 @@ static void insert_dirty_subvol(struct btrfs_trans_handle 
*trans,
                btrfs_grab_root(root);
                list_add_tail(&root->reloc_dirty_list, &rc->dirty_subvol_roots);
        }
+       return 0;
 }
 
 static int clean_dirty_subvols(struct reloc_control *rc)
@@ -1787,8 +1788,11 @@ static noinline_for_stack int merge_reloc_root(struct 
reloc_control *rc,
 out:
        btrfs_free_path(path);
 
-       if (ret == 0)
-               insert_dirty_subvol(trans, rc, root);
+       if (ret == 0) {
+               ret = insert_dirty_subvol(trans, rc, root);
+               if (ret)
+                       btrfs_abort_transaction(trans, ret);
+       }
 
        if (trans)
                btrfs_end_transaction_throttle(trans);
-- 
2.26.2