merge task_work and rcu_head, get rid of separate allocation for keyring case

task_work and rcu_head are identical now; merge them (calling the result
struct callback_head, rcu_head #define'd to it), kill separate allocation
in security/keys since we can just use cred->rcu now.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 9 insertions, 9 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index d1dd54734ce7..814c9ef6bba1 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -781,7 +781,7 @@ static void wake_threads_waitq(struct irq_desc *desc)
                 wake_up(&desc->wait_for_threads);
 }
 
-static void irq_thread_dtor(struct task_work *unused)
+static void irq_thread_dtor(struct callback_head *unused)
 {
         struct task_struct *tsk = current;
         struct irq_desc *desc;
@@ -813,7 +813,7 @@ static void irq_thread_dtor(struct task_work *unused)
  */
 static int irq_thread(void *data)
 {
-        struct task_work on_exit_work;
+        struct callback_head on_exit_work;
         static const struct sched_param param = {
                 .sched_priority = MAX_USER_RT_PRIO/2,
         };
diff --git a/kernel/task_work.c b/kernel/task_work.c
index 9b8948dbdc60..76266fb665dc 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
@@ -3,7 +3,7 @@
 #include <linux/tracehook.h>
 
 int
-task_work_add(struct task_struct *task, struct task_work *twork, bool notify)
+task_work_add(struct task_struct *task, struct callback_head *twork, bool notify)
 {
         unsigned long flags;
         int err = -ESRCH;
@@ -19,8 +19,8 @@ task_work_add(struct task_struct *task, struct task_work *twork, bool notify)
          */
         raw_spin_lock_irqsave(&task->pi_lock, flags);
         if (likely(!(task->flags & PF_EXITING))) {
-                struct task_work *last = task->task_works;
-                struct task_work *first = last ? last->next : twork;
+                struct callback_head *last = task->task_works;
+                struct callback_head *first = last ? last->next : twork;
                 twork->next = first;
                 if (last)
                         last->next = twork;
@@ -35,16 +35,16 @@ task_work_add(struct task_struct *task, struct task_work *twork, bool notify)
         return err;
 }
 
-struct task_work *
+struct callback_head *
 task_work_cancel(struct task_struct *task, task_work_func_t func)
 {
         unsigned long flags;
-        struct task_work *last, *res = NULL;
+        struct callback_head *last, *res = NULL;
 
         raw_spin_lock_irqsave(&task->pi_lock, flags);
         last = task->task_works;
         if (last) {
-                struct task_work *q = last, *p = q->next;
+                struct callback_head *q = last, *p = q->next;
                 while (1) {
                         if (p->func == func) {
                                 q->next = p->next;
@@ -66,7 +66,7 @@ task_work_cancel(struct task_struct *task, task_work_func_t func)
 void task_work_run(void)
 {
         struct task_struct *task = current;
-        struct task_work *p, *q;
+        struct callback_head *p, *q;
 
         raw_spin_lock_irq(&task->pi_lock);
         p = task->task_works;