forked from Minki/linux
[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>
This commit is contained in:
parent
fa3536cc14
commit
6dc0fe8f8b
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user