From f52f6aee0e64ec5a4db159f0f71508ced17405c1 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 15 Jan 2019 10:52:49 -0700 Subject: [PATCH] nvmf: Change some "virtual" names to "bdev" These are left over from the removal of virtual mode over a year ago. Change-Id: Ia797c4570bf9090346ff22ab9c7d719a78d023d0 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/440589 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Seth Howell Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- lib/nvmf/ctrlr_bdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/nvmf/ctrlr_bdev.c b/lib/nvmf/ctrlr_bdev.c index 7eb4f19a3..75b53629b 100644 --- a/lib/nvmf/ctrlr_bdev.c +++ b/lib/nvmf/ctrlr_bdev.c @@ -326,7 +326,7 @@ nvmf_bdev_ctrlr_flush_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, return SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS; } -struct nvmf_virtual_ctrlr_unmap { +struct nvmf_bdev_ctrlr_unmap { struct spdk_nvmf_request *req; uint32_t count; struct spdk_bdev_desc *desc; @@ -335,10 +335,10 @@ struct nvmf_virtual_ctrlr_unmap { }; static void -nvmf_virtual_ctrlr_dsm_cpl(struct spdk_bdev_io *bdev_io, bool success, - void *cb_arg) +nvmf_bdev_ctrlr_dsm_cpl(struct spdk_bdev_io *bdev_io, bool success, + void *cb_arg) { - struct nvmf_virtual_ctrlr_unmap *unmap_ctx = cb_arg; + struct nvmf_bdev_ctrlr_unmap *unmap_ctx = cb_arg; struct spdk_nvmf_request *req = unmap_ctx->req; struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl; int sc, sct; @@ -362,11 +362,11 @@ nvmf_virtual_ctrlr_dsm_cpl(struct spdk_bdev_io *bdev_io, bool success, static int nvmf_bdev_ctrlr_dsm_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, struct spdk_nvmf_request *req, - struct nvmf_virtual_ctrlr_unmap *unmap_ctx); + struct nvmf_bdev_ctrlr_unmap *unmap_ctx); static void nvmf_bdev_ctrlr_dsm_cmd_resubmit(void *arg) { - struct nvmf_virtual_ctrlr_unmap *unmap_ctx = arg; + struct nvmf_bdev_ctrlr_unmap *unmap_ctx = arg; struct spdk_nvmf_request *req = unmap_ctx->req; struct spdk_bdev_desc *desc = unmap_ctx->desc; struct spdk_bdev *bdev = unmap_ctx->bdev; @@ -378,7 +378,7 @@ nvmf_bdev_ctrlr_dsm_cmd_resubmit(void *arg) static int nvmf_bdev_ctrlr_dsm_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, struct spdk_nvmf_request *req, - struct nvmf_virtual_ctrlr_unmap *unmap_ctx) + struct nvmf_bdev_ctrlr_unmap *unmap_ctx) { uint32_t attribute; uint16_t nr, i; @@ -422,7 +422,7 @@ nvmf_bdev_ctrlr_dsm_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, unmap_ctx->count++; rc = spdk_bdev_unmap_blocks(desc, ch, lba, lba_count, - nvmf_virtual_ctrlr_dsm_cpl, unmap_ctx); + nvmf_bdev_ctrlr_dsm_cpl, unmap_ctx); if (rc) { if (rc == -ENOMEM) { nvmf_bdev_ctrl_queue_io(req, bdev, ch, nvmf_bdev_ctrlr_dsm_cmd_resubmit, unmap_ctx);