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);
 	}