Commit 5ce29646 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds

[PATCH] locks: don't panic

Don't panic!  Just BUG_ON().
Signed-off-by: default avatarMiklos Szeredi <miklos@szeredi.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent da2e9e1f
...@@ -168,18 +168,9 @@ static void locks_release_private(struct file_lock *fl) ...@@ -168,18 +168,9 @@ static void locks_release_private(struct file_lock *fl)
/* Free a lock which is not in use. */ /* Free a lock which is not in use. */
static void locks_free_lock(struct file_lock *fl) static void locks_free_lock(struct file_lock *fl)
{ {
if (fl == NULL) { BUG_ON(waitqueue_active(&fl->fl_wait));
BUG(); BUG_ON(!list_empty(&fl->fl_block));
return; BUG_ON(!list_empty(&fl->fl_link));
}
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");
locks_release_private(fl); locks_release_private(fl);
kmem_cache_free(filelock_cache, fl); kmem_cache_free(filelock_cache, fl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment