From ace9f6d1c0f6e258c9293983eb6b0a6b1aab5e04 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 10 Dec 2020 11:21:28 +0900 Subject: [PATCH] bdev/ocssd: Change to_chunk_info_offset() to take ocssd_ns as additional parameter As same as the last patch, change bdev_ocssd_to_chunk_info_offset() to take ocssd_ns as an additional parameter. Signed-off-by: Shuhei Matsumoto Change-Id: I05eae4206cad0511029b9b5c97b4e87facf109ab Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5538 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk --- module/bdev/nvme/bdev_ocssd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/module/bdev/nvme/bdev_ocssd.c b/module/bdev/nvme/bdev_ocssd.c index a3d833f61..ec734de66 100644 --- a/module/bdev/nvme/bdev_ocssd.c +++ b/module/bdev/nvme/bdev_ocssd.c @@ -331,9 +331,9 @@ bdev_ocssd_to_disk_lba(struct ocssd_bdev *ocssd_bdev, } static uint64_t -bdev_ocssd_to_chunk_info_offset(struct ocssd_bdev *ocssd_bdev, uint64_t lba) +bdev_ocssd_to_chunk_info_offset(struct ocssd_bdev *ocssd_bdev, + struct bdev_ocssd_ns *ocssd_ns, uint64_t lba) { - struct bdev_ocssd_ns *ocssd_ns = bdev_ocssd_get_ns_from_bdev(ocssd_bdev); const struct spdk_ocssd_geometry_data *geo = &ocssd_ns->geometry; uint64_t grp, pu, chk, lbk; @@ -708,14 +708,16 @@ _bdev_ocssd_get_zone_info(struct ocssd_bdev *ocssd_bdev, struct nvme_io_channel struct bdev_ocssd_io *ocdev_io, uint64_t zone_id) { struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev; + struct nvme_bdev_ns *nvme_ns = nvme_bdev->nvme_ns; + struct bdev_ocssd_ns *ocssd_ns = bdev_ocssd_get_ns_from_nvme(nvme_ns); uint64_t lba, offset; lba = zone_id + ocdev_io->zone_info.chunk_offset * nvme_bdev->disk.zone_size; - offset = bdev_ocssd_to_chunk_info_offset(ocssd_bdev, lba); + offset = bdev_ocssd_to_chunk_info_offset(ocssd_bdev, ocssd_ns, lba); return spdk_nvme_ctrlr_cmd_get_log_page(nvme_ch->ctrlr->ctrlr, SPDK_OCSSD_LOG_CHUNK_INFO, - spdk_nvme_ns_get_id(nvme_bdev->nvme_ns->ns), + spdk_nvme_ns_get_id(nvme_ns->ns), &ocdev_io->zone_info.chunk_info, sizeof(ocdev_io->zone_info.chunk_info), offset * sizeof(ocdev_io->zone_info.chunk_info),