From e995690fbcdab88c44dbcfbd7580fd3306df27c3 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Wed, 6 Jan 2021 07:47:47 +0900 Subject: [PATCH] bdev/nvme: nvme_bdev remembers if opal is enabled or not This is helpful to simplify bdev_nvme_dump_info_json() when supporting multipath. Signed-off-by: Shuhei Matsumoto Change-Id: I7cf7712b8ee8ac6f15354a46dee2edbacbdeafcf Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5794 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris --- module/bdev/nvme/bdev_nvme.c | 3 ++- module/bdev/nvme/common.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 6602daae1..47ff7564a 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -1073,7 +1073,7 @@ bdev_nvme_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) if (cdata->oacs.security) { spdk_json_write_named_object_begin(w, "security"); - spdk_json_write_named_bool(w, "opal", nvme_bdev_ctrlr->opal_dev ? true : false); + spdk_json_write_named_bool(w, "opal", nvme_bdev->opal); spdk_json_write_object_end(w); } @@ -1202,6 +1202,7 @@ nvme_bdev_create(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_ns *n } bdev->nvme_ns = nvme_ns; + bdev->opal = nvme_bdev_ctrlr->opal_dev != NULL; rc = nvme_disk_create(&bdev->disk, nvme_bdev_ctrlr->name, nvme_bdev_ctrlr->ctrlr, nvme_ns->ns, nvme_bdev_ctrlr->prchk_flags, bdev); diff --git a/module/bdev/nvme/common.h b/module/bdev/nvme/common.h index 4d4a02dd8..607f553c6 100644 --- a/module/bdev/nvme/common.h +++ b/module/bdev/nvme/common.h @@ -116,6 +116,7 @@ struct nvme_bdev_ctrlr { struct nvme_bdev { struct spdk_bdev disk; struct nvme_bdev_ns *nvme_ns; + bool opal; TAILQ_ENTRY(nvme_bdev) tailq; };