diff --git a/[refs] b/[refs] index 3e0026160402..c53d6c041416 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3603b8eaccc8e41d3f355b3cadd662a3dd6699fd +refs/heads/master: 27667c996f6a0bed4ad1e10ac0a0dbb6037968db diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c index 3c7a339fe381..b791022beef3 100644 --- a/trunk/block/blk-ioc.c +++ b/trunk/block/blk-ioc.c @@ -64,7 +64,7 @@ static void cfq_exit(struct io_context *ioc) rcu_read_unlock(); } -/* Called by the exitting task */ +/* Called by the exiting task */ void exit_io_context(struct task_struct *task) { struct io_context *ioc; @@ -74,10 +74,9 @@ void exit_io_context(struct task_struct *task) task->io_context = NULL; task_unlock(task); - if (atomic_dec_and_test(&ioc->nr_tasks)) { + if (atomic_dec_and_test(&ioc->nr_tasks)) cfq_exit(ioc); - } put_io_context(ioc); }