Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[~andy/linux] / security / keys / request_key_auth.c

diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index 60d4e3f5e4bb21373900fb4cedb0907f61f68ea1..85730d5a5a59a05c852b3d22c586778b117589fa 100644 (file)
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -19,7 +19,8 @@
 #include <asm/uaccess.h>
 #include "internal.h"
 
-static int request_key_auth_instantiate(struct key *, const void *, size_t);
+static int request_key_auth_instantiate(struct key *,
+                                       struct key_preparsed_payload *);
 static void request_key_auth_describe(const struct key *, struct seq_file *);
 static void request_key_auth_revoke(struct key *);
 static void request_key_auth_destroy(struct key *);
@@ -42,10 +43,9 @@ struct key_type key_type_request_key_auth = {
  * Instantiate a request-key authorisation key.
  */
 static int request_key_auth_instantiate(struct key *key,
-                                       const void *data,
-                                       size_t datalen)
+                                       struct key_preparsed_payload *prep)
 {
-       key->payload.data = (struct request_key_auth *) data;
+       key->payload.data = (struct request_key_auth *)prep->data;
        return 0;
 }