From 61a8abe42a0af21ea6873956ba36e94d234c62ac Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 7 Mar 2011 08:59:06 +0100 Subject: [PATCH] --- yaml --- r: 242247 b: refs/heads/master c: 93803e0140c6216b68fe926ccc611297120da273 h: refs/heads/master i: 242245: 53a2ed76501e51becddbdb2f2604c61887a256bb 242243: b0120d41860fb27d1932153382bfbb2ea6c0d2be 242239: 7dab264f53ff7078c2cae9b3c2adb33158013e8b v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fafe18c6ef11..4b8d2f2d1bf1 100644 --- 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 index 3202c7e87fb3..fb2141ec205c 100644 --- 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: