From a7b2da847e2434753f815409d0361b51cd343ec5 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Sun, 26 Mar 2006 01:37:24 -0800 Subject: [PATCH] --- yaml --- r: 24050 b: refs/heads/master c: 6dc0fe8f8b40854982929e4f24d8c65115769b60 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/locks.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 641e34013b48..76bda6e721df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa3536cc144c1298f2ed9416c33f3b77fa2cd37a +refs/heads/master: 6dc0fe8f8b40854982929e4f24d8c65115769b60 diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c index 709450a7b89d..4badf6a0e7b6 100644 --- a/trunk/fs/locks.c +++ b/trunk/fs/locks.c @@ -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))