]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
btrfs: hold a ref on the root in btrfs_recover_log_trees
authorJosef Bacik <josef@toxicpanda.com>
Fri, 24 Jan 2020 14:32:51 +0000 (09:32 -0500)
committerDavid Sterba <dsterba@suse.com>
Mon, 23 Mar 2020 16:01:31 +0000 (17:01 +0100)
We replay the log into arbitrary fs roots, hold a ref on the root while
we're doing this.

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/tree-log.c

index 556aa4a614f556a4b16d77c6263c178430ee16c7..169270c931a9f7ae19a159f076592c5ab37d2784 100644 (file)
@@ -6163,6 +6163,10 @@ again:
                tmp_key.offset = (u64)-1;
 
                wc.replay_dest = btrfs_get_fs_root(fs_info, &tmp_key, true);
+               if (!IS_ERR(wc.replay_dest)) {
+                       if (!btrfs_grab_fs_root(wc.replay_dest))
+                               wc.replay_dest = ERR_PTR(-ENOENT);
+               }
                if (IS_ERR(wc.replay_dest)) {
                        ret = PTR_ERR(wc.replay_dest);
 
@@ -6219,6 +6223,7 @@ again:
                }
 
                wc.replay_dest->log_root = NULL;
+               btrfs_put_fs_root(wc.replay_dest);
                free_extent_buffer(log->node);
                free_extent_buffer(log->commit_root);
                kfree(log);