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

Merge the type-specific data with the payload data into one four-word chunk
as it seems pointless to keep them separate.

Use user_key_payload() for accessing the payloads of overloaded
user-defined keys.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: linux-cifs@vger.kernel.org
cc: ecryptfs@vger.kernel.org
cc: linux-ext4@vger.kernel.org
cc: linux-f2fs-devel@lists.sourceforge.net
cc: linux-nfs@vger.kernel.org
cc: ceph-devel@vger.kernel.org
cc: linux-ima-devel@lists.sourceforge.net

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
index 1d510c11b100..5c52c79dea46 100644
--- a/fs/ext4/crypto_key.c
+++ b/fs/ext4/crypto_key.c
@@ -121,7 +121,7 @@ int _ext4_get_encryption_info(struct inode *inode)
         struct key *keyring_key = NULL;
         struct ext4_encryption_key *master_key;
         struct ext4_encryption_context ctx;
-        struct user_key_payload *ukp;
+        const struct user_key_payload *ukp;
         struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
         struct crypto_ablkcipher *ctfm;
         const char *cipher_str;
@@ -209,7 +209,7 @@ retry:
         }
         crypt_info->ci_keyring_key = keyring_key;
         BUG_ON(keyring_key->type != &key_type_logon);
-        ukp = ((struct user_key_payload *)keyring_key->payload.data);
+        ukp = user_key_payload(keyring_key);
         if (ukp->datalen != sizeof(struct ext4_encryption_key)) {
                 res = -EINVAL;
                 goto out;