summaryrefslogtreecommitdiffstats
path: root/drivers/block/rbd.c
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2014-08-13 20:49:52 -0700
committerIlya Dryomov <ilya.dryomov@inktank.com>2014-09-10 11:59:06 +0400
commit255939e783d8f45f8c58487dfc18957c44ea9871 (patch)
treeb0d0c8e422e09fa79d0deb9ee2292b6e4cc3e856 /drivers/block/rbd.c
parent58d1362b50dc87ebf18cd137e7a879fd99b7e721 (diff)
downloadop-kernel-dev-255939e783d8f45f8c58487dfc18957c44ea9871.zip
op-kernel-dev-255939e783d8f45f8c58487dfc18957c44ea9871.tar.gz
rbd: fix error return code in rbd_dev_device_setup()
Fix to return -ENOMEM from the workqueue alloc error handling case instead of 0, as done elsewhere in this function. Reviewed-by: Alex Elder <elder@linaro.org> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Diffstat (limited to 'drivers/block/rbd.c')
-rw-r--r--drivers/block/rbd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 2cd01ca..4b97baf 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5088,8 +5088,10 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev)
set_disk_ro(rbd_dev->disk, rbd_dev->mapping.read_only);
rbd_dev->rq_wq = alloc_workqueue("%s", 0, 0, rbd_dev->disk->disk_name);
- if (!rbd_dev->rq_wq)
+ if (!rbd_dev->rq_wq) {
+ ret = -ENOMEM;
goto err_out_mapping;
+ }
ret = rbd_bus_add_dev(rbd_dev);
if (ret)
OpenPOWER on IntegriCloud