[patch 16/17] Usr WARN() in fs/sysfs

Arjan van de Ven
2008-07-08T16:58:47Z

From: Arjan van de Ven <arjan@linux.intel.com>
Subject: Use WARN() instead of printk+WARN_ON in fs/sysfs

Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.
Also, with this, one fo the if() sections collapses entirely into
the WARN().

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
---
fs/sysfs/dir.c | 5 +----
fs/sysfs/file.c | 3 +--
fs/sysfs/group.c | 3 +--
3 files changed, 3 insertions(+), 8 deletions(-)

Index: linux.trees.git/fs/sysfs/dir.c
===================================================================
--- linux.trees.git.orig/fs/sysfs/dir.c
+++ linux.trees.git/fs/sysfs/dir.c
@@ -459,11 +459,8 @@ int sysfs_add_one(struct sysfs_addrm_cxt
int ret;

ret = __sysfs_add_one(acxt, sd);
- if (ret == -EEXIST) {
- printk(KERN_WARNING "sysfs: duplicate filename '%s' "
+ WARN(ret == -EEXIST, KERN_WARNING "sysfs: duplicate filename '%s' "
"can not be created\n", sd->s_name);
- WARN_ON(1);
- }
return ret;
}

Index: linux.trees.git/fs/sysfs/file.c
===================================================================
--- linux.trees.git.orig/fs/sysfs/file.c
+++ linux.trees.git/fs/sysfs/file.c
@@ -350,9 +350,8 @@ static int sysfs_open_file(struct inode
if (kobj->ktype && kobj->ktype->sysfs_ops)
ops = kobj->ktype->sysfs_ops;
else {
- printk(KERN_ERR "missing sysfs attribute operations for "
+ WARN(1, KERN_ERR "missing sysfs attribute operations for "
"kobject: %s\n", kobject_name(kobj));
- WARN_ON(1);
goto err_out;
}

Index: linux.trees.git/fs/sysfs/group.c
===================================================================
--- linux.trees.git.orig/fs/sysfs/group.c
+++ linux.trees.git/fs/sysfs/group.c
@@ -134,9 +134,8 @@ void sysfs_remove_group(struct kobject *
if (grp->name) {
sd = sysfs_get_dirent(dir_sd, grp->name);
if (!sd) {
- printk(KERN_WARNING "sysfs group %p not found for "
+ WARN(!sd, KERN_WARNING "sysfs group %p not found for "
"kobject '%s'\n", grp, kobject_name(kobj));
- WARN_ON(!sd);
return;
}
} else