* [PATCH] workqueue: free rescuer on destroy_workqueue
@ 2010-08-13 10:22 Xiaotian Feng
2010-08-16 7:55 ` Tejun Heo
0 siblings, 1 reply; 2+ messages in thread
From: Xiaotian Feng @ 2010-08-13 10:22 UTC (permalink / raw)
To: linux-kernel; +Cc: Xiaotian Feng, Tejun Heo, Oleg Nesterov
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 <dfeng@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] workqueue: free rescuer on destroy_workqueue
2010-08-13 10:22 [PATCH] workqueue: free rescuer on destroy_workqueue Xiaotian Feng
@ 2010-08-16 7:55 ` Tejun Heo
0 siblings, 0 replies; 2+ messages in thread
From: Tejun Heo @ 2010-08-16 7:55 UTC (permalink / raw)
To: Xiaotian Feng; +Cc: linux-kernel, Oleg Nesterov
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 <dfeng@redhat.com>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: Oleg Nesterov <oleg@redhat.com>
Applied to wq#for-linus. Thanks.
--
tejun
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-16 7:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-13 10:22 [PATCH] workqueue: free rescuer on destroy_workqueue Xiaotian Feng
2010-08-16 7:55 ` Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox