Btrfs: abort transaction if we don't find the block group
We shouldn't BUG_ON() if there is corruption. I hit this while testing my block group patch and the abort worked properly. Thanks, Signed-off-by: Josef Bacik <jbacik@fb.com> Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
parent
6b6d24b389
commit
df95e7f0d9
|
@ -3139,9 +3139,11 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
|
||||||
struct extent_buffer *leaf;
|
struct extent_buffer *leaf;
|
||||||
|
|
||||||
ret = btrfs_search_slot(trans, extent_root, &cache->key, path, 0, 1);
|
ret = btrfs_search_slot(trans, extent_root, &cache->key, path, 0, 1);
|
||||||
if (ret < 0)
|
if (ret) {
|
||||||
|
if (ret > 0)
|
||||||
|
ret = -ENOENT;
|
||||||
goto fail;
|
goto fail;
|
||||||
BUG_ON(ret); /* Corruption */
|
}
|
||||||
|
|
||||||
leaf = path->nodes[0];
|
leaf = path->nodes[0];
|
||||||
bi = btrfs_item_ptr_offset(leaf, path->slots[0]);
|
bi = btrfs_item_ptr_offset(leaf, path->slots[0]);
|
||||||
|
@ -3149,11 +3151,9 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
|
||||||
btrfs_mark_buffer_dirty(leaf);
|
btrfs_mark_buffer_dirty(leaf);
|
||||||
btrfs_release_path(path);
|
btrfs_release_path(path);
|
||||||
fail:
|
fail:
|
||||||
if (ret) {
|
if (ret)
|
||||||
btrfs_abort_transaction(trans, root, ret);
|
btrfs_abort_transaction(trans, root, ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue