summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorShan Wei <shanwei@cn.fujitsu.com>2009-07-01 12:41:14 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-07-01 12:41:14 +0200
commitb706f64281b24d8b1fdc8ae883700131d365c412 (patch)
tree3eed31b51cdcb2787ff2d90eaf39b19fba242a9f /block
parentdb64f680ba4b5c56c4be59f0698000df89ff0281 (diff)
downloadlinux-3.10-b706f64281b24d8b1fdc8ae883700131d365c412.tar.gz
linux-3.10-b706f64281b24d8b1fdc8ae883700131d365c412.tar.bz2
linux-3.10-b706f64281b24d8b1fdc8ae883700131d365c412.zip
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>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c4
1 files changed, 0 insertions, 4 deletions
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);
}