diff --git a/[refs] b/[refs] index 35e02c2ca55b..ea513e4cd8aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd63836811d6e5b5f5f608abf865bc9e91762c8c +refs/heads/master: c98b2cc29af8e84e7364b53e9bb4cc7cfaf62555 diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c index 33fae7df16a0..27a06e00eaec 100644 --- a/trunk/block/blk-ioc.c +++ b/trunk/block/blk-ioc.c @@ -230,9 +230,6 @@ void exit_io_context(struct task_struct *task) { struct io_context *ioc; - /* PF_EXITING prevents new io_context from being attached to @task */ - WARN_ON_ONCE(!(current->flags & PF_EXITING)); - task_lock(task); ioc = task->io_context; task->io_context = NULL;