KEYS: Merge the type-specific data with the payload data

[mirror_ubuntu-artful-kernel.git] / net / ceph / crypto.c

diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index 4440edcce0d6c0fd427fe5e5b456dd67de7e8e52..42e8649c6e79b4950531f0027f2e67820377c066 100644 (file)
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -537,7 +537,7 @@ static int ceph_key_preparse(struct key_preparsed_payload *prep)
        if (ret < 0)
                goto err_ckey;
 
-       prep->payload[0] = ckey;
+       prep->payload.data[0] = ckey;
        prep->quotalen = datalen;
        return 0;
 
@@ -549,14 +549,14 @@ err:
 
 static void ceph_key_free_preparse(struct key_preparsed_payload *prep)
 {
-       struct ceph_crypto_key *ckey = prep->payload[0];
+       struct ceph_crypto_key *ckey = prep->payload.data[0];
        ceph_crypto_key_destroy(ckey);
        kfree(ckey);
 }
 
 static void ceph_key_destroy(struct key *key)
 {
-       struct ceph_crypto_key *ckey = key->payload.data;
+       struct ceph_crypto_key *ckey = key->payload.data[0];
 
        ceph_crypto_key_destroy(ckey);
        kfree(ckey);