nvmet: cleanup nvmet_execute_identify()

Change the order of the cases in nvmet_execute_identify() main
switch-case to match the NVMe 2.0 specification order as defined in
table 273. This is also the increasing order of CNS values.

While at it, for clarity, make it explicit that identify with cns set
to NVME_ID_CNS_CS_NS does not support NVM command set specific data.

No functional changes are introduced by this cleanup.

Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Tested-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index 5bfbf5c651db0b7eed893bd5fda58a84c18f0f14..3c4f2ddc09604ec5f447f3e09091b656094eca82 100644 (file)
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -701,19 +701,29 @@ static void nvmet_execute_identify(struct nvmet_req *req)
        case NVME_ID_CNS_NS:
                nvmet_execute_identify_ns(req);
                return;
+       case NVME_ID_CNS_CTRL:
+               nvmet_execute_identify_ctrl(req);
+               return;
+       case NVME_ID_CNS_NS_ACTIVE_LIST:
+               nvmet_execute_identify_nslist(req);
+               return;
+       case NVME_ID_CNS_NS_DESC_LIST:
+               if (nvmet_handle_identify_desclist(req) == true)
+                       return;
+               break;
        case NVME_ID_CNS_CS_NS:
-               if (IS_ENABLED(CONFIG_BLK_DEV_ZONED)) {
-                       switch (req->cmd->identify.csi) {
-                       case NVME_CSI_ZNS:
-                               return nvmet_execute_identify_cns_cs_ns(req);
-                       default:
-                               break;
+               switch (req->cmd->identify.csi) {
+               case NVME_CSI_NVM:
+                       /* Not supported */
+                       break;
+               case NVME_CSI_ZNS:
+                       if (IS_ENABLED(CONFIG_BLK_DEV_ZONED)) {
+                               nvmet_execute_identify_cns_cs_ns(req);
+                               return;
                        }
+                       break;
                }
                break;
-       case NVME_ID_CNS_CTRL:
-               nvmet_execute_identify_ctrl(req);
-               return;
        case NVME_ID_CNS_CS_CTRL:
                switch (req->cmd->identify.csi) {
                case NVME_CSI_NVM:
@@ -727,13 +737,6 @@ static void nvmet_execute_identify(struct nvmet_req *req)
                        break;
                }
                break;
-       case NVME_ID_CNS_NS_ACTIVE_LIST:
-               nvmet_execute_identify_nslist(req);
-               return;
-       case NVME_ID_CNS_NS_DESC_LIST:
-               if (nvmet_handle_identify_desclist(req) == true)
-                       return;
-               break;
        }
 
        nvmet_req_cns_error_complete(req);