From f7c9366b269f5e35c925487355a4e475f232a31e Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sun, 25 Dec 2011 14:29:14 +0100 Subject: [PATCH] --- yaml --- r: 285122 b: refs/heads/master c: fd63836811d6e5b5f5f608abf865bc9e91762c8c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-ioc.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a9d17a3ac8cf..35e02c2ca55b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64c42998f14d5894ea3138625897d620b30c8e4e +refs/heads/master: fd63836811d6e5b5f5f608abf865bc9e91762c8c diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c index ce9b35a9468e..33fae7df16a0 100644 --- a/trunk/block/blk-ioc.c +++ b/trunk/block/blk-ioc.c @@ -281,9 +281,16 @@ void create_io_context_slowpath(struct task_struct *task, gfp_t gfp_flags, INIT_HLIST_HEAD(&ioc->icq_list); INIT_WORK(&ioc->release_work, ioc_release_fn); - /* try to install, somebody might already have beaten us to it */ + /* + * Try to install. ioc shouldn't be installed if someone else + * already did or @task, which isn't %current, is exiting. Note + * that we need to allow ioc creation on exiting %current as exit + * path may issue IOs from e.g. exit_files(). The exit path is + * responsible for not issuing IO after exit_io_context(). + */ task_lock(task); - if (!task->io_context && !(task->flags & PF_EXITING)) + if (!task->io_context && + (task == current || !(task->flags & PF_EXITING))) task->io_context = ioc; else kmem_cache_free(iocontext_cachep, ioc);