From 932635356618c19317c5b306b320368525cd1961 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 15 Mar 2023 15:14:31 +0100 Subject: nvmet: rename nvmet_execute_identify_cns_cs_ns nvmet_execute_identify_ns_zns is a more descriptive name for the function handling the "I/O Command Set Specific Identify Namespace Data Structure for the Zoned Namespace Command Set". Signed-off-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Reviewed-by: Damien Le Moal --- drivers/nvme/target/admin-cmd.c | 4 ++-- drivers/nvme/target/nvmet.h | 2 +- drivers/nvme/target/zns.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/nvme') diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index c0908031ce25..afdf69f92599 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -692,7 +692,7 @@ static void nvmet_execute_identify(struct nvmet_req *req) return; case NVME_ID_CNS_NS_DESC_LIST: nvmet_execute_identify_desclist(req); - break; + return; case NVME_ID_CNS_CS_NS: switch (req->cmd->identify.csi) { case NVME_CSI_NVM: @@ -700,7 +700,7 @@ static void nvmet_execute_identify(struct nvmet_req *req) break; case NVME_CSI_ZNS: if (IS_ENABLED(CONFIG_BLK_DEV_ZONED)) { - nvmet_execute_identify_cns_cs_ns(req); + nvmet_execute_identify_ns_zns(req); return; } break; diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index ed3786140965..2c1522d4063b 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -582,7 +582,7 @@ u16 blk_to_nvme_status(struct nvmet_req *req, blk_status_t blk_sts); bool nvmet_bdev_zns_enable(struct nvmet_ns *ns); void nvmet_execute_identify_ctrl_zns(struct nvmet_req *req); -void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req); +void nvmet_execute_identify_ns_zns(struct nvmet_req *req); void nvmet_bdev_execute_zone_mgmt_recv(struct nvmet_req *req); void nvmet_bdev_execute_zone_mgmt_send(struct nvmet_req *req); void nvmet_bdev_execute_zone_append(struct nvmet_req *req); diff --git a/drivers/nvme/target/zns.c b/drivers/nvme/target/zns.c index ae4d9d35e46a..5b5c1e481722 100644 --- a/drivers/nvme/target/zns.c +++ b/drivers/nvme/target/zns.c @@ -95,7 +95,7 @@ out: nvmet_req_complete(req, status); } -void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req) +void nvmet_execute_identify_ns_zns(struct nvmet_req *req) { struct nvme_id_ns_zns *id_zns = NULL; u64 zsze; -- cgit v1.2.3