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 /include/linux | |
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 'include/linux')
-rw-r--r-- | include/linux/iocontext.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h index d61b0b8b5cd1..a63235996309 100644 --- a/include/linux/iocontext.h +++ b/include/linux/iocontext.h | |||
@@ -98,14 +98,15 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc) | |||
98 | return NULL; | 98 | return NULL; |
99 | } | 99 | } |
100 | 100 | ||
101 | struct task_struct; | ||
101 | #ifdef CONFIG_BLOCK | 102 | #ifdef CONFIG_BLOCK |
102 | int put_io_context(struct io_context *ioc); | 103 | int put_io_context(struct io_context *ioc); |
103 | void exit_io_context(void); | 104 | void exit_io_context(struct task_struct *task); |
104 | struct io_context *get_io_context(gfp_t gfp_flags, int node); | 105 | struct io_context *get_io_context(gfp_t gfp_flags, int node); |
105 | struct io_context *alloc_io_context(gfp_t gfp_flags, int node); | 106 | struct io_context *alloc_io_context(gfp_t gfp_flags, int node); |
106 | void copy_io_context(struct io_context **pdst, struct io_context **psrc); | 107 | void copy_io_context(struct io_context **pdst, struct io_context **psrc); |
107 | #else | 108 | #else |
108 | static inline void exit_io_context(void) | 109 | static inline void exit_io_context(struct task_struct *task) |
109 | { | 110 | { |
110 | } | 111 | } |
111 | 112 | ||