From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Fri, 11 May 2007 20:22:50 +0000 (-0400)
Subject: locks: fix vfs_test_lock() comment
X-Git-Tag: v2.6.23-rc1~482^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6924c55492c904695f13c552c461c2211f4fdd6a;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/fs/locks.c b/fs/locks.c
index 4a8072736ef..4f2d749ac62 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.