Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 205e550a authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

task_work: minor cleanups 



Trivial.  Remove the unnecessary "work = NULL" initialization and turn
read_barrier_depends() into smp_read_barrier_depends() in
task_work_cancel().

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 202da400

kernel/task_work.c

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct callback_head * 
task_work_cancel(struct task_struct *task, task_work_func_t func)

{

	struct callback_head **pprev = &task->task_works;

	struct callback_head *work = NULL;

	struct callback_head *work;

	unsigned long flags;

	/*

	 * If cmpxchg() fails we continue without updating pprev.
@@ -35,7 +35,7 @@ task_work_cancel(struct task_struct *task, task_work_func_t func) 
	 */

	raw_spin_lock_irqsave(&task->pi_lock, flags);

	while ((work = ACCESS_ONCE(*pprev))) {

		read_barrier_depends();

		smp_read_barrier_depends();

		if (work->func != func)

			pprev = &work->next;

		else if (cmpxchg(pprev, work, work->next) == work)