From 61532e08edb8a1df70d379e6e4d80192c3a6bd27 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 26 Mar 2021 21:57:46 +0900 Subject: [PATCH] bdev/nvme: Rename nvme_bdev_ctrlr_do_destruct() by nvme_bdev_ctrlr_unregister() Probably nvme_bdev_ctrlr_unregister() is more appropriate name. Signed-off-by: Shuhei Matsumoto Change-Id: I3a0d3622c084df909e5daeb548726cd9bd826ad8 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7045 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Paul Luse Reviewed-by: Aleksey Marchuk --- module/bdev/nvme/bdev_nvme.c | 2 +- module/bdev/nvme/common.c | 8 ++++---- module/bdev/nvme/common.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 06c9dbc41..90d8165ec 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -412,7 +412,7 @@ _bdev_nvme_check_pending_destruct(struct spdk_io_channel_iter *i, int status) assert(nvme_bdev_ctrlr->ref == 0 && nvme_bdev_ctrlr->destruct); pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex); - spdk_thread_send_msg(nvme_bdev_ctrlr->thread, nvme_bdev_ctrlr_do_destruct, + spdk_thread_send_msg(nvme_bdev_ctrlr->thread, nvme_bdev_ctrlr_unregister, nvme_bdev_ctrlr); } else { pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex); diff --git a/module/bdev/nvme/common.c b/module/bdev/nvme/common.c index a0d3b8c3c..bdc3c1f13 100644 --- a/module/bdev/nvme/common.c +++ b/module/bdev/nvme/common.c @@ -113,7 +113,7 @@ nvme_bdev_dump_trid_json(const struct spdk_nvme_transport_id *trid, struct spdk_ } static void -nvme_bdev_unregister_cb(void *io_device) +nvme_bdev_ctrlr_unregister_cb(void *io_device) { struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = io_device; struct nvme_bdev_ctrlr_trid *trid, *tmp_trid; @@ -160,11 +160,11 @@ nvme_bdev_unregister_cb(void *io_device) } void -nvme_bdev_ctrlr_do_destruct(void *ctx) +nvme_bdev_ctrlr_unregister(void *ctx) { struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = ctx; - spdk_io_device_unregister(nvme_bdev_ctrlr, nvme_bdev_unregister_cb); + spdk_io_device_unregister(nvme_bdev_ctrlr, nvme_bdev_ctrlr_unregister_cb); } void @@ -183,7 +183,7 @@ nvme_bdev_ctrlr_destruct(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr) pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex); - nvme_bdev_ctrlr_do_destruct(nvme_bdev_ctrlr); + nvme_bdev_ctrlr_unregister(nvme_bdev_ctrlr); } void diff --git a/module/bdev/nvme/common.h b/module/bdev/nvme/common.h index 3679e88bd..c81b27082 100644 --- a/module/bdev/nvme/common.h +++ b/module/bdev/nvme/common.h @@ -175,7 +175,7 @@ void nvme_bdev_dump_trid_json(const struct spdk_nvme_transport_id *trid, struct spdk_json_write_ctx *w); void nvme_bdev_ctrlr_destruct(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr); -void nvme_bdev_ctrlr_do_destruct(void *ctx); +void nvme_bdev_ctrlr_unregister(void *ctx); static inline bool bdev_nvme_find_io_path(struct nvme_bdev *nbdev, struct nvme_io_channel *nvme_ch,