Messages in this thread Patch in this message | | | From | Petr Mladek <> | Subject | [PATCH v4 12/22] kthread: Use try_lock_kthread_work() in flush_kthread_work() | Date | Mon, 25 Jan 2016 16:45:01 +0100 |
| |
Remove code duplication and use the new try_lock_kthread_work() function in flush_kthread_work() as well.
Signed-off-by: Petr Mladek <pmladek@suse.com> --- kernel/kthread.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/kernel/kthread.c b/kernel/kthread.c index 53c4d5a7c723..7193582fe299 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -956,16 +956,12 @@ void flush_kthread_work(struct kthread_work *work) struct kthread_worker *worker; bool noop = false; -retry: - worker = work->worker; - if (!worker) + local_irq_disable(); + if (!try_lock_kthread_work(work, false)) { + local_irq_enable(); return; - - spin_lock_irq(&worker->lock); - if (work->worker != worker) { - spin_unlock_irq(&worker->lock); - goto retry; } + worker = work->worker; if (!list_empty(&work->node)) insert_kthread_work(worker, &fwork.work, work->node.next); -- 1.8.5.6
| |