aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLouis Rilling <louis.rilling@kerlabs.com>2009-12-04 08:52:42 -0500
committerJens Axboe <jens.axboe@oracle.com>2009-12-04 10:36:18 -0500
commitb69f2292063d2caf37ca9aec7d63ded203701bf3 (patch)
treebe4acb81ea4ab7014047808ec2b2c908e8334f55 /kernel
parent61cc74fbb87af6aa551a06a370590c9bc07e29d9 (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 'kernel')
-rw-r--r--kernel/exit.c2
-rw-r--r--kernel/fork.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index f7864ac2ecc1..2544000125d9 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1004,7 +1004,7 @@ NORET_TYPE void do_exit(long code)
1004 tsk->flags |= PF_EXITPIDONE; 1004 tsk->flags |= PF_EXITPIDONE;
1005 1005
1006 if (tsk->io_context) 1006 if (tsk->io_context)
1007 exit_io_context(); 1007 exit_io_context(tsk);
1008 1008
1009 if (tsk->splice_pipe) 1009 if (tsk->splice_pipe)
1010 __free_pipe_info(tsk->splice_pipe); 1010 __free_pipe_info(tsk->splice_pipe);
diff --git a/kernel/fork.c b/kernel/fork.c
index 166b8c49257c..607353425bb0 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1310,7 +1310,8 @@ bad_fork_free_pid:
1310 if (pid != &init_struct_pid) 1310 if (pid != &init_struct_pid)
1311 free_pid(pid); 1311 free_pid(pid);
1312bad_fork_cleanup_io: 1312bad_fork_cleanup_io:
1313 put_io_context(p->io_context); 1313 if (p->io_context)
1314 exit_io_context(p);
1314bad_fork_cleanup_namespaces: 1315bad_fork_cleanup_namespaces:
1315 exit_task_namespaces(p); 1316 exit_task_namespaces(p);
1316bad_fork_cleanup_mm: 1317bad_fork_cleanup_mm: