diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2006-03-26 11:37:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 18:56:56 +0200 |
| commit | 6dc0fe8f8b40854982929e4f24d8c65115769b60 (patch) | |
| tree | a3489bf4765799778238e1fee3de71ec6a0e1d73 | |
| parent | [PATCH] Use __read_mostly on some hot fs variables (diff) | |
| download | linux-6dc0fe8f8b40854982929e4f24d8c65115769b60.tar.xz linux-6dc0fe8f8b40854982929e4f24d8c65115769b60.zip | |
[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>
| -rw-r--r-- | fs/locks.c | 7 |
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)) |