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, 3 deletions

diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 5ba029e627cc..7b39260c7bba 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -86,7 +86,7 @@ ecryptfs_get_encrypted_key_payload_data(struct key *key)
 {
         if (key->type == &key_type_encrypted)
                 return (struct ecryptfs_auth_tok *)
-                        (&((struct encrypted_key_payload *)key->payload.data)->payload_data);
+                        (&((struct encrypted_key_payload *)key->payload.data[0])->payload_data);
         else
                 return NULL;
 }
@@ -117,8 +117,7 @@ ecryptfs_get_key_payload_data(struct key *key)
 
         auth_tok = ecryptfs_get_encrypted_key_payload_data(key);
         if (!auth_tok)
-                return (struct ecryptfs_auth_tok *)
-                        (((struct user_key_payload *)key->payload.data)->data);
+                return (struct ecryptfs_auth_tok *)user_key_payload(key)->data;
         else
                 return auth_tok;
 }