aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorEric Sesterhenn / snakebyte <snakebyte@gmx.de>2006-01-27 10:32:24 +0100
committerMark Fasheh <mark.fasheh@oracle.com>2006-02-03 14:03:09 -0800
commit1a1974fd4533afdb73873cdacb942d9a79ff7c9b (patch)
tree2ca6e62b007f54a4b4d755bb98ad9692e4547395 /fs
parent3d0f89bb169482d26d5aa4e82e763077e7e9bc4d (diff)
downloadlinux-stericsson-1a1974fd4533afdb73873cdacb942d9a79ff7c9b.tar.gz
[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>
Diffstat (limited to 'fs')
-rw-r--r--fs/configfs/inode.c3
-rw-r--r--fs/configfs/symlink.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index 737842f2764b..c153bd9534cb 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -196,8 +196,7 @@ const unsigned char * configfs_get_name(struct configfs_dirent *sd)
{
struct configfs_attribute *attr;
- if (!sd || !sd->s_element)
- BUG();
+ BUG_ON(!sd || !sd->s_element);
/* These always have a dentry, so use that */
if (sd->s_type & (CONFIGFS_DIR | CONFIGFS_ITEM_LINK))
diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c
index 99137026b409..e5512e295cf2 100644
--- a/fs/configfs/symlink.c
+++ b/fs/configfs/symlink.c
@@ -162,8 +162,7 @@ int configfs_unlink(struct inode *dir, struct dentry *dentry)
if (!(sd->s_type & CONFIGFS_ITEM_LINK))
goto out;
- if (dentry->d_parent == configfs_sb->s_root)
- BUG();
+ BUG_ON(dentry->d_parent == configfs_sb->s_root);
sl = sd->s_element;