From e468abb705bc34b0e8e5bcd406796c54410a10b7 Mon Sep 17 00:00:00 2001
From: Eric Sesterhenn / snakebyte <snakebyte@gmx.de>
Date: Fri, 27 Jan 2006 10:32:24 +0100
Subject: [PATCH] --- yaml --- r: 19719 b: refs/heads/master c:
 1a1974fd4533afdb73873cdacb942d9a79ff7c9b h: refs/heads/master i:   19717:
 ee8ca6dfbe1c54ca7ce16e8c9373b6de06d1fc55   19715:
 ec1baea6e07dd75a68cac23a9531ee6b28bf69f1   19711:
 50248d81cf2bd0d329cff757464c69e4168b8091 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/configfs/inode.c   | 3 +--
 trunk/fs/configfs/symlink.c | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dd4556e584ad..251a15b976b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d0f89bb169482d26d5aa4e82e763077e7e9bc4d
+refs/heads/master: 1a1974fd4533afdb73873cdacb942d9a79ff7c9b
diff --git a/trunk/fs/configfs/inode.c b/trunk/fs/configfs/inode.c
index 737842f2764b..c153bd9534cb 100644
--- a/trunk/fs/configfs/inode.c
+++ b/trunk/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/trunk/fs/configfs/symlink.c b/trunk/fs/configfs/symlink.c
index 99137026b409..e5512e295cf2 100644
--- a/trunk/fs/configfs/symlink.c
+++ b/trunk/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;