From 46d48f56e0cca48ad5873f30dc41eac460914d08 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Wed, 1 Aug 2012 12:17:27 +0200
Subject: [PATCH] --- yaml --- r: 320920 b: refs/heads/master c:
 4638a83e8615de9c16c39dfed234951d0f468cf1 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/block/blk-ioc.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d48299f78b4b..66622856e4cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe86cdcef73ba19a2246a124f0ddbd19b14fb549
+refs/heads/master: 4638a83e8615de9c16c39dfed234951d0f468cf1
diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c
index 893b8007c657..fab4cdd3f7bb 100644
--- a/trunk/block/blk-ioc.c
+++ b/trunk/block/blk-ioc.c
@@ -244,6 +244,7 @@ int create_task_io_context(struct task_struct *task, gfp_t gfp_flags, int node)
 
 	/* initialize */
 	atomic_long_set(&ioc->refcount, 1);
+	atomic_set(&ioc->nr_tasks, 1);
 	atomic_set(&ioc->active_ref, 1);
 	spin_lock_init(&ioc->lock);
 	INIT_RADIX_TREE(&ioc->icq_tree, GFP_ATOMIC | __GFP_HIGH);