cfq-iosched: remove redundant check for NULL cfqq in cfq_set_request()
Shan Wei [Wed, 1 Jul 2009 10:41:14 +0000 (12:41 +0200)]
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>

block/cfq-iosched.c

index 1d9160f..87276eb 100644 (file)
@@ -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);
        }