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

BUG instead of handling a case that should never happen.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 6 deletions

diff --git a/fs/locks.c b/fs/locks.c
index 709450a7b89d..4badf6a0e7b6 100644
--- a/fs/locks.c
+++ b/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))