Skip to content

Commit

Permalink
cfq-iosched: remove redundant check for NULL cfqq in cfq_set_request()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shan Wei authored and Jens Axboe committed Jul 1, 2009
1 parent db64f68 commit b706f64
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions block/cfq-iosched.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit b706f64

Please sign in to comment.