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

Arjan van de Ven
2008-07-08T16:57:35Z

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

Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
---
fs/buffer.c | 3 +--
fs/namespace.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

Index: linux.trees.git/fs/buffer.c
===================================================================
--- linux.trees.git.orig/fs/buffer.c
+++ linux.trees.git/fs/buffer.c
@@ -1214,8 +1214,7 @@ void __brelse(struct buffer_head * buf)
put_bh(buf);
return;
}
- printk(KERN_ERR "VFS: brelse: Trying to free free buffer\n");
- WARN_ON(1);
+ WARN(1, KERN_ERR "VFS: brelse: Trying to free free buffer\n");
}

/*
Index: linux.trees.git/fs/namespace.c
===================================================================
--- linux.trees.git.orig/fs/namespace.c
+++ linux.trees.git/fs/namespace.c
@@ -309,10 +309,9 @@ static void handle_write_count_underflow
*/
if ((atomic_read(&mnt->__mnt_writers) < 0) &&
!(mnt->mnt_flags & MNT_IMBALANCED_WRITE_COUNT)) {
- printk(KERN_DEBUG "leak detected on mount(%p) writers "
+ WARN(1, KERN_DEBUG "leak detected on mount(%p) writers "
"count: %d\n",
mnt, atomic_read(&mnt->__mnt_writers));
- WARN_ON(1);
/* use the flag to keep the dmesg spam down */
mnt->mnt_flags |= MNT_IMBALANCED_WRITE_COUNT;
}