diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-06-23 11:05:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 16:43:03 +0200 |
| commit | b0904e147f7cbe4be3b4dae49ddccd627bb66f16 (patch) | |
| tree | 81bb0e45d46a3bb038d953f616fd6e32d7ca5e4b | |
| parent | [PATCH] vfs: add lock owner argument to flush operation (diff) | |
| download | linux-b0904e147f7cbe4be3b4dae49ddccd627bb66f16.tar.xz linux-b0904e147f7cbe4be3b4dae49ddccd627bb66f16.zip | |
[PATCH] fs/locks.c: make posix_locks_deadlock() static
We can now make posix_locks_deadlock() static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/locks.c | 4 | ||||
| -rw-r--r-- | include/linux/fs.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/locks.c b/fs/locks.c index f8a634ac1121..1ad29c9b6252 100644 --- a/fs/locks.c +++ b/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 @@ 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 --git a/include/linux/fs.h b/include/linux/fs.h index 56d8bf0d0a77..dba4cbd157ee 100644 --- a/include/linux/fs.h +++ b/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); |