瀏覽代碼

BUG_ON() Conversion in fs/inode.c

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

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Eric Sesterhenn 19 年之前
父節點
當前提交
b7542f8c7e
共有 1 個文件被更改,包括 5 次插入10 次删除
  1. 5 10
      fs/inode.c

+ 5 - 10
fs/inode.c

@@ -172,8 +172,7 @@ static struct inode *alloc_inode(struct super_block *sb)
 
 
 void destroy_inode(struct inode *inode) 
 void destroy_inode(struct inode *inode) 
 {
 {
-	if (inode_has_buffers(inode))
-		BUG();
+	BUG_ON(inode_has_buffers(inode));
 	security_inode_free(inode);
 	security_inode_free(inode);
 	if (inode->i_sb->s_op->destroy_inode)
 	if (inode->i_sb->s_op->destroy_inode)
 		inode->i_sb->s_op->destroy_inode(inode);
 		inode->i_sb->s_op->destroy_inode(inode);
@@ -249,12 +248,9 @@ void clear_inode(struct inode *inode)
 	might_sleep();
 	might_sleep();
 	invalidate_inode_buffers(inode);
 	invalidate_inode_buffers(inode);
        
        
-	if (inode->i_data.nrpages)
-		BUG();
-	if (!(inode->i_state & I_FREEING))
-		BUG();
-	if (inode->i_state & I_CLEAR)
-		BUG();
+	BUG_ON(inode->i_data.nrpages);
+	BUG_ON(!(inode->i_state & I_FREEING));
+	BUG_ON(inode->i_state & I_CLEAR);
 	wait_on_inode(inode);
 	wait_on_inode(inode);
 	DQUOT_DROP(inode);
 	DQUOT_DROP(inode);
 	if (inode->i_sb && inode->i_sb->s_op->clear_inode)
 	if (inode->i_sb && inode->i_sb->s_op->clear_inode)
@@ -1054,8 +1050,7 @@ void generic_delete_inode(struct inode *inode)
 	hlist_del_init(&inode->i_hash);
 	hlist_del_init(&inode->i_hash);
 	spin_unlock(&inode_lock);
 	spin_unlock(&inode_lock);
 	wake_up_inode(inode);
 	wake_up_inode(inode);
-	if (inode->i_state != I_CLEAR)
-		BUG();
+	BUG_ON(inode->i_state != I_CLEAR);
 	destroy_inode(inode);
 	destroy_inode(inode);
 }
 }