---

yaml --- r: 40462 b: refs/heads/master c: 0261d68 h: refs/heads/master v: v3
git-mirror · Oct 30, 2006 · fc0d88d · fc0d88d
1 parent 63015d4
commit fc0d88d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 209ad53bc19667a128d9c51beba873a5c62bff6e
+refs/heads/master: 0261d6886eb5822867a5310dc1e4479b940a1942
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -1362,6 +1362,7 @@ cfq_cic_link(struct cfq_data *cfqd, struct io_context *ioc,
 	struct rb_node **p;
 	struct rb_node *parent;
 	struct cfq_io_context *__cic;
+	unsigned long flags;
 	void *k;
 
 	cic->ioc = ioc;
@@ -1391,9 +1392,9 @@ cfq_cic_link(struct cfq_data *cfqd, struct io_context *ioc,
 	rb_link_node(&cic->rb_node, parent, p);
 	rb_insert_color(&cic->rb_node, &ioc->cic_root);
 
-	spin_lock_irq(cfqd->queue->queue_lock);
+	spin_lock_irqsave(cfqd->queue->queue_lock, flags);
 	list_add(&cic->queue_list, &cfqd->cic_list);
-	spin_unlock_irq(cfqd->queue->queue_lock);
+	spin_unlock_irqrestore(cfqd->queue->queue_lock, flags);
 }
 
 /*