aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarc Eshel <eshel@almaden.ibm.com>2007-02-21 00:55:18 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-05-06 17:39:00 -0400
commit9d6a8c5c213e34c475e72b245a8eb709258e968c (patch)
tree96110535c2bd9485129c0753a9e0f012083b220f /include
parent70cc6487a4e08b8698c0e2ec935fb48d10490162 (diff)
locks: give posix_test_lock same interface as ->lock
posix_test_lock() and ->lock() do the same job but have gratuitously different interfaces. Modify posix_test_lock() so the two agree, simplifying some code in the process. Signed-off-by: Marc Eshel <eshel@almaden.ibm.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 86ec3f4a7da6..9e1ddffe3884 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -851,7 +851,7 @@ extern void locks_init_lock(struct file_lock *);
851extern void locks_copy_lock(struct file_lock *, struct file_lock *); 851extern void locks_copy_lock(struct file_lock *, struct file_lock *);
852extern void locks_remove_posix(struct file *, fl_owner_t); 852extern void locks_remove_posix(struct file *, fl_owner_t);
853extern void locks_remove_flock(struct file *); 853extern void locks_remove_flock(struct file *);
854extern int posix_test_lock(struct file *, struct file_lock *, struct file_lock *); 854extern int posix_test_lock(struct file *, struct file_lock *);
855extern int posix_lock_file_conf(struct file *, struct file_lock *, struct file_lock *); 855extern int posix_lock_file_conf(struct file *, struct file_lock *, struct file_lock *);
856extern int posix_lock_file(struct file *, struct file_lock *); 856extern int posix_lock_file(struct file *, struct file_lock *);
857extern int posix_lock_file_wait(struct file *, struct file_lock *); 857extern int posix_lock_file_wait(struct file *, struct file_lock *);