---

yaml --- r: 24050 b: refs/heads/master c: 6dc0fe8 h: refs/heads/master v: v3
git-mirror · Mar 26, 2006 · a7b2da8 · a7b2da8
1 parent 7c467c4
commit a7b2da8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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))