Browse Source

[PATCH] BUG_ON() Conversion in fs/configfs/

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: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Eric Sesterhenn / snakebyte 19 years ago
parent
commit
1a1974fd45
2 changed files with 2 additions and 4 deletions
  1. 1 2
      fs/configfs/inode.c
  2. 1 2
      fs/configfs/symlink.c

+ 1 - 2
fs/configfs/inode.c

@@ -196,8 +196,7 @@ const unsigned char * configfs_get_name(struct configfs_dirent *sd)
 {
 {
 	struct configfs_attribute *attr;
 	struct configfs_attribute *attr;
 
 
-	if (!sd || !sd->s_element)
-		BUG();
+	BUG_ON(!sd || !sd->s_element);
 
 
 	/* These always have a dentry, so use that */
 	/* These always have a dentry, so use that */
 	if (sd->s_type & (CONFIGFS_DIR | CONFIGFS_ITEM_LINK))
 	if (sd->s_type & (CONFIGFS_DIR | CONFIGFS_ITEM_LINK))

+ 1 - 2
fs/configfs/symlink.c

@@ -162,8 +162,7 @@ int configfs_unlink(struct inode *dir, struct dentry *dentry)
 	if (!(sd->s_type & CONFIGFS_ITEM_LINK))
 	if (!(sd->s_type & CONFIGFS_ITEM_LINK))
 		goto out;
 		goto out;
 
 
-	if (dentry->d_parent == configfs_sb->s_root)
-		BUG();
+	BUG_ON(dentry->d_parent == configfs_sb->s_root);
 
 
 	sl = sd->s_element;
 	sl = sd->s_element;