From fd646a28dc5883a9a5a3e4e59f5fadc5329975d3 Mon Sep 17 00:00:00 2001 From: paul luse Date: Wed, 21 Aug 2019 17:41:30 -0400 Subject: [PATCH] bdev/compress: move function So it can be called from an earlier one in the next patch. Change-Id: I1e79669d33d84e54c27305e38076cbdafea627e3 Signed-off-by: paul luse Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465986 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Reviewed-by: Broadcom SPDK FC-NVMe CI --- lib/bdev/compress/vbdev_compress.c | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/bdev/compress/vbdev_compress.c b/lib/bdev/compress/vbdev_compress.c index 797f7785b..19a0c28c0 100644 --- a/lib/bdev/compress/vbdev_compress.c +++ b/lib/bdev/compress/vbdev_compress.c @@ -824,6 +824,22 @@ _device_unregister_cb(void *io_device) free(comp_bdev); } +static void +vbdev_compress_destruct_cb(void *cb_arg, int reduce_errno) +{ + struct vbdev_compress *comp_bdev = (struct vbdev_compress *)cb_arg; + + if (reduce_errno) { + SPDK_ERRLOG("number %d\n", reduce_errno); + } else { + TAILQ_REMOVE(&g_vbdev_comp, comp_bdev, link); + spdk_bdev_module_release_bdev(comp_bdev->base_bdev); + spdk_bdev_close(comp_bdev->base_desc); + comp_bdev->vol = NULL; + spdk_io_device_unregister(comp_bdev, _device_unregister_cb); + } +} + static void _reduce_destroy_cb(void *ctx, int reduce_errno) { @@ -856,22 +872,6 @@ delete_vol_unload_cb(void *cb_arg, int reduce_errno) } } -static void -vbdev_compress_destruct_cb(void *cb_arg, int reduce_errno) -{ - struct vbdev_compress *comp_bdev = (struct vbdev_compress *)cb_arg; - - if (reduce_errno) { - SPDK_ERRLOG("number %d\n", reduce_errno); - } else { - TAILQ_REMOVE(&g_vbdev_comp, comp_bdev, link); - spdk_bdev_module_release_bdev(comp_bdev->base_bdev); - spdk_bdev_close(comp_bdev->base_desc); - comp_bdev->vol = NULL; - spdk_io_device_unregister(comp_bdev, _device_unregister_cb); - } -} - /* Called after we've unregistered following a hot remove callback. * Our finish entry point will be called next. */