summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-05-11 16:09:32 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-07-18 19:17:19 -0400
commit6d34ac199a4af5c678a3a8f3275aeb2586b72da3 (patch)
tree4ab6cffcfe993baa0afb2ab361a8c94ebfc3a444 /include
parent370f6599e8bc03fd9fc6d1a1be00ae0c6373ca59 (diff)
downloadkernel-crypto-6d34ac199a4af5c678a3a8f3275aeb2586b72da3.tar.gz
kernel-crypto-6d34ac199a4af5c678a3a8f3275aeb2586b72da3.tar.xz
kernel-crypto-6d34ac199a4af5c678a3a8f3275aeb2586b72da3.zip
locks: make posix_test_lock() interface more consistent
Since posix_test_lock(), like fcntl() and ->lock(), indicates absence or presence of a conflict lock by setting fl_type to, respectively, F_UNLCK or something other than F_UNLCK, the return value is no longer needed. 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 b188c2e5338..80deaaf1b74 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -862,7 +862,7 @@ extern void locks_init_lock(struct file_lock *);
extern void locks_copy_lock(struct file_lock *, struct file_lock *);
extern void locks_remove_posix(struct file *, fl_owner_t);
extern void locks_remove_flock(struct file *);
-extern int posix_test_lock(struct file *, struct file_lock *);
+extern void posix_test_lock(struct file *, struct file_lock *);
extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *);
extern int posix_lock_file_wait(struct file *, struct file_lock *);
extern int posix_unblock_lock(struct file *, struct file_lock *);