Merge tag 'keys-misc-20190619' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...

[sfrench/cifs-2.6.git] / include / linux / key.h

diff --git a/include/linux/key.h b/include/linux/key.h
index 1c8b88b455ef7d40cbb61228856379d83405884a..8b297b94bfb3ad9274ef590979fe13160c75d3d5 100644 (file)
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -305,6 +305,11 @@ extern int key_update(key_ref_t key,
 extern int key_link(struct key *keyring,
                    struct key *key);
 
+extern int key_move(struct key *key,
+                   struct key *from_keyring,
+                   struct key *to_keyring,
+                   unsigned int flags);
+
 extern int key_unlink(struct key *keyring,
                      struct key *key);
 
@@ -397,8 +402,8 @@ extern struct ctl_table key_sysctls[];
  * the userspace interface
  */
 extern int install_thread_keyring_to_cred(struct cred *cred);
-extern void key_fsuid_changed(struct task_struct *tsk);
-extern void key_fsgid_changed(struct task_struct *tsk);
+extern void key_fsuid_changed(struct cred *new_cred);
+extern void key_fsgid_changed(struct cred *new_cred);
 extern void key_init(void);
 
 #else /* CONFIG_KEYS */
@@ -413,8 +418,8 @@ extern void key_init(void);
 #define make_key_ref(k, p)             NULL
 #define key_ref_to_ptr(k)              NULL
 #define is_key_possessed(k)            0
-#define key_fsuid_changed(t)           do { } while(0)
-#define key_fsgid_changed(t)           do { } while(0)
+#define key_fsuid_changed(c)           do { } while(0)
+#define key_fsgid_changed(c)           do { } while(0)
 #define key_init()                     do { } while(0)
 
 #endif /* CONFIG_KEYS */