Skip to content

Commit

Permalink
[PATCH] locks: don't panic
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Miklos Szeredi authored and Linus Torvalds committed Mar 31, 2006
1 parent da2e9e1 commit 5ce2964
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions fs/locks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5ce2964

Please sign in to comment.