[PATCH] locks: don't panic

Don't panic!  Just BUG_ON().

Signed-off-by: Miklos Szeredi <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/locks.c b/fs/locks.c
index 4d9e71d43e7e2068eeef0859e20c8909d026ccc8..8fcfeb177a2ac89f5971ced7e2da7d2b726637f8 100644 (file)
--- 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);