From d4449adcf2e06d4f7dba2f0f7a391cc6b5f35845 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 29 Mar 2012 20:57:08 +0200
Subject: [PATCH] --- yaml --- r: 309237 b: refs/heads/master c:
 a5567932fc926739e29e98487128080f40c61710 h: refs/heads/master i:   309235:
 b77464413779d29868365b78c067d317561f1fc1 v: v3

---
 [refs]                   | 2 +-
 trunk/block/blk-cgroup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6d305b9724d8..d8942689ffd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb7d8c07f9c5fca6190b0d328179551122d1b8a3
+refs/heads/master: a5567932fc926739e29e98487128080f40c61710
diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c
index a74019b67311..aa54c4110f54 100644
--- a/trunk/block/blk-cgroup.c
+++ b/trunk/block/blk-cgroup.c
@@ -1601,7 +1601,7 @@ static int blkiocg_pre_destroy(struct cgroup_subsys *subsys,
 		} else {
 			spin_unlock_irq(&blkcg->lock);
 			cpu_relax();
-			spin_lock(&blkcg->lock);
+			spin_lock_irq(&blkcg->lock);
 		}
 	}