aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLouis Rilling <louis.rilling@kerlabs.com>2009-12-04 14:52:42 +0100
committerWilly Tarreau <w@1wt.eu>2012-10-07 23:37:22 +0200
commit6ace7773b07bb1949a54aad85e5c2f21b6c299d6 (patch)
tree4f132614c293bf97b2f807e2306ae1e870732a8a /include
parent36cea38d1ed7fb6d602913824bb75ceb42c0b4c0 (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 'include')
-rw-r--r--include/linux/iocontext.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index eb73632440f1..19abfc125369 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -94,14 +94,15 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc)
return NULL;
}
+struct task_struct;
#ifdef CONFIG_BLOCK
int put_io_context(struct io_context *ioc);
-void exit_io_context(void);
+void exit_io_context(struct task_struct *task);
struct io_context *get_io_context(gfp_t gfp_flags, int node);
struct io_context *alloc_io_context(gfp_t gfp_flags, int node);
void copy_io_context(struct io_context **pdst, struct io_context **psrc);
#else
-static inline void exit_io_context(void)
+static inline void exit_io_context(struct task_struct *task)
{
}