Commit 7db39484 authored by James Smart's avatar James Smart Committed by Jens Axboe
Browse files

nvme-fc: clarify error messages 



Change wording on a couple of messages to clarify what happened.

Signed-off-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 44fbf3bb

drivers/nvme/host/fc.c

+6 −5
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ nvme_fc_connect_admin_queue(struct nvme_fc_ctrl *ctrl, 
	if (fcret) {

		ret = -EBADF;

		dev_err(ctrl->dev,

			"q %d connect failed: %s\n",

			"q %d Create Association LS failed: %s\n",

			queue->qnum, validation_errors[fcret]);

	} else {

		ctrl->association_id =
@@ -1363,7 +1363,7 @@ nvme_fc_connect_queue(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue, 
	if (fcret) {

		ret = -EBADF;

		dev_err(ctrl->dev,

			"q %d connect failed: %s\n",

			"q %d Create I/O Connection LS failed: %s\n",

			queue->qnum, validation_errors[fcret]);

	} else {

		queue->connection_id =
@@ -1376,7 +1376,7 @@ out_free_buffer: 
out_no_memory:

	if (ret)

		dev_err(ctrl->dev,

			"queue %d connect command failed (%d).\n",

			"queue %d connect I/O queue failed (%d).\n",

			queue->qnum, ret);

	return ret;

}
@@ -2698,7 +2698,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
		/* warn if maxcmd is lower than queue_size */

		dev_warn(ctrl->ctrl.device,

			"queue_size %zu > ctrl maxcmd %u, reducing "

			"to queue_size\n",

			"to maxcmd\n",

			opts->queue_size, ctrl->ctrl.maxcmd);

		opts->queue_size = ctrl->ctrl.maxcmd;

	}
@@ -2706,7 +2706,8 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
	if (opts->queue_size > ctrl->ctrl.sqsize + 1) {

		/* warn if sqsize is lower than queue_size */

		dev_warn(ctrl->ctrl.device,

			"queue_size %zu > ctrl sqsize %u, clamping down\n",

			"queue_size %zu > ctrl sqsize %u, reducing "

			"to sqsize\n",

			opts->queue_size, ctrl->ctrl.sqsize + 1);

		opts->queue_size = ctrl->ctrl.sqsize + 1;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE