Commit 7e4a3f7e authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: do not ignore error from btrfs_next_leaf() when inserting checksums

We are currently treating any non-zero return value from btrfs_next_leaf()
the same way, by going to the code that inserts a new checksum item in the
tree. However if btrfs_next_leaf() returns an error (a value < 0), we
should just stop and return the error, and not behave as if nothing has
happened, since in that case we do not have a way to know if there is a
next leaf or we are currently at the last leaf already.

So fix that by returning the error from btrfs_next_leaf().
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 cc14600c
...@@ -889,10 +889,12 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, ...@@ -889,10 +889,12 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
nritems = btrfs_header_nritems(path->nodes[0]); nritems = btrfs_header_nritems(path->nodes[0]);
if (!nritems || (path->slots[0] >= nritems - 1)) { if (!nritems || (path->slots[0] >= nritems - 1)) {
ret = btrfs_next_leaf(root, path); ret = btrfs_next_leaf(root, path);
if (ret == 1) if (ret < 0) {
goto out;
} else if (ret > 0) {
found_next = 1; found_next = 1;
if (ret != 0)
goto insert; goto insert;
}
slot = path->slots[0]; slot = path->slots[0];
} }
btrfs_item_key_to_cpu(path->nodes[0], &found_key, slot); btrfs_item_key_to_cpu(path->nodes[0], &found_key, slot);
......
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