mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	BUG_ON() Conversion in fs/hfs/
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
		
							parent
							
								
									28133c7b2b
								
							
						
					
					
						commit
						4d4ef9abe3
					
				
					 2 changed files with 4 additions and 8 deletions
				
			
		| 
						 | 
				
			
			@ -306,8 +306,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--;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -415,8 +414,7 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num)
 | 
			
		|||
	spin_lock(&tree->hash_lock);
 | 
			
		||||
	node = hfs_bnode_findhash(tree, num);
 | 
			
		||||
	spin_unlock(&tree->hash_lock);
 | 
			
		||||
	if (node)
 | 
			
		||||
		BUG();
 | 
			
		||||
	BUG_ON(node);
 | 
			
		||||
	node = __hfs_bnode_create(tree, num);
 | 
			
		||||
	if (!node)
 | 
			
		||||
		return ERR_PTR(-ENOMEM);
 | 
			
		||||
| 
						 | 
				
			
			@ -459,8 +457,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++) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -36,8 +36,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
 | 
			
		|||
	tree->inode = iget_locked(sb, id);
 | 
			
		||||
	if (!tree->inode)
 | 
			
		||||
		goto free_tree;
 | 
			
		||||
	if (!(tree->inode->i_state & I_NEW))
 | 
			
		||||
		BUG();
 | 
			
		||||
	BUG_ON(!(tree->inode->i_state & I_NEW));
 | 
			
		||||
	{
 | 
			
		||||
	struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
 | 
			
		||||
	HFS_I(tree->inode)->flags = 0;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue