Commit:     6924c55492c904695f13c552c461c2211f4fdd6a
Parent:     6d34ac199a4af5c678a3a8f3275aeb2586b72da3
Author:     J. Bruce Fields <[EMAIL PROTECTED]>
AuthorDate: Fri May 11 16:22:50 2007 -0400
Committer:  J. Bruce Fields <[EMAIL PROTECTED]>
CommitDate: Wed Jul 18 19:17:19 2007 -0400

    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" <[EMAIL PROTECTED]>
 fs/locks.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fs/locks.c b/fs/locks.c
index 4a80727..4f2d749 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1600,8 +1600,7 @@ asmlinkage long sys_flock(unsigned int fd, unsigned int 
  * 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.
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to