diff options
author | Louis Rilling <louis.rilling@kerlabs.com> | 2009-12-04 14:52:42 +0100 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:37:22 +0200 |
commit | 6ace7773b07bb1949a54aad85e5c2f21b6c299d6 (patch) | |
tree | 4f132614c293bf97b2f807e2306ae1e870732a8a /block | |
parent | 36cea38d1ed7fb6d602913824bb75ceb42c0b4c0 (diff) |
block: Fix io_context leak after failure of clone with CLONE_IO
commit b69f2292063d2caf37ca9aec7d63ded203701bf3 upstream
With CLONE_IO, parent's io_context->nr_tasks is incremented, but never
decremented whenever copy_process() fails afterwards, which prevents
exit_io_context() from calling IO schedulers exit functions.
Give a task_struct to exit_io_context(), and call exit_io_context() instead of
put_io_context() in copy_process() cleanup path.
Signed-off-by: Louis Rilling <louis.rilling@kerlabs.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-ioc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/block/blk-ioc.c b/block/blk-ioc.c index dcd041290b28..cbdabb0dd6d7 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c @@ -66,14 +66,14 @@ static void cfq_exit(struct io_context *ioc) } /* Called by the exitting task */ -void exit_io_context(void) +void exit_io_context(struct task_struct *task) { struct io_context *ioc; - task_lock(current); - ioc = current->io_context; - current->io_context = NULL; - task_unlock(current); + task_lock(task); + ioc = task->io_context; + task->io_context = NULL; + task_unlock(task); if (atomic_dec_and_test(&ioc->nr_tasks)) { if (ioc->aic && ioc->aic->exit) |