mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-03-20 01:50:44 -04:00
btrfs: rename enospc label to out at balance_level()
At balance_level() we have this 'enospc' label where we jump to in case we get an error at several places. However that error is certainly not -ENOSPC in call cases, it can be -EIO or -ENOMEM when reading a child extent buffer for example, or -ENOMEM when trying to record tree mod log operations. So to make this less confusing, rename the label to 'out'. Reviewed-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
committed by
David Sterba
parent
39020d8abc
commit
daefe4d435
@@ -1041,7 +1041,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
if (IS_ERR(child)) {
|
||||
ret = PTR_ERR(child);
|
||||
btrfs_handle_fs_error(fs_info, ret, NULL);
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
|
||||
btrfs_tree_lock(child);
|
||||
@@ -1050,7 +1050,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
if (ret) {
|
||||
btrfs_tree_unlock(child);
|
||||
free_extent_buffer(child);
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = btrfs_tree_mod_log_insert_root(root->node, child, true);
|
||||
@@ -1058,7 +1058,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
btrfs_tree_unlock(child);
|
||||
free_extent_buffer(child);
|
||||
btrfs_abort_transaction(trans, ret);
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
rcu_assign_pointer(root->node, child);
|
||||
|
||||
@@ -1087,7 +1087,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
if (IS_ERR(left)) {
|
||||
ret = PTR_ERR(left);
|
||||
left = NULL;
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
|
||||
__btrfs_tree_lock(left, BTRFS_NESTING_LEFT);
|
||||
@@ -1096,7 +1096,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
BTRFS_NESTING_LEFT_COW);
|
||||
if (wret) {
|
||||
ret = wret;
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1105,7 +1105,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
if (IS_ERR(right)) {
|
||||
ret = PTR_ERR(right);
|
||||
right = NULL;
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
|
||||
__btrfs_tree_lock(right, BTRFS_NESTING_RIGHT);
|
||||
@@ -1114,7 +1114,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
BTRFS_NESTING_RIGHT_COW);
|
||||
if (wret) {
|
||||
ret = wret;
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1149,7 +1149,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
BTRFS_MOD_LOG_KEY_REPLACE);
|
||||
if (ret < 0) {
|
||||
btrfs_abort_transaction(trans, ret);
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
btrfs_set_node_key(parent, &right_key, pslot + 1);
|
||||
btrfs_mark_buffer_dirty(parent);
|
||||
@@ -1168,12 +1168,12 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
if (!left) {
|
||||
ret = -EROFS;
|
||||
btrfs_handle_fs_error(fs_info, ret, NULL);
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
wret = balance_node_right(trans, mid, left);
|
||||
if (wret < 0) {
|
||||
ret = wret;
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
if (wret == 1) {
|
||||
wret = push_node_left(trans, left, mid, 1);
|
||||
@@ -1198,7 +1198,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
BTRFS_MOD_LOG_KEY_REPLACE);
|
||||
if (ret < 0) {
|
||||
btrfs_abort_transaction(trans, ret);
|
||||
goto enospc;
|
||||
goto out;
|
||||
}
|
||||
btrfs_set_node_key(parent, &mid_key, pslot);
|
||||
btrfs_mark_buffer_dirty(parent);
|
||||
@@ -1225,7 +1225,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
||||
if (orig_ptr !=
|
||||
btrfs_node_blockptr(path->nodes[level], path->slots[level]))
|
||||
BUG();
|
||||
enospc:
|
||||
out:
|
||||
if (right) {
|
||||
btrfs_tree_unlock(right);
|
||||
free_extent_buffer(right);
|
||||
|
||||
Reference in New Issue
Block a user