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

Commit 0bf3ba53 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

BUG_ON() Conversion in fs/hfsplus/ 



this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 7dddb12c

fs/hfsplus/bnode.c

+2 −4
Original line number Diff line number Diff line
@@ -466,8 +466,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node) 
	for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)];

	     *p && *p != node; p = &(*p)->next_hash)

		;

	if (!*p)

		BUG();

	BUG_ON(!*p);

	*p = node->next_hash;

	node->tree->node_hash_cnt--;

}
@@ -622,8 +621,7 @@ void hfs_bnode_put(struct hfs_bnode *node) 


		dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n",

		       node->tree->cnid, node->this, atomic_read(&node->refcnt));

		if (!atomic_read(&node->refcnt))

			BUG();

		BUG_ON(!atomic_read(&node->refcnt));

		if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))

			return;

		for (i = 0; i < tree->pages_per_bnode; i++) {

fs/hfsplus/btree.c

+1 −2
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ void hfs_bmap_free(struct hfs_bnode *node) 
	u8 *data, byte, m;



	dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this);

	if (!node->this)

		BUG();

	BUG_ON(!node->this);

	tree = node->tree;

	nidx = node->this;

	node = hfs_bnode_find(tree, 0);