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 <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index c0908031ce25ee3c0a5b3cc622c23053e5a4717b..afdf69f925997a6127241c930dbcc8e33cff5aeb 100644 (file)
--- 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 ed3786140965f0c3beb8a2c96c990a8668dd41e1..2c1522d4063bde20b6e0cdcdbca935ab54e0a7d0 100644 (file)
--- 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 ae4d9d35e46ae4438de2ec44252ccc1ffebd0fa0..5b5c1e48172213df20683d8c117a9586b733bfa5 100644 (file)
--- 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;