From 885472be07fa17b3dc142bae17b5c9d97a297316 Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@redhat.com>
Date: Thu, 9 Jul 2009 22:13:16 +0200
Subject: [PATCH] --- yaml --- r: 155245 b: refs/heads/master c:
 32f2e807a3938b24d0831211e6094f9e44b2fc83 h: refs/heads/master i:   155243:
 eddb7bf0e3ce25434d3b32bf3f906d9ad8cf9ad4 v: v3

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

diff --git a/[refs] b/[refs]
index 1eb2e000738f..8041030f306f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecb554a846f8e9d2a58f6d6c118168a63ac065aa
+refs/heads/master: 32f2e807a3938b24d0831211e6094f9e44b2fc83
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 87276eb83f7f..fd7080ed7935 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -2311,7 +2311,7 @@ cfq_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask)
 		goto queue_fail;
 
 	cfqq = cic_to_cfqq(cic, is_sync);
-	if (!cfqq) {
+	if (!cfqq || cfqq == &cfqd->oom_cfqq) {
 		cfqq = cfq_get_queue(cfqd, is_sync, cic->ioc, gfp_mask);
 		cic_set_cfqq(cic, cfqq, is_sync);
 	}