redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

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>
wifi-calibration
Josef Bacik 2014-12-12 16:02:20 -05:00 committed by Chris Mason
parent 6b6d24b389
commit df95e7f0d9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/extent-tree.c
View File

@ -3139,9 +3139,11 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
struct extent_buffer *leaf;
ret = btrfs_search_slot(trans, extent_root, &cache->key, path, 0, 1);
if (ret < 0)
if (ret) {
if (ret > 0)
ret = -ENOENT;
goto fail;
BUG_ON(ret); /* Corruption */
}
leaf = path->nodes[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_release_path(path);
fail:
if (ret) {
if (ret)
btrfs_abort_transaction(trans, root, ret);
return ret;
}
return 0;
return ret;
}