Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Daniel Wagner and committed by
Keith Busch
57413f08 86ef6f7f

+21 -27
+21 -27
drivers/nvme/target/fc.c
··· 490 490 sizeof(*discon_rqst) + sizeof(*discon_acc) + 491 491 tgtport->ops->lsrqst_priv_sz), GFP_KERNEL); 492 492 if (!lsop) { 493 - dev_info(tgtport->dev, 494 - "{%d:%d} send Disconnect Association failed: ENOMEM\n", 493 + pr_info("{%d:%d}: send Disconnect Association failed: ENOMEM\n", 495 494 tgtport->fc_target_port.port_num, assoc->a_id); 496 495 return; 497 496 } ··· 512 513 ret = nvmet_fc_send_ls_req_async(tgtport, lsop, 513 514 nvmet_fc_disconnect_assoc_done); 514 515 if (ret) { 515 - dev_info(tgtport->dev, 516 - "{%d:%d} XMT Disconnect Association failed: %d\n", 516 + pr_info("{%d:%d}: XMT Disconnect Association failed: %d\n", 517 517 tgtport->fc_target_port.port_num, assoc->a_id, ret); 518 518 kfree(lsop); 519 519 } ··· 1185 1187 if (oldls) 1186 1188 nvmet_fc_xmt_ls_rsp(tgtport, oldls); 1187 1189 ida_free(&tgtport->assoc_cnt, assoc->a_id); 1188 - dev_info(tgtport->dev, 1189 - "{%d:%d} Association freed\n", 1190 + pr_info("{%d:%d}: Association freed\n", 1190 1191 tgtport->fc_target_port.port_num, assoc->a_id); 1191 1192 kfree(assoc); 1192 1193 } ··· 1221 1224 flush_workqueue(assoc->queues[i]->work_q); 1222 1225 } 1223 1226 1224 - dev_info(tgtport->dev, 1225 - "{%d:%d} Association deleted\n", 1227 + pr_info("{%d:%d}: Association deleted\n", 1226 1228 tgtport->fc_target_port.port_num, assoc->a_id); 1227 1229 1228 1230 nvmet_fc_tgtport_put(tgtport); ··· 1712 1716 } 1713 1717 1714 1718 if (ret) { 1715 - dev_err(tgtport->dev, 1716 - "Create Association LS failed: %s\n", 1717 - validation_errors[ret]); 1719 + pr_err("{%d}: Create Association LS failed: %s\n", 1720 + tgtport->fc_target_port.port_num, 1721 + validation_errors[ret]); 1718 1722 iod->lsrsp->rsplen = nvme_fc_format_rjt(acc, 1719 1723 sizeof(*acc), rqst->w0.ls_cmd, 1720 1724 FCNVME_RJT_RC_LOGIC, ··· 1726 1730 atomic_set(&queue->connected, 1); 1727 1731 queue->sqhd = 0; /* best place to init value */ 1728 1732 1729 - dev_info(tgtport->dev, 1730 - "{%d:%d} Association created\n", 1733 + pr_info("{%d:%d}: Association created\n", 1731 1734 tgtport->fc_target_port.port_num, iod->assoc->a_id); 1732 1735 1733 1736 /* format a response */ ··· 1804 1809 } 1805 1810 1806 1811 if (ret) { 1807 - dev_err(tgtport->dev, 1808 - "Create Connection LS failed: %s\n", 1809 - validation_errors[ret]); 1812 + pr_err("{%d}: Create Connection LS failed: %s\n", 1813 + tgtport->fc_target_port.port_num, 1814 + validation_errors[ret]); 1810 1815 iod->lsrsp->rsplen = nvme_fc_format_rjt(acc, 1811 1816 sizeof(*acc), rqst->w0.ls_cmd, 1812 1817 (ret == VERR_NO_ASSOC) ? ··· 1866 1871 } 1867 1872 1868 1873 if (ret || !assoc) { 1869 - dev_err(tgtport->dev, 1870 - "Disconnect LS failed: %s\n", 1871 - validation_errors[ret]); 1874 + pr_err("{%d}: Disconnect LS failed: %s\n", 1875 + tgtport->fc_target_port.port_num, 1876 + validation_errors[ret]); 1872 1877 iod->lsrsp->rsplen = nvme_fc_format_rjt(acc, 1873 1878 sizeof(*acc), rqst->w0.ls_cmd, 1874 1879 (ret == VERR_NO_ASSOC) ? ··· 1902 1907 spin_unlock_irqrestore(&tgtport->lock, flags); 1903 1908 1904 1909 if (oldls) { 1905 - dev_info(tgtport->dev, 1906 - "{%d:%d} Multiple Disconnect Association LS's " 1910 + pr_info("{%d:%d}: Multiple Disconnect Association LS's " 1907 1911 "received\n", 1908 1912 tgtport->fc_target_port.port_num, assoc->a_id); 1909 1913 /* overwrite good response with bogus failure */ ··· 2045 2051 struct fcnvme_ls_rqst_w0 *w0 = (struct fcnvme_ls_rqst_w0 *)lsreqbuf; 2046 2052 2047 2053 if (lsreqbuf_len > sizeof(union nvmefc_ls_requests)) { 2048 - dev_info(tgtport->dev, 2049 - "RCV %s LS failed: payload too large (%d)\n", 2054 + pr_info("{%d}: RCV %s LS failed: payload too large (%d)\n", 2055 + tgtport->fc_target_port.port_num, 2050 2056 (w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ? 2051 2057 nvmefc_ls_names[w0->ls_cmd] : "", 2052 2058 lsreqbuf_len); ··· 2054 2060 } 2055 2061 2056 2062 if (!nvmet_fc_tgtport_get(tgtport)) { 2057 - dev_info(tgtport->dev, 2058 - "RCV %s LS failed: target deleting\n", 2063 + pr_info("{%d}: RCV %s LS failed: target deleting\n", 2064 + tgtport->fc_target_port.port_num, 2059 2065 (w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ? 2060 2066 nvmefc_ls_names[w0->ls_cmd] : ""); 2061 2067 return -ESHUTDOWN; ··· 2063 2069 2064 2070 iod = nvmet_fc_alloc_ls_iod(tgtport); 2065 2071 if (!iod) { 2066 - dev_info(tgtport->dev, 2067 - "RCV %s LS failed: context allocation failed\n", 2072 + pr_info("{%d}: RCV %s LS failed: context allocation failed\n", 2073 + tgtport->fc_target_port.port_num, 2068 2074 (w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ? 2069 2075 nvmefc_ls_names[w0->ls_cmd] : ""); 2070 2076 nvmet_fc_tgtport_put(tgtport);