Commit 62904b3b authored by Damien Le Moal's avatar Damien Le Moal Committed by Christoph Hellwig
Browse files

nvmet: fix Identify Controller handling 



The identify command with cns set to NVME_ID_CNS_CTRL does not depend on
the command set. The execution of this command should thus not look at
the csi specified in the command. Simplify nvmet_execute_identify() to
directly call nvmet_execute_identify_ctrl() without the csi switch-case.

Fixes: ab5d0b38 ("nvmet: add Command Set Identifier support")
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Tested-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 8c098aa0

drivers/nvme/target/admin-cmd.c

+2 −5
Original line number Diff line number Diff line
@@ -705,11 +705,8 @@ static void nvmet_execute_identify(struct nvmet_req *req) 
		}

		break;

	case NVME_ID_CNS_CTRL:

		switch (req->cmd->identify.csi) {

		case NVME_CSI_NVM:

			return nvmet_execute_identify_ctrl(req);

		}

		break;

		nvmet_execute_identify_ctrl(req);

		return;

	case NVME_ID_CNS_CS_CTRL:

		if (IS_ENABLED(CONFIG_BLK_DEV_ZONED)) {

			switch (req->cmd->identify.csi) {