Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[mirror_ubuntu-zesty-kernel.git] / fs / cifs / cifsacl.c

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 2ee5c54797fa72633608eefd33dbe7fbfda27b58..fc783e264420a890751aa81e819fc8b53aaa1a81 100644 (file)
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -167,17 +167,17 @@ static struct shrinker cifs_shrinker = {
 };
 
 static int
-cifs_idmap_key_instantiate(struct key *key, const void *data, size_t datalen)
+cifs_idmap_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
 {
        char *payload;
 
-       payload = kmalloc(datalen, GFP_KERNEL);
+       payload = kmalloc(prep->datalen, GFP_KERNEL);
        if (!payload)
                return -ENOMEM;
 
-       memcpy(payload, data, datalen);
+       memcpy(payload, prep->data, prep->datalen);
        key->payload.data = payload;
-       key->datalen = datalen;
+       key->datalen = prep->datalen;
        return 0;
 }