record_root_in_trans can currently fail, so handle this failure
properly.

Reviewed-by: Qu Wenruo <w...@suse.com>
Signed-off-by: Josef Bacik <jo...@toxicpanda.com>
---
 fs/btrfs/transaction.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 7ee0199fbb95..93464b93ee9d 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1593,8 +1593,9 @@ static noinline int create_pending_snapshot(struct 
btrfs_trans_handle *trans,
        dentry = pending->dentry;
        parent_inode = pending->dir;
        parent_root = BTRFS_I(parent_inode)->root;
-       record_root_in_trans(trans, parent_root, 0);
-
+       ret = record_root_in_trans(trans, parent_root, 0);
+       if (ret)
+               goto fail;
        cur_time = current_time(parent_inode);
 
        /*
@@ -1630,7 +1631,11 @@ static noinline int create_pending_snapshot(struct 
btrfs_trans_handle *trans,
                goto fail;
        }
 
-       record_root_in_trans(trans, root, 0);
+       ret = record_root_in_trans(trans, root, 0);
+       if (ret) {
+               btrfs_abort_transaction(trans, ret);
+               goto fail;
+       }
        btrfs_set_root_last_snapshot(&root->root_item, trans->transid);
        memcpy(new_root_item, &root->root_item, sizeof(*new_root_item));
        btrfs_check_and_init_root_item(new_root_item);
-- 
2.26.2

Reply via email to