GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 14:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Al Viro 2012-06-27 11:07:19 +04:00
parent 158e1645e0
commit 67d1214551
8 changed files with 31 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/task_work.c
View file

@ -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;