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

[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

fs/locks.c

+3 −12
Original line number Diff line number Diff line
@@ -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);