summaryrefslogtreecommitdiffstats
path: root/fs/locks.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2014-02-03 12:13:09 -0500
committerJeff Layton <jlayton@redhat.com>2014-03-31 08:24:43 -0400
commitc1e62b8fc355e0c3706f1ae0dacb72d1c514dc80 (patch)
tree67167d2ae9569d83d08edda65aa047faf21500e1 /fs/locks.c
parent3fd80cddc6af5ba53244514a61450d4b30a9fb9d (diff)
downloadlinux-c1e62b8fc355e0c3706f1ae0dacb72d1c514dc80.tar.gz
linux-c1e62b8fc355e0c3706f1ae0dacb72d1c514dc80.tar.bz2
linux-c1e62b8fc355e0c3706f1ae0dacb72d1c514dc80.zip
locks: pass the cmd value to fcntl_getlk/getlk64
Once we introduce file private locks, we'll need to know what cmd value was used, as that affects the ownership and whether a conflict would arise. Signed-off-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'fs/locks.c')
-rw-r--r--fs/locks.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c
index 57f1d5fc876a..442052b413af 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1898,7 +1898,7 @@ static void posix_lock_to_flock64(struct flock64 *flock, struct file_lock *fl)
/* Report the first existing lock that would conflict with l.
* This implements the F_GETLK command of fcntl().
*/
-int fcntl_getlk(struct file *filp, struct flock __user *l)
+int fcntl_getlk(struct file *filp, unsigned int cmd, struct flock __user *l)
{
struct file_lock file_lock;
struct flock flock;
@@ -2066,7 +2066,7 @@ out:
/* Report the first existing lock that would conflict with l.
* This implements the F_GETLK command of fcntl().
*/
-int fcntl_getlk64(struct file *filp, struct flock64 __user *l)
+int fcntl_getlk64(struct file *filp, unsigned int cmd, struct flock64 __user *l)
{
struct file_lock file_lock;
struct flock64 flock;