summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-05-11 22:22:50 +0200
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-07-19 01:17:19 +0200
commit6924c55492c904695f13c552c461c2211f4fdd6a (patch)
tree398f0717bedf7f533ad3e4eaeee7a441b3e67a74
parentlocks: make posix_test_lock() interface more consistent (diff)
downloadlinux-6924c55492c904695f13c552c461c2211f4fdd6a.tar.xz
linux-6924c55492c904695f13c552c461c2211f4fdd6a.zip
locks: fix vfs_test_lock() comment
Thanks to Doug Chapman for pointing out that the comment here is inconsistent with the function prototype. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
-rw-r--r--fs/locks.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c
index 4a8072736efa..4f2d749ac624 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1600,8 +1600,7 @@ asmlinkage long sys_flock(unsigned int fd, unsigned int cmd)
/**
* vfs_test_lock - test file byte range lock
* @filp: The file to test lock for
- * @fl: The lock to test
- * @conf: Place to return a copy of the conflicting lock, if found
+ * @fl: The lock to test; also used to hold result
*
* Returns -ERRNO on failure. Indicates presence of conflicting lock by
* setting conf->fl_type to something other than F_UNLCK.