- block = nlmsvc_create_block(rqstp, nlm_get_host(host), file,
- lock, cookie);
+ block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
lock->fl.fl_flags &= ~FL_SLEEP;
dprintk("lockd: vfs_lock_file returned %d\n", error);
lock->fl.fl_flags &= ~FL_SLEEP;
dprintk("lockd: vfs_lock_file returned %d\n", error);
block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
if (block == NULL) {
kfree(conf);
block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
if (block == NULL) {
kfree(conf);
/* if the block is not on a list at this point then it has
* been invalidated. Don't try to requeue it.
*
/* if the block is not on a list at this point then it has
* been invalidated. Don't try to requeue it.
*
/* Technically, we should down the file semaphore here. Since we
* move the block towards the head of the queue only, no harm
/* Technically, we should down the file semaphore here. Since we
* move the block towards the head of the queue only, no harm
}
nlmsvc_insert_block(block, timeout);
svc_wake_up(block->b_daemon);
}
nlmsvc_insert_block(block, timeout);
svc_wake_up(block->b_daemon);