From d22042d2117b78e16b06bab0880422c417007d37 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 16 Sep 2016 12:48:32 -0600 Subject: [PATCH] workqueue: kill SW_F_EXITED We don't use the flag, it's set but never tested. On exit, we use pthread_join() to wait for the thread to exit. Signed-off-by: Jens Axboe --- workqueue.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/workqueue.c b/workqueue.c index 2e01b584..013087e1 100644 --- a/workqueue.c +++ b/workqueue.c @@ -15,9 +15,8 @@ enum { SW_F_IDLE = 1 << 0, SW_F_RUNNING = 1 << 1, SW_F_EXIT = 1 << 2, - SW_F_EXITED = 1 << 3, - SW_F_ACCOUNTED = 1 << 4, - SW_F_ERROR = 1 << 5, + SW_F_ACCOUNTED = 1 << 3, + SW_F_ERROR = 1 << 4, }; static struct submit_worker *__get_submit_worker(struct workqueue *wq, @@ -131,7 +130,7 @@ static void *worker_thread(void *data) { struct submit_worker *sw = data; struct workqueue *wq = sw->wq; - unsigned int eflags = 0, ret = 0; + unsigned int ret = 0; FLIST_HEAD(local_list); sk_out_assign(sw->sk_out); @@ -206,9 +205,6 @@ handle_work: wq->ops.update_acct_fn(sw); done: - pthread_mutex_lock(&sw->lock); - sw->flags |= (SW_F_EXITED | eflags); - pthread_mutex_unlock(&sw->lock); sk_out_drop(); return NULL; } -- 2.25.1