---

yaml --- r: 309237 b: refs/heads/master c: a556793 h: refs/heads/master i: 309235: b774644 v: v3
git-mirror · Mar 29, 2012 · d4449ad · d4449ad
1 parent c2035f3
commit d4449ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 		}
 	}