2010-08-13 10:22:49

by Xiaotian Feng

Subject: [PATCH] workqueue: free rescuer on destroy_workqueue

wq->rescuer is not freed when wq is destroyed, leads a memory leak
then. This patch also remove a redundant line.

Signed-off-by: Xiaotian Feng <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Oleg Nesterov <[email protected]>
---
kernel/workqueue.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 2994a0e..1001b6e 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2782,7 +2782,6 @@ struct workqueue_struct *__alloc_workqueue_key(const char *name,
if (IS_ERR(rescuer->task))
goto err;

- wq->rescuer = rescuer;
rescuer->task->flags |= PF_THREAD_BOUND;
wake_up_process(rescuer->task);
}
@@ -2848,6 +2847,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
if (wq->flags & WQ_RESCUER) {
kthread_stop(wq->rescuer->task);
free_mayday_mask(wq->mayday_mask);
+ kfree(wq->rescuer);
}

free_cwqs(wq);
--
1.7.2.1

2010-08-16 07:58:56

by Tejun Heo

Subject: Re: [PATCH] workqueue: free rescuer on destroy_workqueue

On 08/13/2010 12:22 PM, Xiaotian Feng wrote:
> wq->rescuer is not freed when wq is destroyed, leads a memory leak
> then. This patch also remove a redundant line.
>
> Signed-off-by: Xiaotian Feng <[email protected]>
> Cc: Tejun Heo <[email protected]>
> Cc: Oleg Nesterov <[email protected]>

Applied to wq#for-linus. Thanks.

--
tejun