Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / security / keys / compat.c

diff --git a/security/keys/compat.c b/security/keys/compat.c
index aff8b22dcb5c7c9dcfbc412a95bb2c0be3e8092e..e10ec995f2751101d39a7dfbd145cd8ce52cc6ee 100644 (file)
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -1,6 +1,6 @@
 /* compat.c: 32-bit compatibility syscall for 64-bit systems
  *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2004-5 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
  *
  * This program is free software; you can redistribute it and/or
@@ -9,7 +9,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <linux/sched.h>
 #include <linux/syscalls.h>
 #include <linux/keyctl.h>
 #include <linux/compat.h>
@@ -24,7 +23,7 @@
  * - if you can, you should call sys_keyctl directly
  */
 asmlinkage long compat_sys_keyctl(u32 option,
-                             u32 arg2, u32 arg3, u32 arg4, u32 arg5)
+                                 u32 arg2, u32 arg3, u32 arg4, u32 arg5)
 {
        switch (option) {
        case KEYCTL_GET_KEYRING_ID:
@@ -71,6 +70,15 @@ asmlinkage long compat_sys_keyctl(u32 option,
        case KEYCTL_NEGATE:
                return keyctl_negate_key(arg2, arg3, arg4);
 
+       case KEYCTL_SET_REQKEY_KEYRING:
+               return keyctl_set_reqkey_keyring(arg2);
+
+       case KEYCTL_SET_TIMEOUT:
+               return keyctl_set_timeout(arg2, arg3);
+
+       case KEYCTL_ASSUME_AUTHORITY:
+               return keyctl_assume_authority(arg2);
+
        default:
                return -EOPNOTSUPP;
        }