From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Wed, 1 Jul 2009 10:41:14 +0000 (+0200)
Subject: cfq-iosched: remove redundant check for NULL cfqq in cfq_set_request()
X-Git-Tag: v2.6.31-rc2~24^2
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=b706f64281b24d8b1fdc8ae883700131d365c412

cfq-iosched: remove redundant check for NULL cfqq in cfq_set_request()

With the changes for falling back to an oom_cfqq, we never fail
to find/allocate a queue in cfq_get_queue(). So remove the check.

Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 1d9160ffa26..87276eb83f7 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2313,10 +2313,6 @@ cfq_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask)
 	cfqq = cic_to_cfqq(cic, is_sync);
 	if (!cfqq) {
 		cfqq = cfq_get_queue(cfqd, is_sync, cic->ioc, gfp_mask);
-
-		if (!cfqq)
-			goto queue_fail;
-
 		cic_set_cfqq(cic, cfqq, is_sync);
 	}