Skip to content

Commit 9326353

Browse files
author
Christoph Hellwig
committed
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>
1 parent 2f17f42 commit 9326353

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/nvme/target/admin-cmd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -692,15 +692,15 @@ static void nvmet_execute_identify(struct nvmet_req *req)
692692
return;
693693
case NVME_ID_CNS_NS_DESC_LIST:
694694
nvmet_execute_identify_desclist(req);
695-
break;
695+
return;
696696
case NVME_ID_CNS_CS_NS:
697697
switch (req->cmd->identify.csi) {
698698
case NVME_CSI_NVM:
699699
/* Not supported */
700700
break;
701701
case NVME_CSI_ZNS:
702702
if (IS_ENABLED(CONFIG_BLK_DEV_ZONED)) {
703-
nvmet_execute_identify_cns_cs_ns(req);
703+
nvmet_execute_identify_ns_zns(req);
704704
return;
705705
}
706706
break;

drivers/nvme/target/nvmet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ u16 blk_to_nvme_status(struct nvmet_req *req, blk_status_t blk_sts);
582582

583583
bool nvmet_bdev_zns_enable(struct nvmet_ns *ns);
584584
void nvmet_execute_identify_ctrl_zns(struct nvmet_req *req);
585-
void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req);
585+
void nvmet_execute_identify_ns_zns(struct nvmet_req *req);
586586
void nvmet_bdev_execute_zone_mgmt_recv(struct nvmet_req *req);
587587
void nvmet_bdev_execute_zone_mgmt_send(struct nvmet_req *req);
588588
void nvmet_bdev_execute_zone_append(struct nvmet_req *req);

drivers/nvme/target/zns.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void nvmet_execute_identify_ctrl_zns(struct nvmet_req *req)
9595
nvmet_req_complete(req, status);
9696
}
9797

98-
void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req)
98+
void nvmet_execute_identify_ns_zns(struct nvmet_req *req)
9999
{
100100
struct nvme_id_ns_zns *id_zns = NULL;
101101
u64 zsze;

0 commit comments

Comments
 (0)