diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
| commit | fced6dee29f6fb143fe16ea90331176ff77e6120 (patch) | |
| tree | 5b6e57e7a757adc2a6518ce291a4d2914397b917 /security/selinux/hooks.c | |
| parent | bfed1074f213051e94648bfad0d0611a16d81366 (diff) | |
| parent | be1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (diff) | |
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
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, | |||
| 3317 | case F_GETLK: | 3317 | case F_GETLK: |
| 3318 | case F_SETLK: | 3318 | case F_SETLK: |
| 3319 | case F_SETLKW: | 3319 | case F_SETLKW: |
| 3320 | case F_GETLKP: | 3320 | case F_OFD_GETLK: |
| 3321 | case F_SETLKP: | 3321 | case F_OFD_SETLK: |
| 3322 | case F_SETLKPW: | 3322 | case F_OFD_SETLKW: |
| 3323 | #if BITS_PER_LONG == 32 | 3323 | #if BITS_PER_LONG == 32 |
| 3324 | case F_GETLK64: | 3324 | case F_GETLK64: |
| 3325 | case F_SETLK64: | 3325 | case F_SETLK64: |