Commit daefe4d4 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

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: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 39020d8a
...@@ -1041,7 +1041,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1041,7 +1041,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
if (IS_ERR(child)) { if (IS_ERR(child)) {
ret = PTR_ERR(child); ret = PTR_ERR(child);
btrfs_handle_fs_error(fs_info, ret, NULL); btrfs_handle_fs_error(fs_info, ret, NULL);
goto enospc; goto out;
} }
btrfs_tree_lock(child); btrfs_tree_lock(child);
...@@ -1050,7 +1050,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1050,7 +1050,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
if (ret) { if (ret) {
btrfs_tree_unlock(child); btrfs_tree_unlock(child);
free_extent_buffer(child); free_extent_buffer(child);
goto enospc; goto out;
} }
ret = btrfs_tree_mod_log_insert_root(root->node, child, true); 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, ...@@ -1058,7 +1058,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
btrfs_tree_unlock(child); btrfs_tree_unlock(child);
free_extent_buffer(child); free_extent_buffer(child);
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
goto enospc; goto out;
} }
rcu_assign_pointer(root->node, child); rcu_assign_pointer(root->node, child);
...@@ -1087,7 +1087,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1087,7 +1087,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
if (IS_ERR(left)) { if (IS_ERR(left)) {
ret = PTR_ERR(left); ret = PTR_ERR(left);
left = NULL; left = NULL;
goto enospc; goto out;
} }
__btrfs_tree_lock(left, BTRFS_NESTING_LEFT); __btrfs_tree_lock(left, BTRFS_NESTING_LEFT);
...@@ -1096,7 +1096,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1096,7 +1096,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
BTRFS_NESTING_LEFT_COW); BTRFS_NESTING_LEFT_COW);
if (wret) { if (wret) {
ret = wret; ret = wret;
goto enospc; goto out;
} }
} }
...@@ -1105,7 +1105,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1105,7 +1105,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
if (IS_ERR(right)) { if (IS_ERR(right)) {
ret = PTR_ERR(right); ret = PTR_ERR(right);
right = NULL; right = NULL;
goto enospc; goto out;
} }
__btrfs_tree_lock(right, BTRFS_NESTING_RIGHT); __btrfs_tree_lock(right, BTRFS_NESTING_RIGHT);
...@@ -1114,7 +1114,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1114,7 +1114,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
BTRFS_NESTING_RIGHT_COW); BTRFS_NESTING_RIGHT_COW);
if (wret) { if (wret) {
ret = wret; ret = wret;
goto enospc; goto out;
} }
} }
...@@ -1149,7 +1149,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1149,7 +1149,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
BTRFS_MOD_LOG_KEY_REPLACE); BTRFS_MOD_LOG_KEY_REPLACE);
if (ret < 0) { if (ret < 0) {
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
goto enospc; goto out;
} }
btrfs_set_node_key(parent, &right_key, pslot + 1); btrfs_set_node_key(parent, &right_key, pslot + 1);
btrfs_mark_buffer_dirty(parent); btrfs_mark_buffer_dirty(parent);
...@@ -1168,12 +1168,12 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1168,12 +1168,12 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
if (!left) { if (!left) {
ret = -EROFS; ret = -EROFS;
btrfs_handle_fs_error(fs_info, ret, NULL); btrfs_handle_fs_error(fs_info, ret, NULL);
goto enospc; goto out;
} }
wret = balance_node_right(trans, mid, left); wret = balance_node_right(trans, mid, left);
if (wret < 0) { if (wret < 0) {
ret = wret; ret = wret;
goto enospc; goto out;
} }
if (wret == 1) { if (wret == 1) {
wret = push_node_left(trans, left, mid, 1); wret = push_node_left(trans, left, mid, 1);
...@@ -1198,7 +1198,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1198,7 +1198,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
BTRFS_MOD_LOG_KEY_REPLACE); BTRFS_MOD_LOG_KEY_REPLACE);
if (ret < 0) { if (ret < 0) {
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
goto enospc; goto out;
} }
btrfs_set_node_key(parent, &mid_key, pslot); btrfs_set_node_key(parent, &mid_key, pslot);
btrfs_mark_buffer_dirty(parent); btrfs_mark_buffer_dirty(parent);
...@@ -1225,7 +1225,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, ...@@ -1225,7 +1225,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
if (orig_ptr != if (orig_ptr !=
btrfs_node_blockptr(path->nodes[level], path->slots[level])) btrfs_node_blockptr(path->nodes[level], path->slots[level]))
BUG(); BUG();
enospc: out:
if (right) { if (right) {
btrfs_tree_unlock(right); btrfs_tree_unlock(right);
free_extent_buffer(right); free_extent_buffer(right);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment