Skip to content

Commit

Permalink
btrfs: rename err and ret to ret in build_backref_tree()
Browse files Browse the repository at this point in the history
Code style fix in the function build_backref_tree().  Drop the ret
initialization 0, as we don't need it.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Anand Jain authored and David Sterba committed May 7, 2024
1 parent 1e8a423 commit 2daca1e
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions fs/btrfs/relocation.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,20 +473,19 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
struct btrfs_backref_node *node = NULL;
struct btrfs_backref_edge *edge;
int ret;
int err = 0;

iter = btrfs_backref_iter_alloc(rc->extent_root->fs_info);
if (!iter)
return ERR_PTR(-ENOMEM);
path = btrfs_alloc_path();
if (!path) {
err = -ENOMEM;
ret = -ENOMEM;
goto out;
}

node = btrfs_backref_alloc_node(cache, bytenr, level);
if (!node) {
err = -ENOMEM;
ret = -ENOMEM;
goto out;
}

Expand All @@ -497,10 +496,9 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
do {
ret = btrfs_backref_add_tree_node(trans, cache, path, iter,
node_key, cur);
if (ret < 0) {
err = ret;
if (ret < 0)
goto out;
}

edge = list_first_entry_or_null(&cache->pending_edge,
struct btrfs_backref_edge, list[UPPER]);
/*
Expand All @@ -515,20 +513,18 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(

/* Finish the upper linkage of newly added edges/nodes */
ret = btrfs_backref_finish_upper_links(cache, node);
if (ret < 0) {
err = ret;
if (ret < 0)
goto out;
}

if (handle_useless_nodes(rc, node))
node = NULL;
out:
btrfs_free_path(iter->path);
kfree(iter);
btrfs_free_path(path);
if (err) {
if (ret) {
btrfs_backref_error_cleanup(cache, node);
return ERR_PTR(err);
return ERR_PTR(ret);
}
ASSERT(!node || !node->detached);
ASSERT(list_empty(&cache->useless_node) &&
Expand Down

0 comments on commit 2daca1e

Please sign in to comment.