mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
Btrfs: kill some BUG_ONs() in the find_parent_nodes()
The reason that BUG_ON() happens in these places is just because of ENOMEM. We try ro return ENOMEM rather than trigger BUG_ON(), the caller will abort the transaction thus avoiding the kernel panic. Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com> Reviewed-by: Miao Xie <miaox@cn.fujitsu.com> Reviewed-by: Jan Schmidt <list.btrfs@jan-o-sch.net> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
parent
41b0fc4280
commit
f172393952
1 changed files with 4 additions and 2 deletions
|
@ -900,7 +900,8 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans,
|
|||
if (ref->count && ref->root_id && ref->parent == 0) {
|
||||
/* no parent == root of tree */
|
||||
ret = ulist_add(roots, ref->root_id, 0, GFP_NOFS);
|
||||
BUG_ON(ret < 0);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
}
|
||||
if (ref->count && ref->parent) {
|
||||
struct extent_inode_elem *eie = NULL;
|
||||
|
@ -920,6 +921,8 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans,
|
|||
ret = ulist_add_merge(refs, ref->parent,
|
||||
(uintptr_t)ref->inode_list,
|
||||
(u64 *)&eie, GFP_NOFS);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
if (!ret && extent_item_pos) {
|
||||
/*
|
||||
* we've recorded that parent, so we must extend
|
||||
|
@ -930,7 +933,6 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans,
|
|||
eie = eie->next;
|
||||
eie->next = ref->inode_list;
|
||||
}
|
||||
BUG_ON(ret < 0);
|
||||
}
|
||||
kfree(ref);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue