ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost/blk: spdk_vhost_blk_construct(): do not override errno returned

Browse Source 
We need these errno to make outputs more clear and make
spdk_vhost_blk_construct() conforms to it's declaration.

Change-Id: I1936e7393494a0344d97c8a920f3d719dee27002
Signed-off-by: wuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-on: https://review.gerrithub.io/421859
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
wuzhouhui 2018-08-10 18:04:46 +08:00 committed by Jim Harris
parent 1b85cdad64
commit 53f86e2412
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vhost/vhost_blk.c
View File

@ -777,13 +777,13 @@ spdk_vhost_blk_construct(const char *name, const char *cpumask, const char *dev_
if (bdev == NULL) { if (bdev == NULL) {
SPDK_ERRLOG("Controller %s: bdev '%s' not found\n", SPDK_ERRLOG("Controller %s: bdev '%s' not found\n",
name, dev_name); name, dev_name);
ret = -1; ret = -ENODEV;
goto out; goto out;
} }
bvdev = spdk_dma_zmalloc(sizeof(*bvdev), SPDK_CACHE_LINE_SIZE, NULL); bvdev = spdk_dma_zmalloc(sizeof(*bvdev), SPDK_CACHE_LINE_SIZE, NULL);
if (bvdev == NULL) { if (bvdev == NULL) {
ret = -1; ret = -ENOMEM;
goto out; goto out;
} }
@ -791,7 +791,6 @@ spdk_vhost_blk_construct(const char *name, const char *cpumask, const char *dev_
if (ret != 0) { if (ret != 0) {
SPDK_ERRLOG("Controller %s: could not open bdev '%s', error=%d\n", SPDK_ERRLOG("Controller %s: could not open bdev '%s', error=%d\n",
name, dev_name, ret); name, dev_name, ret);
ret = -1;
goto out; goto out;
} }
@ -800,7 +799,6 @@ spdk_vhost_blk_construct(const char *name, const char *cpumask, const char *dev_
ret = spdk_vhost_dev_register(&bvdev->vdev, name, cpumask, &vhost_blk_device_backend); ret = spdk_vhost_dev_register(&bvdev->vdev, name, cpumask, &vhost_blk_device_backend);
if (ret != 0) { if (ret != 0) {
spdk_bdev_close(bvdev->bdev_desc); spdk_bdev_close(bvdev->bdev_desc);
ret = -1;
goto out; goto out;
} }