Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/doc', 'asoc/fix/fsl...

[karo-tx-linux.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index d3d558ba4da7966de9699aeb98b2630bd7c6854e..2a54c800a22391cbd78af02f2d9a70804519c815 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1568,6 +1568,7 @@ int fcntl_getlease(struct file *filp)
  *                         desired lease.
  * @dentry:    dentry to check
  * @arg:       type of lease that we're trying to acquire
+ * @flags:     current lock flags
  *
  * Check to see if there's an existing open fd on this file that would
  * conflict with the lease we're trying to set.