Commit 53f86e24 authored by wuzhouhui's avatar wuzhouhui Committed by Jim Harris
Browse files

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



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: default avatarwuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-on: https://review.gerrithub.io/421859


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 1b85cdad

lib/vhost/vhost_blk.c

+2 −4
Original line number Diff line number Diff line
@@ -777,13 +777,13 @@ spdk_vhost_blk_construct(const char *name, const char *cpumask, const char *dev_ 
	if (bdev == NULL) {

		SPDK_ERRLOG("Controller %s: bdev '%s' not found\n",

			    name, dev_name);

		ret = -1;

		ret = -ENODEV;

		goto out;

	}



	bvdev = spdk_dma_zmalloc(sizeof(*bvdev), SPDK_CACHE_LINE_SIZE, NULL);

	if (bvdev == NULL) {

		ret = -1;

		ret = -ENOMEM;

		goto out;

	}
@@ -791,7 +791,6 @@ spdk_vhost_blk_construct(const char *name, const char *cpumask, const char *dev_ 
	if (ret != 0) {

		SPDK_ERRLOG("Controller %s: could not open bdev '%s', error=%d\n",

			    name, dev_name, ret);

		ret = -1;

		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);

	if (ret != 0) {

		spdk_bdev_close(bvdev->bdev_desc);

		ret = -1;

		goto out;

	}