diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-07 13:39:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-07 13:39:22 +0200 |
| commit | 37b16beaa92860c378273ccdcc2ccb22c6cee047 (patch) | |
| tree | 4fc7f879c32d11d318f411dbe128d080ed8478f9 /security/selinux/hooks.c | |
| parent | 3e46d21285577a8c9e4c37f9b1002e567c440b28 (diff) | |
| parent | a4b4f11b2783ec678cccb4ce7e4ce9665aa04a24 (diff) | |
Merge branch 'perf/urgent' into perf/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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: |