aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-06-04 10:01:38 +0200
committerJens Axboe <axboe@kernel.dk>2012-06-04 10:01:38 +0200
commitfd7949564ced88385ca7758a4c1f47c274233dd5 (patch)
treeb2f5ec960e17c604148f17239824c366954d8135 /block
parent87c9ea76a242c2f9063e2a8f3e90846c932c61a7 (diff)
downloadlinux-linaro-stable-fd7949564ced88385ca7758a4c1f47c274233dd5.tar.gz
block: fix return value on cfq_init() failure
cfq_init() would return zero after kmem cache creation failure. Fix so that it returns -ENOMEM. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 673c977cc2bf..ae5113d3ebae 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -4202,6 +4202,7 @@ static int __init cfq_init(void)
if (ret)
return ret;
+ ret = -ENOMEM;
cfq_pool = KMEM_CACHE(cfq_queue, 0);
if (!cfq_pool)
goto err_pol_unreg;