diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2008-07-25 22:45:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 15:00:07 -0400 |
commit | 5c752ad9f35910ff1912b3f3ae82878178ddc432 (patch) | |
tree | 4ac627f9cdd7f0e1b0557b9b5c4838587c1c0890 | |
parent | 5cd2b459d326a424671dcd95f038649f7bf7cb96 (diff) |
Use WARN() 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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/buffer.c | 3 | ||||
-rw-r--r-- | fs/namespace.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 5fd497cdd6f3..f95805019639 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -1214,8 +1214,7 @@ void __brelse(struct buffer_head * buf) | |||
1214 | put_bh(buf); | 1214 | put_bh(buf); |
1215 | return; | 1215 | return; |
1216 | } | 1216 | } |
1217 | printk(KERN_ERR "VFS: brelse: Trying to free free buffer\n"); | 1217 | WARN(1, KERN_ERR "VFS: brelse: Trying to free free buffer\n"); |
1218 | WARN_ON(1); | ||
1219 | } | 1218 | } |
1220 | 1219 | ||
1221 | /* | 1220 | /* |
diff --git a/fs/namespace.c b/fs/namespace.c index 4f6f7635b59c..f30b11e2240e 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -309,10 +309,9 @@ static void handle_write_count_underflow(struct vfsmount *mnt) | |||
309 | */ | 309 | */ |
310 | if ((atomic_read(&mnt->__mnt_writers) < 0) && | 310 | if ((atomic_read(&mnt->__mnt_writers) < 0) && |
311 | !(mnt->mnt_flags & MNT_IMBALANCED_WRITE_COUNT)) { | 311 | !(mnt->mnt_flags & MNT_IMBALANCED_WRITE_COUNT)) { |
312 | printk(KERN_DEBUG "leak detected on mount(%p) writers " | 312 | WARN(1, KERN_DEBUG "leak detected on mount(%p) writers " |
313 | "count: %d\n", | 313 | "count: %d\n", |
314 | mnt, atomic_read(&mnt->__mnt_writers)); | 314 | mnt, atomic_read(&mnt->__mnt_writers)); |
315 | WARN_ON(1); | ||
316 | /* use the flag to keep the dmesg spam down */ | 315 | /* use the flag to keep the dmesg spam down */ |
317 | mnt->mnt_flags |= MNT_IMBALANCED_WRITE_COUNT; | 316 | mnt->mnt_flags |= MNT_IMBALANCED_WRITE_COUNT; |
318 | } | 317 | } |