These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / ceph / crypto.c

diff --git a/kernel/net/ceph/crypto.c b/kernel/net/ceph/crypto.c
index 790fe89..42e8649 100644 (file)
--- a/kernel/net/ceph/crypto.c
+++ b/kernel/net/ceph/crypto.c
@@ -79,10 +79,6 @@ int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *inkey)
        return 0;
 }
 
-
-
-#define AES_KEY_SIZE 16
-
 static struct crypto_blkcipher *ceph_crypto_alloc_cipher(void)
 {
        return crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);
@@ -541,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;
 
@@ -553,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);