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

Btrfs: add missing error handling after doing leaf/node binary search

The function map_private_extent_buffer() can return an -EINVAL error, and
it is called by generic_bin_search() which will return back the error. The
btrfs_bin_search() function in turn calls generic_bin_search() and the
key_search() function calls btrfs_bin_search(), so both can return the
-EINVAL error coming from the map_private_extent_buffer() function. Some
callers of these functions were ignoring that these functions can return
an error, so fix them to deal with error return values.
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.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 669e859b
...@@ -3020,6 +3020,8 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key, ...@@ -3020,6 +3020,8 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key,
*/ */
prev_cmp = -1; prev_cmp = -1;
ret = key_search(b, key, level, &prev_cmp, &slot); ret = key_search(b, key, level, &prev_cmp, &slot);
if (ret < 0)
goto done;
if (level != 0) { if (level != 0) {
int dec = 0; int dec = 0;
...@@ -5171,6 +5173,10 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, ...@@ -5171,6 +5173,10 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key,
nritems = btrfs_header_nritems(cur); nritems = btrfs_header_nritems(cur);
level = btrfs_header_level(cur); level = btrfs_header_level(cur);
sret = btrfs_bin_search(cur, min_key, level, &slot); sret = btrfs_bin_search(cur, min_key, level, &slot);
if (sret < 0) {
ret = sret;
goto out;
}
/* at the lowest level, we're done, setup the path and exit */ /* at the lowest level, we're done, setup the path and exit */
if (level == path->lowest_level) { if (level == path->lowest_level) {
......
...@@ -1806,6 +1806,8 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc, ...@@ -1806,6 +1806,8 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
BUG_ON(level < lowest_level); BUG_ON(level < lowest_level);
ret = btrfs_bin_search(parent, &key, level, &slot); ret = btrfs_bin_search(parent, &key, level, &slot);
if (ret < 0)
break;
if (ret && slot > 0) if (ret && slot > 0)
slot--; slot--;
...@@ -2730,6 +2732,10 @@ static int do_relocation(struct btrfs_trans_handle *trans, ...@@ -2730,6 +2732,10 @@ static int do_relocation(struct btrfs_trans_handle *trans,
if (!lowest) { if (!lowest) {
ret = btrfs_bin_search(upper->eb, key, ret = btrfs_bin_search(upper->eb, key,
upper->level, &slot); upper->level, &slot);
if (ret < 0) {
err = ret;
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)
...@@ -2765,6 +2771,10 @@ static int do_relocation(struct btrfs_trans_handle *trans, ...@@ -2765,6 +2771,10 @@ static int do_relocation(struct btrfs_trans_handle *trans,
} else { } else {
ret = btrfs_bin_search(upper->eb, key, upper->level, ret = btrfs_bin_search(upper->eb, key, upper->level,
&slot); &slot);
if (ret < 0) {
err = ret;
goto next;
}
BUG_ON(ret); BUG_ON(ret);
} }
......
...@@ -3767,6 +3767,8 @@ static int drop_objectid_items(struct btrfs_trans_handle *trans, ...@@ -3767,6 +3767,8 @@ static int drop_objectid_items(struct btrfs_trans_handle *trans,
found_key.type = 0; found_key.type = 0;
ret = btrfs_bin_search(path->nodes[0], &found_key, 0, ret = btrfs_bin_search(path->nodes[0], &found_key, 0,
&start_slot); &start_slot);
if (ret < 0)
break;
ret = btrfs_del_items(trans, log, path, start_slot, ret = btrfs_del_items(trans, log, path, start_slot,
path->slots[0] - start_slot + 1); path->slots[0] - start_slot + 1);
......
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