---

yaml --- r: 242247 b: refs/heads/master c: 93803e0 h: refs/heads/master i: 242245: 53a2ed7 242243: b0120d4 242239: 7dab264 v: v3
git-mirror · Mar 7, 2011 · 61a8abe · 61a8abe
1 parent 30bf95c
commit 61a8abe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da527770007fce8e4541947d47918248286da875
+refs/heads/master: 93803e0140c6216b68fe926ccc611297120da273
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -3675,12 +3675,11 @@ cfq_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask)
 
 	cfqq->allocated[rw]++;
 
-	spin_unlock_irqrestore(q->queue_lock, flags);
-
 	cfqq->ref++;
 	rq->elevator_private[0] = cic;
 	rq->elevator_private[1] = cfqq;
 	rq->elevator_private[2] = cfq_ref_get_cfqg(cfqq->cfqg);
+	spin_unlock_irqrestore(q->queue_lock, flags);
 	return 0;
 
 queue_fail: