Commit 32f2e807 authored Jul 09, 2009 by Vivek Goyal Committed by Jens Axboe Jul 10, 2009

cfq-iosched: reset oom_cfqq in cfq_set_request()



In case memory is scarce, we now default to oom_cfqq. Once memory is
available again, we should allocate a new cfqq and stop using oom_cfqq for
a particular io context.

Once a new request comes in, check if we are using oom_cfqq, and if yes,
try to allocate a new cfqq.

Tested the patch by forcing the use of oom_cfqq and upon next request thread
realized that it was using oom_cfqq and it allocated a new cfqq.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

parent ecb554a8

block/cfq-iosched.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}