locks: remove unused posix_block_lock
posix_lock_file() is used to add a blocked lock to Lockd's block, so posix_block_lock() is no longer needed. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
a85f193e2f
commit
2e0af86f61
15
fs/locks.c
15
fs/locks.c
|
@ -1954,21 +1954,6 @@ void locks_remove_flock(struct file *filp)
|
|||
unlock_kernel();
|
||||
}
|
||||
|
||||
/**
|
||||
* posix_block_lock - blocks waiting for a file lock
|
||||
* @blocker: the lock which is blocking
|
||||
* @waiter: the lock which conflicts and has to wait
|
||||
*
|
||||
* lockd needs to block waiting for locks.
|
||||
*/
|
||||
void
|
||||
posix_block_lock(struct file_lock *blocker, struct file_lock *waiter)
|
||||
{
|
||||
locks_insert_block(blocker, waiter);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(posix_block_lock);
|
||||
|
||||
/**
|
||||
* posix_unblock_lock - stop waiting for a file lock
|
||||
* @filp: how the file was opened
|
||||
|
|
|
@ -757,7 +757,6 @@ extern void locks_remove_flock(struct file *);
|
|||
extern struct file_lock *posix_test_lock(struct file *, struct file_lock *);
|
||||
extern int posix_lock_file(struct file *, struct file_lock *);
|
||||
extern int posix_lock_file_wait(struct file *, struct file_lock *);
|
||||
extern void posix_block_lock(struct file_lock *, struct file_lock *);
|
||||
extern int posix_unblock_lock(struct file *, struct file_lock *);
|
||||
extern int posix_locks_deadlock(struct file_lock *, struct file_lock *);
|
||||
extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);
|
||||
|
|
Loading…
Reference in a new issue