Commit 6dc0fe8f authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

[PATCH] VFS,fs/locks.c: cleanup locks_insert_block 



BUG instead of handling a case that should never happen.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fa3536cc

fs/locks.c

+1 −6
Original line number Diff line number Diff line
@@ -533,12 +533,7 @@ static void locks_delete_block(struct file_lock *waiter) 
static void locks_insert_block(struct file_lock *blocker, 

			       struct file_lock *waiter)

{

	if (!list_empty(&waiter->fl_block)) {

		printk(KERN_ERR "locks_insert_block: removing duplicated lock "

			"(pid=%d %Ld-%Ld type=%d)\n", waiter->fl_pid,

			waiter->fl_start, waiter->fl_end, waiter->fl_type);

		__locks_delete_block(waiter);

	}

	BUG_ON(!list_empty(&waiter->fl_block));

	list_add_tail(&waiter->fl_block, &blocker->fl_block);

	waiter->fl_next = blocker;

	if (IS_POSIX(blocker))