X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=block%2Fcfq-iosched.c;h=fd7080ed793599127647baafbed009d8e11ef1af;hb=7638d5322bd89d49e013a03fe2afaeb6d214fabd;hp=87276eb83f7f54576fe8fc65c84605133b3e7000;hpb=5a475ce4692f668b2615ae4ea1365c7c2d93f1dd;p=karo-tx-linux.git

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 87276eb83f7f..fd7080ed7935 100644
--- a/block/cfq-iosched.c
+++ b/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);
 	}