Commit 3934784d authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/compress: A few cleanups for vbdev_compress_claim() 



Move queue insertion to the end to avoid removal in error cases.

spdk_bdev_module_examine_done() is duplicated with the caller in
error cases and so remove it.

I/O channel is not got in this function and so remove
spdk_put_io_channel() in error cases.

move up spdk_bdev_close() to call at error_bdev_register or
error_claim label.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I34a1459dcb0d3e0a2018f5b50db5be3ac44b6049
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1469


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 82b8dd90

module/bdev/compress/vbdev_compress.c

+3 −6
Original line number Diff line number Diff line
@@ -1619,8 +1619,6 @@ vbdev_compress_claim(struct vbdev_compress *comp_bdev) 


	pthread_mutex_init(&comp_bdev->reduce_lock, NULL);



	TAILQ_INSERT_TAIL(&g_vbdev_comp, comp_bdev, link);



	rc = spdk_bdev_open(comp_bdev->base_bdev, true, vbdev_compress_base_bdev_hotremove_cb,

			    comp_bdev->base_bdev, &comp_bdev->base_desc);

	if (rc) {
@@ -1648,6 +1646,8 @@ vbdev_compress_claim(struct vbdev_compress *comp_bdev) 
		goto error_bdev_register;

	}



	TAILQ_INSERT_TAIL(&g_vbdev_comp, comp_bdev, link);



	SPDK_NOTICELOG("registered io_device and virtual bdev for: %s\n", comp_bdev->comp_bdev.name);



	return;
@@ -1655,15 +1655,12 @@ vbdev_compress_claim(struct vbdev_compress *comp_bdev) 
error_bdev_register:

	spdk_bdev_module_release_bdev(comp_bdev->base_bdev);

error_claim:

	TAILQ_REMOVE(&g_vbdev_comp, comp_bdev, link);

	spdk_io_device_unregister(comp_bdev, NULL);

	spdk_bdev_close(comp_bdev->base_desc);

error_open:

	free(comp_bdev->comp_bdev.name);

error_bdev_name:

	spdk_put_io_channel(comp_bdev->base_ch);

	spdk_bdev_close(comp_bdev->base_desc);

	free(comp_bdev);

	spdk_bdev_module_examine_done(&compress_if);

}



static void