From 6640d8f34f2b8dbd49d8d02506b3b33fbabaeb60 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 23 Aug 2004 00:14:14 -0700 Subject: [PATCH] Fix posix file locking (7/9) VFS,CIFS,NLM,NFSv4: make filesystems directly responsible for calling posix_lock_file() if they need it. This fixes an NFS race whereby in case of a server reboot, the recovery thread could re-establish a lock that had just been freed. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds --- include/linux/fs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/linux') diff --git a/include/linux/fs.h b/include/linux/fs.h index 2413530b3591..f3af88a99290 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -690,6 +690,7 @@ extern void locks_remove_posix(struct file *, fl_owner_t); 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 void posix_unblock_lock(struct file *, struct file_lock *); extern int posix_locks_deadlock(struct file_lock *, struct file_lock *); -- cgit v1.2.3