diff options
| author | Louis Rilling <louis.rilling@kerlabs.com> | 2009-12-04 14:52:42 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-04 16:36:18 +0100 |
| commit | b69f2292063d2caf37ca9aec7d63ded203701bf3 (patch) | |
| tree | be4acb81ea4ab7014047808ec2b2c908e8334f55 /block/blk-ioc.c | |
| parent | 61cc74fbb87af6aa551a06a370590c9bc07e29d9 (diff) | |
| download | linux-3.10-b69f2292063d2caf37ca9aec7d63ded203701bf3.tar.gz linux-3.10-b69f2292063d2caf37ca9aec7d63ded203701bf3.tar.bz2 linux-3.10-b69f2292063d2caf37ca9aec7d63ded203701bf3.zip | |
block: Fix io_context leak after failure of clone with CLONE_IO
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>
Diffstat (limited to 'block/blk-ioc.c')
| -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 dcd041290b2..cbdabb0dd6d 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) |