From: Andy Adamson Date: Mon, 20 Mar 2006 18:44:26 +0000 (-0500) Subject: locks: remove unused posix_block_lock X-Git-Tag: v2.6.17-rc1~667^2~66 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e0af86f618c697b44e2d67dff151256c58201c4;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust --- diff --git a/fs/locks.c b/fs/locks.c index d2c5306..cb940b1 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1955,21 +1955,6 @@ void locks_remove_flock(struct file *filp) } /** - * 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 * @waiter: the lock which was waiting diff --git a/include/linux/fs.h b/include/linux/fs.h index be21e86..b01482c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -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);