diff options
-rw-r--r-- | fs/locks.c | 15 | ||||
-rw-r--r-- | include/linux/fs.h | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/fs/locks.c b/fs/locks.c index d2c5306e3db0..cb940b142c5f 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -1955,21 +1955,6 @@ void locks_remove_flock(struct file *filp) | |||
1955 | } | 1955 | } |
1956 | 1956 | ||
1957 | /** | 1957 | /** |
1958 | * posix_block_lock - blocks waiting for a file lock | ||
1959 | * @blocker: the lock which is blocking | ||
1960 | * @waiter: the lock which conflicts and has to wait | ||
1961 | * | ||
1962 | * lockd needs to block waiting for locks. | ||
1963 | */ | ||
1964 | void | ||
1965 | posix_block_lock(struct file_lock *blocker, struct file_lock *waiter) | ||
1966 | { | ||
1967 | locks_insert_block(blocker, waiter); | ||
1968 | } | ||
1969 | |||
1970 | EXPORT_SYMBOL(posix_block_lock); | ||
1971 | |||
1972 | /** | ||
1973 | * posix_unblock_lock - stop waiting for a file lock | 1958 | * posix_unblock_lock - stop waiting for a file lock |
1974 | * @filp: how the file was opened | 1959 | * @filp: how the file was opened |
1975 | * @waiter: the lock which was waiting | 1960 | * @waiter: the lock which was waiting |
diff --git a/include/linux/fs.h b/include/linux/fs.h index be21e860a9f2..b01482c721ae 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -757,7 +757,6 @@ extern void locks_remove_flock(struct file *); | |||
757 | extern struct file_lock *posix_test_lock(struct file *, struct file_lock *); | 757 | extern struct file_lock *posix_test_lock(struct file *, struct file_lock *); |
758 | extern int posix_lock_file(struct file *, struct file_lock *); | 758 | extern int posix_lock_file(struct file *, struct file_lock *); |
759 | extern int posix_lock_file_wait(struct file *, struct file_lock *); | 759 | extern int posix_lock_file_wait(struct file *, struct file_lock *); |
760 | extern void posix_block_lock(struct file_lock *, struct file_lock *); | ||
761 | extern int posix_unblock_lock(struct file *, struct file_lock *); | 760 | extern int posix_unblock_lock(struct file *, struct file_lock *); |
762 | extern int posix_locks_deadlock(struct file_lock *, struct file_lock *); | 761 | extern int posix_locks_deadlock(struct file_lock *, struct file_lock *); |
763 | extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl); | 762 | extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl); |