Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e0af86f authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

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: default avatarAndy Adamson <andros@citi.umich.edu>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a85f193e

fs/locks.c

+0 −15
Original line number Diff line number Diff line
@@ -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

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -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);