Skip to content

Commit 33a44f3

Browse files
asjkdave
authored andcommitted
btrfs: simplify return variables in btrfs_drop_subtree()
There's another return variable wret that is only passed to ret on error, we can simply use ret. Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 1618aa3 commit 33a44f3

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

fs/btrfs/extent-tree.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6099,7 +6099,6 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans,
60996099
int level;
61006100
int parent_level;
61016101
int ret = 0;
6102-
int wret;
61036102

61046103
BUG_ON(btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID);
61056104

@@ -6135,17 +6134,16 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans,
61356134
wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(fs_info);
61366135

61376136
while (1) {
6138-
wret = walk_down_tree(trans, root, path, wc);
6139-
if (wret < 0) {
6140-
ret = wret;
6137+
ret = walk_down_tree(trans, root, path, wc);
6138+
if (ret < 0)
61416139
break;
6142-
}
61436140

6144-
wret = walk_up_tree(trans, root, path, wc, parent_level);
6145-
if (wret < 0)
6146-
ret = wret;
6147-
if (wret != 0)
6141+
ret = walk_up_tree(trans, root, path, wc, parent_level);
6142+
if (ret) {
6143+
if (ret > 0)
6144+
ret = 0;
61486145
break;
6146+
}
61496147
}
61506148

61516149
kfree(wc);

0 commit comments

Comments
 (0)