btrfs: handle btrfs_record_root_in_trans failure in start_transaction
authorJosef Bacik <josef@toxicpanda.com>
Fri, 12 Mar 2021 20:25:08 +0000 (15:25 -0500)
committerDavid Sterba <dsterba@suse.com>
Mon, 19 Apr 2021 15:25:20 +0000 (17:25 +0200)
btrfs_record_root_in_trans will return errors in the future, so handle
the error properly in start_transaction.

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

index 97c5e73..deb1864 100644 (file)
@@ -746,7 +746,16 @@ got_it:
         * Thus it need to be called after current->journal_info initialized,
         * or we can deadlock.
         */
-       btrfs_record_root_in_trans(h, root);
+       ret = btrfs_record_root_in_trans(h, root);
+       if (ret) {
+               /*
+                * The transaction handle is fully initialized and linked with
+                * other structures so it needs to be ended in case of errors,
+                * not just freed.
+                */
+               btrfs_end_transaction(h);
+               return ERR_PTR(ret);
+       }
 
        return h;