Skip to content

Commit 2daca1e

Browse files
asjkdave
authored andcommitted
btrfs: rename err and ret to ret in build_backref_tree()
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 <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 1e8a423 commit 2daca1e

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

fs/btrfs/relocation.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -473,20 +473,19 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
473473
struct btrfs_backref_node *node = NULL;
474474
struct btrfs_backref_edge *edge;
475475
int ret;
476-
int err = 0;
477476

478477
iter = btrfs_backref_iter_alloc(rc->extent_root->fs_info);
479478
if (!iter)
480479
return ERR_PTR(-ENOMEM);
481480
path = btrfs_alloc_path();
482481
if (!path) {
483-
err = -ENOMEM;
482+
ret = -ENOMEM;
484483
goto out;
485484
}
486485

487486
node = btrfs_backref_alloc_node(cache, bytenr, level);
488487
if (!node) {
489-
err = -ENOMEM;
488+
ret = -ENOMEM;
490489
goto out;
491490
}
492491

@@ -497,10 +496,9 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
497496
do {
498497
ret = btrfs_backref_add_tree_node(trans, cache, path, iter,
499498
node_key, cur);
500-
if (ret < 0) {
501-
err = ret;
499+
if (ret < 0)
502500
goto out;
503-
}
501+
504502
edge = list_first_entry_or_null(&cache->pending_edge,
505503
struct btrfs_backref_edge, list[UPPER]);
506504
/*
@@ -515,20 +513,18 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
515513

516514
/* Finish the upper linkage of newly added edges/nodes */
517515
ret = btrfs_backref_finish_upper_links(cache, node);
518-
if (ret < 0) {
519-
err = ret;
516+
if (ret < 0)
520517
goto out;
521-
}
522518

523519
if (handle_useless_nodes(rc, node))
524520
node = NULL;
525521
out:
526522
btrfs_free_path(iter->path);
527523
kfree(iter);
528524
btrfs_free_path(path);
529-
if (err) {
525+
if (ret) {
530526
btrfs_backref_error_cleanup(cache, node);
531-
return ERR_PTR(err);
527+
return ERR_PTR(ret);
532528
}
533529
ASSERT(!node || !node->detached);
534530
ASSERT(list_empty(&cache->useless_node) &&

0 commit comments

Comments
 (0)