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

[linux.git] / include / keys / user-type.h

diff --git a/include/keys/user-type.h b/include/keys/user-type.h
index c56fef40f53efa474a57303f46f773863e2fa4b9..e098cbe27db5462f155a3a9c64169d3c68a549c5 100644 (file)
--- a/include/keys/user-type.h
+++ b/include/keys/user-type.h
@@ -48,9 +48,14 @@ extern void user_describe(const struct key *user, struct seq_file *m);
 extern long user_read(const struct key *key,
                      char __user *buffer, size_t buflen);
 
-static inline const struct user_key_payload *user_key_payload(const struct key *key)
+static inline const struct user_key_payload *user_key_payload_rcu(const struct key *key)
 {
-       return (struct user_key_payload *)rcu_dereference_key(key);
+       return (struct user_key_payload *)dereference_key_rcu(key);
+}
+
+static inline struct user_key_payload *user_key_payload_locked(const struct key *key)
+{
+       return (struct user_key_payload *)dereference_key_locked((struct key *)key);
 }
 
 #endif /* CONFIG_KEYS */