redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

btrfs: remove err variable from do_relocation

Browse source 
It simply gets assigned to 'ret' in case of errors. The flow of the
while loop is not changed by this commit since the few call sites
that 'goto next' will simply break from the loop.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2020-11-24 17:49:32 +02:00 committed by David Sterba
parent c6a592f2e2
commit 8df01fddb7
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
fs/btrfs/relocation.c
View file

@ -2181,8 +2181,7 @@ static int do_relocation(struct btrfs_trans_handle *trans,
u32 blocksize; u32 blocksize;
u64 bytenr; u64 bytenr;
int slot; int slot;
int ret; int ret = 0;
int err = 0;
BUG_ON(lowest && node->eb); BUG_ON(lowest && node->eb);
@ -2200,10 +2199,8 @@ static int do_relocation(struct btrfs_trans_handle *trans,
if (upper->eb && !upper->locked) { if (upper->eb && !upper->locked) {
if (!lowest) { if (!lowest) {
ret = btrfs_bin_search(upper->eb, key, &slot); ret = btrfs_bin_search(upper->eb, key, &slot);
if (ret < 0) { if (ret < 0)
err = ret;
goto next; goto next;
}
BUG_ON(ret); BUG_ON(ret);
bytenr = btrfs_node_blockptr(upper->eb, slot); bytenr = btrfs_node_blockptr(upper->eb, slot);
if (node->eb->start == bytenr) if (node->eb->start == bytenr)
@ -2215,10 +2212,8 @@ static int do_relocation(struct btrfs_trans_handle *trans,
if (!upper->eb) { if (!upper->eb) {
ret = btrfs_search_slot(trans, root, key, path, 0, 1); ret = btrfs_search_slot(trans, root, key, path, 0, 1);
if (ret) { if (ret) {
if (ret < 0) if (ret > 0)
err = ret; ret = -ENOENT;
else
err = -ENOENT;
btrfs_release_path(path); btrfs_release_path(path);
break; break;
@ -2238,10 +2233,8 @@ static int do_relocation(struct btrfs_trans_handle *trans,
btrfs_release_path(path); btrfs_release_path(path);
} else { } else {
ret = btrfs_bin_search(upper->eb, key, &slot); ret = btrfs_bin_search(upper->eb, key, &slot);
if (ret < 0) { if (ret < 0)
err = ret;
goto next; goto next;
}
BUG_ON(ret); BUG_ON(ret);
} }
@ -2252,7 +2245,7 @@ static int do_relocation(struct btrfs_trans_handle *trans,
"lowest leaf/node mismatch: bytenr %llu node->bytenr %llu slot %d upper %llu", "lowest leaf/node mismatch: bytenr %llu node->bytenr %llu slot %d upper %llu",
bytenr, node->bytenr, slot, bytenr, node->bytenr, slot,
upper->eb->start); upper->eb->start);
err = -EIO; ret = -EIO;
goto next; goto next;
} }
} else { } else {
@ -2263,7 +2256,7 @@ static int do_relocation(struct btrfs_trans_handle *trans,
blocksize = root->fs_info->nodesize; blocksize = root->fs_info->nodesize;
eb = btrfs_read_node_slot(upper->eb, slot); eb = btrfs_read_node_slot(upper->eb, slot);
if (IS_ERR(eb)) { if (IS_ERR(eb)) {
err = PTR_ERR(eb); ret = PTR_ERR(eb);
goto next; goto next;
} }
btrfs_tree_lock(eb); btrfs_tree_lock(eb);
@ -2273,10 +2266,8 @@ static int do_relocation(struct btrfs_trans_handle *trans,
slot, &eb, BTRFS_NESTING_COW); slot, &eb, BTRFS_NESTING_COW);
btrfs_tree_unlock(eb); btrfs_tree_unlock(eb);
free_extent_buffer(eb); free_extent_buffer(eb);
if (ret < 0) { if (ret < 0)
err = ret;
goto next; goto next;
}
BUG_ON(node->eb != eb); BUG_ON(node->eb != eb);
} else { } else {
btrfs_set_node_blockptr(upper->eb, slot, btrfs_set_node_blockptr(upper->eb, slot,
@ -2302,19 +2293,19 @@ next:
btrfs_backref_drop_node_buffer(upper); btrfs_backref_drop_node_buffer(upper);
else else
btrfs_backref_unlock_node_buffer(upper); btrfs_backref_unlock_node_buffer(upper);
if (err) if (ret)
break; break;
} }
if (!err && node->pending) { if (!ret && node->pending) {
btrfs_backref_drop_node_buffer(node); btrfs_backref_drop_node_buffer(node);
list_move_tail(&node->list, &rc->backref_cache.changed); list_move_tail(&node->list, &rc->backref_cache.changed);
node->pending = 0; node->pending = 0;
} }
path->lowest_level = 0; path->lowest_level = 0;
BUG_ON(err == -ENOSPC); BUG_ON(ret == -ENOSPC);
return err; return ret;
} }
static int link_to_upper(struct btrfs_trans_handle *trans, static int link_to_upper(struct btrfs_trans_handle *trans,