nvmet-fc: use pr_* print macros instead of dev_*

Many of the nvmet-fc log messages cannot print the device used, because
it's not there yet:

  (NULL device *): {0:0} Association deleted

Use the pr_* macros consistently throughout the module and match the
output of the nvme-fc module.

Using port:association ids are more useful when debugging what's going
on, because these match now with the log entries from nvme-fc.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Daniel Wagner <wagi@kernel.org>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
index 7d84527d5a43efe1d43ccf5fb8010a4884f99e3e..0d9784004c9b27afa3e694d0c55a70b19483e618 100644 (file)
--- a/drivers/nvme/target/fc.c
+++ b/drivers/nvme/target/fc.c
@@ -490,8 +490,7 @@ nvmet_fc_xmt_disconnect_assoc(struct nvmet_fc_tgt_assoc *assoc)
                        sizeof(*discon_rqst) + sizeof(*discon_acc) +
                        tgtport->ops->lsrqst_priv_sz), GFP_KERNEL);
        if (!lsop) {
-               dev_info(tgtport->dev,
-                       "{%d:%d} send Disconnect Association failed: ENOMEM\n",
+               pr_info("{%d:%d}: send Disconnect Association failed: ENOMEM\n",
                        tgtport->fc_target_port.port_num, assoc->a_id);
                return;
        }
@@ -513,8 +512,7 @@ nvmet_fc_xmt_disconnect_assoc(struct nvmet_fc_tgt_assoc *assoc)
        ret = nvmet_fc_send_ls_req_async(tgtport, lsop,
                                nvmet_fc_disconnect_assoc_done);
        if (ret) {
-               dev_info(tgtport->dev,
-                       "{%d:%d} XMT Disconnect Association failed: %d\n",
+               pr_info("{%d:%d}: XMT Disconnect Association failed: %d\n",
                        tgtport->fc_target_port.port_num, assoc->a_id, ret);
                kfree(lsop);
        }
@@ -1187,8 +1185,7 @@ nvmet_fc_target_assoc_free(struct kref *ref)
        if (oldls)
                nvmet_fc_xmt_ls_rsp(tgtport, oldls);
        ida_free(&tgtport->assoc_cnt, assoc->a_id);
-       dev_info(tgtport->dev,
-               "{%d:%d} Association freed\n",
+       pr_info("{%d:%d}: Association freed\n",
                tgtport->fc_target_port.port_num, assoc->a_id);
        kfree(assoc);
 }
@@ -1224,8 +1221,7 @@ nvmet_fc_delete_target_assoc(struct nvmet_fc_tgt_assoc *assoc)
                        flush_workqueue(assoc->queues[i]->work_q);
        }
 
-       dev_info(tgtport->dev,
-               "{%d:%d} Association deleted\n",
+       pr_info("{%d:%d}: Association deleted\n",
                tgtport->fc_target_port.port_num, assoc->a_id);
 
        nvmet_fc_tgtport_put(tgtport);
@@ -1716,9 +1712,9 @@ nvmet_fc_ls_create_association(struct nvmet_fc_tgtport *tgtport,
        }
 
        if (ret) {
-               dev_err(tgtport->dev,
-                       "Create Association LS failed: %s\n",
-                       validation_errors[ret]);
+               pr_err("{%d}: Create Association LS failed: %s\n",
+                      tgtport->fc_target_port.port_num,
+                      validation_errors[ret]);
                iod->lsrsp->rsplen = nvme_fc_format_rjt(acc,
                                sizeof(*acc), rqst->w0.ls_cmd,
                                FCNVME_RJT_RC_LOGIC,
@@ -1730,8 +1726,7 @@ nvmet_fc_ls_create_association(struct nvmet_fc_tgtport *tgtport,
        atomic_set(&queue->connected, 1);
        queue->sqhd = 0;        /* best place to init value */
 
-       dev_info(tgtport->dev,
-               "{%d:%d} Association created\n",
+       pr_info("{%d:%d}: Association created\n",
                tgtport->fc_target_port.port_num, iod->assoc->a_id);
 
        /* format a response */
@@ -1809,9 +1804,9 @@ nvmet_fc_ls_create_connection(struct nvmet_fc_tgtport *tgtport,
        }
 
        if (ret) {
-               dev_err(tgtport->dev,
-                       "Create Connection LS failed: %s\n",
-                       validation_errors[ret]);
+               pr_err("{%d}: Create Connection LS failed: %s\n",
+                      tgtport->fc_target_port.port_num,
+                      validation_errors[ret]);
                iod->lsrsp->rsplen = nvme_fc_format_rjt(acc,
                                sizeof(*acc), rqst->w0.ls_cmd,
                                (ret == VERR_NO_ASSOC) ?
@@ -1871,9 +1866,9 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport,
        }
 
        if (ret || !assoc) {
-               dev_err(tgtport->dev,
-                       "Disconnect LS failed: %s\n",
-                       validation_errors[ret]);
+               pr_err("{%d}: Disconnect LS failed: %s\n",
+                      tgtport->fc_target_port.port_num,
+                      validation_errors[ret]);
                iod->lsrsp->rsplen = nvme_fc_format_rjt(acc,
                                sizeof(*acc), rqst->w0.ls_cmd,
                                (ret == VERR_NO_ASSOC) ?
@@ -1907,8 +1902,7 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport,
        spin_unlock_irqrestore(&tgtport->lock, flags);
 
        if (oldls) {
-               dev_info(tgtport->dev,
-                       "{%d:%d} Multiple Disconnect Association LS's "
+               pr_info("{%d:%d}: Multiple Disconnect Association LS's "
                        "received\n",
                        tgtport->fc_target_port.port_num, assoc->a_id);
                /* overwrite good response with bogus failure */
@@ -2051,8 +2045,8 @@ nvmet_fc_rcv_ls_req(struct nvmet_fc_target_port *target_port,
        struct fcnvme_ls_rqst_w0 *w0 = (struct fcnvme_ls_rqst_w0 *)lsreqbuf;
 
        if (lsreqbuf_len > sizeof(union nvmefc_ls_requests)) {
-               dev_info(tgtport->dev,
-                       "RCV %s LS failed: payload too large (%d)\n",
+               pr_info("{%d}: RCV %s LS failed: payload too large (%d)\n",
+                       tgtport->fc_target_port.port_num,
                        (w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ?
                                nvmefc_ls_names[w0->ls_cmd] : "",
                        lsreqbuf_len);
@@ -2060,8 +2054,8 @@ nvmet_fc_rcv_ls_req(struct nvmet_fc_target_port *target_port,
        }
 
        if (!nvmet_fc_tgtport_get(tgtport)) {
-               dev_info(tgtport->dev,
-                       "RCV %s LS failed: target deleting\n",
+               pr_info("{%d}: RCV %s LS failed: target deleting\n",
+                       tgtport->fc_target_port.port_num,
                        (w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ?
                                nvmefc_ls_names[w0->ls_cmd] : "");
                return -ESHUTDOWN;
@@ -2069,8 +2063,8 @@ nvmet_fc_rcv_ls_req(struct nvmet_fc_target_port *target_port,
 
        iod = nvmet_fc_alloc_ls_iod(tgtport);
        if (!iod) {
-               dev_info(tgtport->dev,
-                       "RCV %s LS failed: context allocation failed\n",
+               pr_info("{%d}: RCV %s LS failed: context allocation failed\n",
+                       tgtport->fc_target_port.port_num,
                        (w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ?
                                nvmefc_ls_names[w0->ls_cmd] : "");
                nvmet_fc_tgtport_put(tgtport);