diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-03-15 17:13:35 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2023-04-13 09:55:04 +0300 |
| commit | 2f17f42c7f52a34abff2c92766806b58ea142c23 (patch) | |
| tree | f9cb5c0d82b2c841d44220f50df65cf6d9756b31 /drivers/nvme | |
| parent | 145f0dbb8aac48f2e3abd4bd09582c78afef07a7 (diff) | |
| download | linux-2f17f42c7f52a34abff2c92766806b58ea142c23.tar.xz | |
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/target/admin-cmd.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index 3c4f2ddc0960..c0908031ce25 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -668,23 +668,6 @@ out: 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) { /* Not supported: return zeroes */ @@ -708,8 +691,7 @@ static void nvmet_execute_identify(struct nvmet_req *req) nvmet_execute_identify_nslist(req); return; case NVME_ID_CNS_NS_DESC_LIST: - if (nvmet_handle_identify_desclist(req) == true) - return; + nvmet_execute_identify_desclist(req); break; case NVME_ID_CNS_CS_NS: switch (req->cmd->identify.csi) { |