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

Commit 4151dd9a authored by Parav Pandit's avatar Parav Pandit Committed by Jens Axboe
Browse files

nvmet: Fixed avoided printing nvmet: twice in error logs. 



This patch avoids printing "nvmet:" twice in error logs as its already
coming through pr_fmt macro.

Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 4459e042

drivers/nvme/target/admin-cmd.c

+5 −5
Original line number Diff line number Diff line
@@ -487,12 +487,12 @@ int nvmet_parse_admin_cmd(struct nvmet_req *req) 
	req->ns = NULL;



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

		pr_err("nvmet: got admin cmd %d while CC.EN == 0\n",

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

		       cmd->common.opcode);

		return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;

	}

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

		pr_err("nvmet: got admin cmd %d while CSTS.RDY == 0\n",

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

		       cmd->common.opcode);

		return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;

	}
@@ -545,6 +545,6 @@ int nvmet_parse_admin_cmd(struct nvmet_req *req) 
		return 0;

	}



	pr_err("nvmet: unhandled cmd %d\n", cmd->common.opcode);

	pr_err("unhandled cmd %d\n", cmd->common.opcode);

	return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

}

drivers/nvme/target/core.c

+2 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ int nvmet_ns_enable(struct nvmet_ns *ns) 
	ns->bdev = blkdev_get_by_path(ns->device_path, FMODE_READ | FMODE_WRITE,

			NULL);

	if (IS_ERR(ns->bdev)) {

		pr_err("nvmet: failed to open block device %s: (%ld)\n",

		pr_err("failed to open block device %s: (%ld)\n",

		       ns->device_path, PTR_ERR(ns->bdev));

		ret = PTR_ERR(ns->bdev);

		ns->bdev = NULL;

drivers/nvme/target/discovery.c

+8 −9
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int nvmet_parse_discovery_cmd(struct nvmet_req *req) 
	req->ns = NULL;



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

		pr_err("nvmet: got cmd %d while not ready\n",

		pr_err("got cmd %d while not ready\n",

		       cmd->common.opcode);

		return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

	}
@@ -180,7 +180,7 @@ int nvmet_parse_discovery_cmd(struct nvmet_req *req) 
			req->execute = nvmet_execute_get_disc_log_page;

			return 0;

		default:

			pr_err("nvmet: unsupported get_log_page lid %d\n",

			pr_err("unsupported get_log_page lid %d\n",

			       cmd->get_log_page.lid);

		return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

		}
@@ -192,17 +192,16 @@ int nvmet_parse_discovery_cmd(struct nvmet_req *req) 
				nvmet_execute_identify_disc_ctrl;

			return 0;

		default:

			pr_err("nvmet: unsupported identify cns %d\n",

			pr_err("unsupported identify cns %d\n",

			       cmd->identify.cns);

			return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

		}

	default:

		pr_err("nvmet: unsupported cmd %d\n",

				cmd->common.opcode);

		pr_err("unsupported cmd %d\n", cmd->common.opcode);

		return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

	}



	pr_err("nvmet: unhandled cmd %d\n", cmd->common.opcode);

	pr_err("unhandled cmd %d\n", cmd->common.opcode);

	return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

}

drivers/nvme/target/io-cmd.c

+5 −5
Original line number Diff line number Diff line
@@ -201,14 +201,14 @@ int nvmet_parse_io_cmd(struct nvmet_req *req) 
	struct nvme_command *cmd = req->cmd;



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

		pr_err("nvmet: got io cmd %d while CC.EN == 0\n",

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

		       cmd->common.opcode);

		req->ns = NULL;

		return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;

	}



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

		pr_err("nvmet: got io cmd %d while CSTS.RDY == 0\n",

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

		       cmd->common.opcode);

		req->ns = NULL;

		return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
@@ -237,7 +237,7 @@ int nvmet_parse_io_cmd(struct nvmet_req *req) 
		req->execute = nvmet_execute_write_zeroes;

		return 0;

	default:

		pr_err("nvmet: unhandled cmd %d\n", cmd->common.opcode);

		pr_err("unhandled cmd %d\n", cmd->common.opcode);

		return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

	}

}