From 00b7f90fb366fe6da8890c6c59ba8d52da21f818 Mon Sep 17 00:00:00 2001
From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Sun, 2 Apr 2006 13:36:13 +0200
Subject: [PATCH] --- yaml --- r: 25215 b: refs/heads/master c:
 8abf6a4707cfb95ca552b882959c6f8ff9924270 h: refs/heads/master i:   25213:
 eefa4bd6579fc9e2ad9d9f167c4158a53e05c6a4   25211:
 1f7aa0cceac1cf2c6a99138e2ddcb5a691a6b369   25207:
 8ecfce7b6cf9f46675f3190016e9d414b2f2b84d   25199:
 d8c990898a1ea74f56162945db939500909279d9   25183:
 34121af7da7624f676f9dedfd1d282a94a047c0d   25151:
 4c9cdc87d713501aeb1f5ccc247d2408993c8ce5   25087:
 51d08bd9eeae8ea5aa4e70ac0429956f5e7ffdd8 v: v3

---
 [refs]           | 2 +-
 trunk/fs/dquot.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a9b181192532..0b82a77b1d45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6385483840e903d99cb753593faea215ae8d324
+refs/heads/master: 8abf6a4707cfb95ca552b882959c6f8ff9924270
diff --git a/trunk/fs/dquot.c b/trunk/fs/dquot.c
index 6b3886920939..81d87a413c68 100644
--- a/trunk/fs/dquot.c
+++ b/trunk/fs/dquot.c
@@ -590,8 +590,7 @@ static void dqput(struct dquot *dquot)
 	atomic_dec(&dquot->dq_count);
 #ifdef __DQUOT_PARANOIA
 	/* sanity check */
-	if (!list_empty(&dquot->dq_free))
-		BUG();
+	BUG_ON(!list_empty(&dquot->dq_free));
 #endif
 	put_dquot_last(dquot);
 	spin_unlock(&dq_list_lock);
@@ -666,8 +665,7 @@ static struct dquot *dqget(struct super_block *sb, unsigned int id, int type)
 		return NODQUOT;
 	}
 #ifdef __DQUOT_PARANOIA
-	if (!dquot->dq_sb)	/* Has somebody invalidated entry under us? */
-		BUG();
+	BUG_ON(!dquot->dq_sb);	/* Has somebody invalidated entry under us? */
 #endif
 
 	return dquot;