From 9a5141ec5896528cc051e455053f27dbf9b9bd11 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 23 Jun 2006 02:05:13 -0700
Subject: [PATCH] --- yaml --- r: 29032 b: refs/heads/master c:
 b0904e147f7cbe4be3b4dae49ddccd627bb66f16 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7e49471611e4..6c1f07ac26fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e1fcc0b18df0a65ab113198e9dc0e98999a08c
+refs/heads/master: b0904e147f7cbe4be3b4dae49ddccd627bb66f16
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index f8a634ac1121..1ad29c9b6252 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -703,7 +703,7 @@ EXPORT_SYMBOL(posix_test_lock);
  * from a broken NFS client. But broken NFS clients have a lot more to
  * worry about than proper deadlock detection anyway... --okir
  */
-int posix_locks_deadlock(struct file_lock *caller_fl,
+static int posix_locks_deadlock(struct file_lock *caller_fl,
 				struct file_lock *block_fl)
 {
 	struct list_head *tmp;
@@ -722,8 +722,6 @@ int posix_locks_deadlock(struct file_lock *caller_fl,
 	return 0;
 }
 
-EXPORT_SYMBOL(posix_locks_deadlock);
-
 /* Try to create a FLOCK lock on filp. We always insert new FLOCK locks
  * at the head of the list, but that's secret knowledge known only to
  * flock_lock_file and posix_lock_file.
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 56d8bf0d0a77..dba4cbd157ee 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -776,7 +776,6 @@ extern int posix_lock_file_conf(struct file *, struct file_lock *, struct file_l
 extern int posix_lock_file(struct file *, struct file_lock *);
 extern int posix_lock_file_wait(struct file *, 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);
 extern int __break_lease(struct inode *inode, unsigned int flags);
 extern void lease_get_mtime(struct inode *, struct timespec *time);