Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1723939 authored by Wang Shilong's avatar Wang Shilong Committed by Josef Bacik
Browse files

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: default avatarWang Shilong <wangsl-fnst@cn.fujitsu.com>
Reviewed-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Reviewed-by: default avatarJan Schmidt <list.btrfs@jan-o-sch.net>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 41b0fc42

fs/btrfs/backref.c

+4 −2
Original line number Diff line number Diff line
@@ -900,7 +900,8 @@ again: 
		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 @@ again: 
			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 @@ again: 
					eie = eie->next;

				eie->next = ref->inode_list;

			}

			BUG_ON(ret < 0);

		}

		kfree(ref);

	}