diff options
| -rw-r--r-- | fs/locks.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c index 4a8072736e..4f2d749ac6 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
| @@ -1600,8 +1600,7 @@ asmlinkage long sys_flock(unsigned int fd, unsigned int cmd) | |||
| 1600 | /** | 1600 | /** |
| 1601 | * vfs_test_lock - test file byte range lock | 1601 | * vfs_test_lock - test file byte range lock |
| 1602 | * @filp: The file to test lock for | 1602 | * @filp: The file to test lock for |
| 1603 | * @fl: The lock to test | 1603 | * @fl: The lock to test; also used to hold result |
| 1604 | * @conf: Place to return a copy of the conflicting lock, if found | ||
| 1605 | * | 1604 | * |
| 1606 | * Returns -ERRNO on failure. Indicates presence of conflicting lock by | 1605 | * Returns -ERRNO on failure. Indicates presence of conflicting lock by |
| 1607 | * setting conf->fl_type to something other than F_UNLCK. | 1606 | * setting conf->fl_type to something other than F_UNLCK. |