From: Miklos Szeredi <miklos@szeredi.hu>
Date: Fri, 31 Mar 2006 10:30:29 +0000 (-0800)
Subject: [PATCH] locks: don't panic
X-Git-Tag: v2.6.17-rc1~100
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5ce29646ebe352587e3b3160d599010c5da1b9dd;p=~emulex%2Finfiniband.git

[PATCH] locks: don't panic

Don't panic!  Just BUG_ON().

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/locks.c b/fs/locks.c
index 4d9e71d43e7..8fcfeb177a2 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -168,18 +168,9 @@ static void locks_release_private(struct file_lock *fl)
 /* Free a lock which is not in use. */
 static void locks_free_lock(struct file_lock *fl)
 {
-	if (fl == NULL) {
-		BUG();
-		return;
-	}
-	if (waitqueue_active(&fl->fl_wait))
-		panic("Attempting to free lock with active wait queue");
-
-	if (!list_empty(&fl->fl_block))
-		panic("Attempting to free lock with active block list");
-
-	if (!list_empty(&fl->fl_link))
-		panic("Attempting to free lock on active lock list");
+	BUG_ON(waitqueue_active(&fl->fl_wait));
+	BUG_ON(!list_empty(&fl->fl_block));
+	BUG_ON(!list_empty(&fl->fl_link));
 
 	locks_release_private(fl);
 	kmem_cache_free(filelock_cache, fl);