Commit 7798df6f authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

nvmet: remove an unnecessary function parameter to nvmet_check_ctrl_status 



In nvmet_check_ctrl_status() cmd can be derived from nvmet_req. Remove
the local variable cmd in the nvmet_check_ctrl_status() and function
parameter cmd for nvmet_check_ctrl_status(). Derive the cmd value from
req parameter in the nvmet_check_ctrl_status().

Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a56f14c2

drivers/nvme/target/admin-cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ u16 nvmet_parse_admin_cmd(struct nvmet_req *req) 
	if (nvmet_req_subsys(req)->type == NVME_NQN_DISC)

		return nvmet_parse_discovery_cmd(req);



	ret = nvmet_check_ctrl_status(req, cmd);

	ret = nvmet_check_ctrl_status(req);

	if (unlikely(ret))

		return ret;

drivers/nvme/target/core.c

+4 −5
Original line number Diff line number Diff line
@@ -864,10 +864,9 @@ static inline u16 nvmet_io_cmd_check_access(struct nvmet_req *req) 


static u16 nvmet_parse_io_cmd(struct nvmet_req *req)

{

	struct nvme_command *cmd = req->cmd;

	u16 ret;



	ret = nvmet_check_ctrl_status(req, cmd);

	ret = nvmet_check_ctrl_status(req);

	if (unlikely(ret))

		return ret;
@@ -1220,17 +1219,17 @@ u16 nvmet_ctrl_find_get(const char *subsysnqn, const char *hostnqn, u16 cntlid, 
	return status;

}



u16 nvmet_check_ctrl_status(struct nvmet_req *req, struct nvme_command *cmd)

u16 nvmet_check_ctrl_status(struct nvmet_req *req)

{

	if (unlikely(!(req->sq->ctrl->cc & NVME_CC_ENABLE))) {

		pr_err("got cmd %d while CC.EN == 0 on qid = %d\n",

		       cmd->common.opcode, req->sq->qid);

		       req->cmd->common.opcode, req->sq->qid);

		return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;

	}



	if (unlikely(!(req->sq->ctrl->csts & NVME_CSTS_RDY))) {

		pr_err("got cmd %d while CSTS.RDY == 0 on qid = %d\n",

		       cmd->common.opcode, req->sq->qid);

		       req->cmd->common.opcode, req->sq->qid);

		return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;

	}

	return 0;

drivers/nvme/target/nvmet.h

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn, 
u16 nvmet_ctrl_find_get(const char *subsysnqn, const char *hostnqn, u16 cntlid,

		struct nvmet_req *req, struct nvmet_ctrl **ret);

void nvmet_ctrl_put(struct nvmet_ctrl *ctrl);

u16 nvmet_check_ctrl_status(struct nvmet_req *req, struct nvme_command *cmd);

u16 nvmet_check_ctrl_status(struct nvmet_req *req);



struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn,

		enum nvme_subsys_type type);