Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 618cff42 authored May 10, 2018 by Chaitanya Kulkarni Committed by Christoph Hellwig May 25, 2018

nvmet: remove duplicate NULL initialization for req->ns

Remove the duplicate NULL initialization for req->ns. req->ns is always
initialized to NULL in nvmet_req_init(), so there is no need to reset
it later on failures unless we have previously assigned a value to it.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent b40b83e3

drivers/nvme/target/admin-cmd.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -548,8 +548,6 @@ u16 nvmet_parse_admin_cmd(struct nvmet_req *req)
		struct nvme_command *cmd = req->cmd;
		u16 ret;

		req->ns = NULL;

		ret = nvmet_check_ctrl_status(req, cmd);
		if (unlikely(ret))
		return ret;

drivers/nvme/target/core.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -718,7 +718,6 @@ u16 nvmet_check_ctrl_status(struct nvmet_req req, struct nvme_command cmd)
		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->ns = NULL;
		return NVME_SC_CMD_SEQ_ERROR \| NVME_SC_DNR;
		}
		return 0;

drivers/nvme/target/discovery.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -187,8 +187,6 @@ u16 nvmet_parse_discovery_cmd(struct nvmet_req *req)
		{
		struct nvme_command *cmd = req->cmd;

		req->ns = NULL;

		if (unlikely(!(req->sq->ctrl->csts & NVME_CSTS_RDY))) {
		pr_err("got cmd %d while not ready\n",
		cmd->common.opcode);

drivers/nvme/target/fabrics-cmd.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -77,8 +77,6 @@ u16 nvmet_parse_fabrics_cmd(struct nvmet_req *req)
		{
		struct nvme_command *cmd = req->cmd;

		req->ns = NULL;

		switch (cmd->fabrics.fctype) {
		case nvme_fabrics_type_property_set:
		req->data_len = 0;
		@@ -242,8 +240,6 @@ u16 nvmet_parse_connect_cmd(struct nvmet_req *req)
		{
		struct nvme_command *cmd = req->cmd;

		req->ns = NULL;

		if (cmd->common.opcode != nvme_fabrics_command) {
		pr_err("invalid command 0x%x on unconnected queue.\n",
		cmd->fabrics.opcode);

drivers/nvme/target/io-cmd.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -195,10 +195,8 @@ u16 nvmet_parse_io_cmd(struct nvmet_req *req)
		u16 ret;

		ret = nvmet_check_ctrl_status(req, cmd);
		if (unlikely(ret)) {
		req->ns = NULL;
		if (unlikely(ret))
		return ret;
		}

		req->ns = nvmet_find_namespace(req->sq->ctrl, cmd->rw.nsid);
		if (unlikely(!req->ns))