From 4c2b57aae1390dcdf6ce40712defa6f9491b5a31 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Fri, 25 Jul 2008 19:45:40 -0700 Subject: [PATCH] --- yaml --- r: 106202 b: refs/heads/master c: 5c752ad9f35910ff1912b3f3ae82878178ddc432 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/buffer.c | 3 +-- trunk/fs/namespace.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9a544a789fb6..a7e4b6eef779 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cd2b459d326a424671dcd95f038649f7bf7cb96 +refs/heads/master: 5c752ad9f35910ff1912b3f3ae82878178ddc432 diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c index 5fd497cdd6f3..f95805019639 100644 --- a/trunk/fs/buffer.c +++ b/trunk/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"); } /* diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c index 4f6f7635b59c..f30b11e2240e 100644 --- a/trunk/fs/namespace.c +++ b/trunk/fs/namespace.c @@ -309,10 +309,9 @@ static void handle_write_count_underflow(struct vfsmount *mnt) */ 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; }