KEYS: Differentiate uses of rcu_dereference_key() and user_key_payload()

[mirror_ubuntu-artful-kernel.git] / fs / ecryptfs / ecryptfs_kernel.h

diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 599a29237cfea5e401ac2ab225b48df080240a3b..95c1c8d3453922be63c7c0d13e2bd8acd18d7e12 100644 (file)
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -117,7 +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 *)user_key_payload(key)->data;
+               return (struct ecryptfs_auth_tok *)user_key_payload_locked(key)->data;
        else
                return auth_tok;
 }