diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:40:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:40:39 -0700 |
| commit | f379a071091b7ff0a7742ac5e02527897aeb8da4 (patch) | |
| tree | 7bc3c1b980db45f1c8a36cf2faf5423aeed7e173 /security/selinux/hooks.c | |
| parent | serial: sc16is7xx: fix implicit decl of func copy_{to,from}_user (diff) | |
| parent | Linux 3.15-rc3 (diff) | |
| download | wireguard-linux-f379a071091b7ff0a7742ac5e02527897aeb8da4.tar.xz wireguard-linux-f379a071091b7ff0a7742ac5e02527897aeb8da4.zip | |
Merge 3.15-rc3 into tty-next
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index b4beb77967b1..2c7341dbc5d6 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -3317,9 +3317,9 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd, case F_GETLK: case F_SETLK: case F_SETLKW: - case F_GETLKP: - case F_SETLKP: - case F_SETLKPW: + case F_OFD_GETLK: + case F_OFD_SETLK: + case F_OFD_SETLKW: #if BITS_PER_LONG == 32 case F_GETLK64: case F_SETLK64: |