github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 13:06:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

btrfs: deduplicate log root free in error paths from btrfs_recover_log_trees()

Browse Source 
Instead of duplicating the dropping of a log tree in case we jump to the
'error' label, move the dropping under the 'error' label and get rid of the
the unnecessary setting of the log root to NULL since we return immediately
after.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Filipe Manana 2025-08-26 17:30:16 +01:00 committed by David Sterba
parent efa44fc4fd
commit 7f09699e5e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/tree-log.c
View File

@ -7491,8 +7491,6 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
ret = PTR_ERR(wc.root);
wc.root = NULL;
if (ret != -ENOENT) {
btrfs_put_root(wc.log);
wc.log = NULL;
btrfs_abort_transaction(trans, ret);
goto error;
}
@ -7510,8 +7508,6 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
*/
ret = btrfs_pin_extent_for_log_replay(trans, wc.log->node);
if (ret) {
btrfs_put_root(wc.log);
wc.log = NULL;
btrfs_abort_transaction(trans, ret);
goto error;
}
@ -7597,6 +7593,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
error:
if (wc.trans)
btrfs_end_transaction(wc.trans);
btrfs_put_root(wc.log);
clear_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags);
btrfs_free_path(path);
return ret;