btrfs: check record_root_in_trans related failures in select_reloc_root
authorJosef Bacik <josef@toxicpanda.com>
Fri, 12 Mar 2021 20:25:00 +0000 (15:25 -0500)
committerDavid Sterba <dsterba@suse.com>
Mon, 19 Apr 2021 15:25:19 +0000 (17:25 +0200)
We will record the fs root or the reloc root in the trans in
select_reloc_root.  These will actually return errors in the following
patches, so check their return value here and return it up the stack.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/relocation.c

index a916b80..3c82011 100644 (file)
@@ -1988,6 +1988,7 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans,
        struct btrfs_backref_node *next;
        struct btrfs_root *root;
        int index = 0;
+       int ret;
 
        next = node;
        while (1) {
@@ -2023,11 +2024,15 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans,
                }
 
                if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
-                       record_reloc_root_in_trans(trans, root);
+                       ret = record_reloc_root_in_trans(trans, root);
+                       if (ret)
+                               return ERR_PTR(ret);
                        break;
                }
 
-               btrfs_record_root_in_trans(trans, root);
+               ret = btrfs_record_root_in_trans(trans, root);
+               if (ret)
+                       return ERR_PTR(ret);
                root = root->reloc_root;
 
                if (next->new_bytenr != root->node->start) {