Commit 2f17f42c authored by Christoph Hellwig's avatar Christoph Hellwig

nvmet: fix Identify Identification Descriptor List handling

The Identification Descriptor List CNS value does not check the CSI
value, so remove the code trying to handle it.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 145f0dbb
...@@ -668,23 +668,6 @@ static void nvmet_execute_identify_desclist(struct nvmet_req *req) ...@@ -668,23 +668,6 @@ static void nvmet_execute_identify_desclist(struct nvmet_req *req)
nvmet_req_complete(req, status); nvmet_req_complete(req, status);
} }
static bool nvmet_handle_identify_desclist(struct nvmet_req *req)
{
switch (req->cmd->identify.csi) {
case NVME_CSI_NVM:
nvmet_execute_identify_desclist(req);
return true;
case NVME_CSI_ZNS:
if (IS_ENABLED(CONFIG_BLK_DEV_ZONED)) {
nvmet_execute_identify_desclist(req);
return true;
}
return false;
default:
return false;
}
}
static void nvmet_execute_identify_ctrl_nvm(struct nvmet_req *req) static void nvmet_execute_identify_ctrl_nvm(struct nvmet_req *req)
{ {
/* Not supported: return zeroes */ /* Not supported: return zeroes */
...@@ -708,8 +691,7 @@ static void nvmet_execute_identify(struct nvmet_req *req) ...@@ -708,8 +691,7 @@ static void nvmet_execute_identify(struct nvmet_req *req)
nvmet_execute_identify_nslist(req); nvmet_execute_identify_nslist(req);
return; return;
case NVME_ID_CNS_NS_DESC_LIST: case NVME_ID_CNS_NS_DESC_LIST:
if (nvmet_handle_identify_desclist(req) == true) nvmet_execute_identify_desclist(req);
return;
break; break;
case NVME_ID_CNS_CS_NS: case NVME_ID_CNS_CS_NS:
switch (req->cmd->identify.csi) { switch (req->cmd->identify.csi) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment