[patch 17/17] Use WARN() in fs/proc/

[Arjan van de Ven]

From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Subject: Use WARN() instead of printk+WARN_ON() in fs/procfs

Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.
This way, the entire if() {} section can collapse into the WARN() as well.

Signed-off-by: Arjan van de VenIndex: linux.trees.git/fs/proc/generic.c
===================================================================
---
 fs/proc/generic.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Index: linux.trees.git/fs/proc/generic.c
===================================================================
--- linux.trees.git.orig/fs/proc/generic.c
+++ linux.trees.git/fs/proc/generic.c
@@ -792,12 +792,9 @@ continue_removing:
 	if (S_ISDIR(de->mode))
 		parent->nlink--;
 	de->nlink = 0;
-	if (de->subdir) {
-		printk(KERN_WARNING "%s: removing non-empty directory "
+	WARN(de->subdir, KERN_WARNING "%s: removing non-empty directory "
 			"'%s/%s', leaking at least '%s'\n", __func__,
 			de->parent->name, de->name, de->subdir->name);
-		WARN_ON(1);
-	}
 	if (atomic_dec_and_test(&de->count))
 		free_proc_entry(de);
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/