mirror of
https://github.com/brain-hackers/linux-brain.git
synced 2024-06-09 23:36:23 +09:00
btrfs: fix error handling in btrfs_del_csums
commit b86652be7c83f70bf406bed18ecf55adb9bfb91b upstream. Error injection stress would sometimes fail with checksums on disk that did not have a corresponding extent. This occurred because the pattern in btrfs_del_csums was while (1) { ret = btrfs_search_slot(); if (ret < 0) break; } ret = 0; out: btrfs_free_path(path); return ret; If we got an error from btrfs_search_slot we'd clear the error because we were breaking instead of goto out. Instead of using goto out, simply handle the cases where we may leave a random value in ret, and get rid of the ret = 0; out: pattern and simply allow break to have the proper error reporting. With this fix we properly abort the transaction and do not commit thinking we successfully deleted the csum. Reviewed-by: Qu Wenruo <wqu@suse.com> CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
295859a555
commit
0fd9149a82
|
@ -599,7 +599,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
|
||||||
u64 end_byte = bytenr + len;
|
u64 end_byte = bytenr + len;
|
||||||
u64 csum_end;
|
u64 csum_end;
|
||||||
struct extent_buffer *leaf;
|
struct extent_buffer *leaf;
|
||||||
int ret;
|
int ret = 0;
|
||||||
u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
|
u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
|
||||||
int blocksize_bits = fs_info->sb->s_blocksize_bits;
|
int blocksize_bits = fs_info->sb->s_blocksize_bits;
|
||||||
|
|
||||||
|
@ -618,6 +618,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
|
||||||
path->leave_spinning = 1;
|
path->leave_spinning = 1;
|
||||||
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
|
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
|
||||||
if (ret > 0) {
|
if (ret > 0) {
|
||||||
|
ret = 0;
|
||||||
if (path->slots[0] == 0)
|
if (path->slots[0] == 0)
|
||||||
break;
|
break;
|
||||||
path->slots[0]--;
|
path->slots[0]--;
|
||||||
|
@ -674,7 +675,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
|
||||||
ret = btrfs_del_items(trans, root, path,
|
ret = btrfs_del_items(trans, root, path,
|
||||||
path->slots[0], del_nr);
|
path->slots[0], del_nr);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
break;
|
||||||
if (key.offset == bytenr)
|
if (key.offset == bytenr)
|
||||||
break;
|
break;
|
||||||
} else if (key.offset < bytenr && csum_end > end_byte) {
|
} else if (key.offset < bytenr && csum_end > end_byte) {
|
||||||
|
@ -718,8 +719,9 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
|
||||||
ret = btrfs_split_item(trans, root, path, &key, offset);
|
ret = btrfs_split_item(trans, root, path, &key, offset);
|
||||||
if (ret && ret != -EAGAIN) {
|
if (ret && ret != -EAGAIN) {
|
||||||
btrfs_abort_transaction(trans, ret);
|
btrfs_abort_transaction(trans, ret);
|
||||||
goto out;
|
break;
|
||||||
}
|
}
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
key.offset = end_byte - 1;
|
key.offset = end_byte - 1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -729,8 +731,6 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
|
||||||
}
|
}
|
||||||
btrfs_release_path(path);
|
btrfs_release_path(path);
|
||||||
}
|
}
|
||||||
ret = 0;
|
|
||||||
out:
|
|
||||||
btrfs_free_path(path);
|
btrfs_free_path(path);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user