diff options
author | Louis Rilling <louis.rilling@kerlabs.com> | 2009-12-04 08:52:42 -0500 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-04 10:36:18 -0500 |
commit | b69f2292063d2caf37ca9aec7d63ded203701bf3 (patch) | |
tree | be4acb81ea4ab7014047808ec2b2c908e8334f55 /block | |
parent | 61cc74fbb87af6aa551a06a370590c9bc07e29d9 (diff) |
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')
-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) | |||
66 | } | 66 | } |
67 | 67 | ||
68 | /* Called by the exitting task */ | 68 | /* Called by the exitting task */ |
69 | void exit_io_context(void) | 69 | void exit_io_context(struct task_struct *task) |
70 | { | 70 | { |
71 | struct io_context *ioc; | 71 | struct io_context *ioc; |
72 | 72 | ||
73 | task_lock(current); | 73 | task_lock(task); |
74 | ioc = current->io_context; | 74 | ioc = task->io_context; |
75 | current->io_context = NULL; | 75 | task->io_context = NULL; |
76 | task_unlock(current); | 76 | task_unlock(task); |
77 | 77 | ||
78 | if (atomic_dec_and_test(&ioc->nr_tasks)) { | 78 | if (atomic_dec_and_test(&ioc->nr_tasks)) { |
79 | if (ioc->aic && ioc->aic->exit) | 79 | if (ioc->aic && ioc->aic->exit) |