From: Peng Hao Date: Fri, 7 Oct 2022 16:33:35 +0000 (+0200) Subject: btrfs: simplify cleanup after error in btrfs_create_tree X-Git-Tag: v6.2-rc1~143^2~243 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c1b078545e64da7a2b67b74b9d12813b5dd2a529;p=tomoyo%2Ftomoyo-test1.git btrfs: simplify cleanup after error in btrfs_create_tree Since leaf is already NULL, and no other branch will go to fail_unlock, the fail_unlock label is useless and can be removed Signed-off-by: Peng Hao Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index d99bf7c64611..3460eaa9e4aa 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1197,7 +1197,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, if (IS_ERR(leaf)) { ret = PTR_ERR(leaf); leaf = NULL; - goto fail_unlock; + goto fail; } root->node = leaf; @@ -1232,9 +1232,6 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, return root; -fail_unlock: - if (leaf) - btrfs_tree_unlock(leaf); fail: btrfs_put_root(root);