torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

Btrfs: kill some BUG_ONs() in the find_parent_nodes()

Browse Source 
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:
Wang Shilong 2013-03-29 23:03:21 +00:00 committed by Josef Bacik
parent 41b0fc4280
commit f172393952
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/backref.c
View File

@ -900,7 +900,8 @@ again:
if (ref->count && ref->root_id && ref->parent == 0) { if (ref->count && ref->root_id && ref->parent == 0) {
/* no parent == root of tree */ /* no parent == root of tree */
ret = ulist_add(roots, ref->root_id, 0, GFP_NOFS); ret = ulist_add(roots, ref->root_id, 0, GFP_NOFS);
BUG_ON(ret < 0); if (ret < 0)
goto out;
} }
if (ref->count && ref->parent) { if (ref->count && ref->parent) {
struct extent_inode_elem *eie = NULL; struct extent_inode_elem *eie = NULL;
@ -920,6 +921,8 @@ again:
ret = ulist_add_merge(refs, ref->parent, ret = ulist_add_merge(refs, ref->parent,
(uintptr_t)ref->inode_list, (uintptr_t)ref->inode_list,
(u64 *)&eie, GFP_NOFS); (u64 *)&eie, GFP_NOFS);
if (ret < 0)
goto out;
if (!ret && extent_item_pos) { if (!ret && extent_item_pos) {
/* /*
* we've recorded that parent, so we must extend * we've recorded that parent, so we must extend
@ -930,7 +933,6 @@ again:
eie = eie->next; eie = eie->next;
eie->next = ref->inode_list; eie->next = ref->inode_list;
} }
BUG_ON(ret < 0);
} }
kfree(ref); kfree(ref);
} }