From: Adrian Bunk We can now make posix_locks_deadlock() static. Signed-off-by: Adrian Bunk Cc: Trond Myklebust Signed-off-by: Andrew Morton --- fs/locks.c | 4 +--- include/linux/fs.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff -puN fs/locks.c~fs-locksc-make-posix_locks_deadlock-static fs/locks.c --- devel/fs/locks.c~fs-locksc-make-posix_locks_deadlock-static 2006-03-11 02:45:50.000000000 -0800 +++ devel-akpm/fs/locks.c 2006-03-11 02:45:50.000000000 -0800 @@ -715,7 +715,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; @@ -734,8 +734,6 @@ next_task: 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 -puN include/linux/fs.h~fs-locksc-make-posix_locks_deadlock-static include/linux/fs.h --- devel/include/linux/fs.h~fs-locksc-make-posix_locks_deadlock-static 2006-03-11 02:45:50.000000000 -0800 +++ devel-akpm/include/linux/fs.h 2006-03-11 02:45:50.000000000 -0800 @@ -759,7 +759,6 @@ extern int posix_test_lock(struct file * 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); _