From 19fa90b2bdf88ce81453dd6c739be242d0277e53 Mon Sep 17 00:00:00 2001
From: Andy Adamson <andros@citi.umich.edu>
Date: Mon, 20 Mar 2006 13:44:26 -0500
Subject: [PATCH] --- yaml --- r: 23893 b: refs/heads/master c:
 2e0af86f618c697b44e2d67dff151256c58201c4 h: refs/heads/master i:   23891:
 12100054e10f4e2b21adf15e7b668522a7e4e322 v: v3

---
 [refs]                   |  2 +-
 trunk/fs/locks.c         | 15 ---------------
 trunk/include/linux/fs.h |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index e2695563cbbb..3afa45517095 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a85f193e2fb7d53e48ae6a9d9ea990bfb4cea555
+refs/heads/master: 2e0af86f618c697b44e2d67dff151256c58201c4
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index d2c5306e3db0..cb940b142c5f 100644
--- a/trunk/fs/locks.c
+++ b/trunk/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
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index be21e860a9f2..b01482c721ae 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/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);