diff options
| author | Anand Jain <anand.jain@oracle.com> | 2024-03-19 20:25:33 +0530 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2024-05-07 21:31:08 +0200 |
| commit | 33a44f3760509c6b4df595774f1232f4c1b81e65 (patch) | |
| tree | 48d561b2d5c2ef7c7d93663e4164ce8601330589 /fs | |
| parent | 1618aa3c2e0163f5ac34d514ae89474521910536 (diff) | |
| download | linux-stable-33a44f3760509c6b4df595774f1232f4c1b81e65.tar.gz linux-stable-33a44f3760509c6b4df595774f1232f4c1b81e65.tar.bz2 linux-stable-33a44f3760509c6b4df595774f1232f4c1b81e65.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 78dc94a97e35..47d48233b592 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -6099,7 +6099,6 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, int level; int parent_level; int ret = 0; - int wret; BUG_ON(btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID); @@ -6135,17 +6134,16 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(fs_info); while (1) { - wret = walk_down_tree(trans, root, path, wc); - if (wret < 0) { - ret = wret; + ret = walk_down_tree(trans, root, path, wc); + if (ret < 0) break; - } - wret = walk_up_tree(trans, root, path, wc, parent_level); - if (wret < 0) - ret = wret; - if (wret != 0) + ret = walk_up_tree(trans, root, path, wc, parent_level); + if (ret) { + if (ret > 0) + ret = 0; break; + } } kfree(wc); |