Skip to content

L
linux
Commit 1d589edf authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files
Options

[SCSI] zfcp: print S_ID and D_ID with 3 bytes 

S_ID and D_ID are defined in the FCP spec as 3 byte fields.
Change the output in zfcp print statements accordingly to print
them with only 3 bytes.
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 463fc696
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
drivers/s390/scsi/zfcp_aux.c
View file @ 1d589edf
...@@ -1497,7 +1497,7 @@ zfcp_fsf_incoming_els_plogi(struct zfcp_adapter *adapter, ...@@ -1497,7 +1497,7 @@ zfcp_fsf_incoming_els_plogi(struct zfcp_adapter *adapter,
if (!port || (port->wwpn != (*(wwn_t *) &els_plogi->serv_param.wwpn))) { if (!port || (port->wwpn != (*(wwn_t *) &els_plogi->serv_param.wwpn))) {
ZFCP_LOG_DEBUG("ignored incoming PLOGI for nonexisting port " ZFCP_LOG_DEBUG("ignored incoming PLOGI for nonexisting port "
"with d_id 0x%08x on adapter %s\n", "with d_id 0x%06x on adapter %s\n",
status_buffer->d_id, status_buffer->d_id,
zfcp_get_busid_by_adapter(adapter)); zfcp_get_busid_by_adapter(adapter));
} else { } else {
...@@ -1522,7 +1522,7 @@ zfcp_fsf_incoming_els_logo(struct zfcp_adapter *adapter, ...@@ -1522,7 +1522,7 @@ zfcp_fsf_incoming_els_logo(struct zfcp_adapter *adapter,
if (!port || (port->wwpn != els_logo->nport_wwpn)) { if (!port || (port->wwpn != els_logo->nport_wwpn)) {
ZFCP_LOG_DEBUG("ignored incoming LOGO for nonexisting port " ZFCP_LOG_DEBUG("ignored incoming LOGO for nonexisting port "
"with d_id 0x%08x on adapter %s\n", "with d_id 0x%06x on adapter %s\n",
status_buffer->d_id, status_buffer->d_id,
zfcp_get_busid_by_adapter(adapter)); zfcp_get_busid_by_adapter(adapter));
} else { } else {
...@@ -1704,7 +1704,7 @@ static void zfcp_ns_gid_pn_handler(unsigned long data) ...@@ -1704,7 +1704,7 @@ static void zfcp_ns_gid_pn_handler(unsigned long data)
/* looks like a valid d_id */ /* looks like a valid d_id */
port->d_id = ct_iu_resp->d_id & ZFCP_DID_MASK; port->d_id = ct_iu_resp->d_id & ZFCP_DID_MASK;
atomic_set_mask(ZFCP_STATUS_PORT_DID_DID, &port->status); atomic_set_mask(ZFCP_STATUS_PORT_DID_DID, &port->status);
ZFCP_LOG_DEBUG("adapter %s: wwpn=0x%016Lx ---> d_id=0x%08x\n", ZFCP_LOG_DEBUG("adapter %s: wwpn=0x%016Lx ---> d_id=0x%06x\n",
zfcp_get_busid_by_port(port), port->wwpn, port->d_id); zfcp_get_busid_by_port(port), port->wwpn, port->d_id);
goto out; goto out;
......
drivers/s390/scsi/zfcp_erp.c
View file @ 1d589edf
...@@ -342,9 +342,9 @@ zfcp_erp_adisc(struct zfcp_port *port) ...@@ -342,9 +342,9 @@ zfcp_erp_adisc(struct zfcp_port *port)
adisc->wwpn = fc_host_port_name(adapter->scsi_host); adisc->wwpn = fc_host_port_name(adapter->scsi_host);
adisc->wwnn = fc_host_node_name(adapter->scsi_host); adisc->wwnn = fc_host_node_name(adapter->scsi_host);
adisc->nport_id = fc_host_port_id(adapter->scsi_host); adisc->nport_id = fc_host_port_id(adapter->scsi_host);
ZFCP_LOG_INFO("ADISC request from s_id 0x%08x to d_id 0x%08x " ZFCP_LOG_INFO("ADISC request from s_id 0x%06x to d_id 0x%06x "
"(wwpn=0x%016Lx, wwnn=0x%016Lx, " "(wwpn=0x%016Lx, wwnn=0x%016Lx, "
"hard_nport_id=0x%08x, nport_id=0x%08x)\n", "hard_nport_id=0x%06x, nport_id=0x%06x)\n",
adisc->nport_id, send_els->d_id, (wwn_t) adisc->wwpn, adisc->nport_id, send_els->d_id, (wwn_t) adisc->wwpn,
(wwn_t) adisc->wwnn, adisc->hard_nport_id, (wwn_t) adisc->wwnn, adisc->hard_nport_id,
adisc->nport_id); adisc->nport_id);
...@@ -352,7 +352,7 @@ zfcp_erp_adisc(struct zfcp_port *port) ...@@ -352,7 +352,7 @@ zfcp_erp_adisc(struct zfcp_port *port)
retval = zfcp_fsf_send_els(send_els); retval = zfcp_fsf_send_els(send_els);
if (retval != 0) { if (retval != 0) {
ZFCP_LOG_NORMAL("error: initiation of Send ELS failed for port " ZFCP_LOG_NORMAL("error: initiation of Send ELS failed for port "
"0x%08x on adapter %s\n", send_els->d_id, "0x%06x on adapter %s\n", send_els->d_id,
zfcp_get_busid_by_adapter(adapter)); zfcp_get_busid_by_adapter(adapter));
goto freemem; goto freemem;
} }
...@@ -398,7 +398,7 @@ zfcp_erp_adisc_handler(unsigned long data) ...@@ -398,7 +398,7 @@ zfcp_erp_adisc_handler(unsigned long data)
if (send_els->status != 0) { if (send_els->status != 0) {
ZFCP_LOG_NORMAL("ELS request rejected/timed out, " ZFCP_LOG_NORMAL("ELS request rejected/timed out, "
"force physical port reopen " "force physical port reopen "
"(adapter %s, port d_id=0x%08x)\n", "(adapter %s, port d_id=0x%06x)\n",
zfcp_get_busid_by_adapter(adapter), d_id); zfcp_get_busid_by_adapter(adapter), d_id);
debug_text_event(adapter->erp_dbf, 3, "forcreop"); debug_text_event(adapter->erp_dbf, 3, "forcreop");
if (zfcp_erp_port_forced_reopen(port, 0)) if (zfcp_erp_port_forced_reopen(port, 0))
...@@ -411,9 +411,9 @@ zfcp_erp_adisc_handler(unsigned long data) ...@@ -411,9 +411,9 @@ zfcp_erp_adisc_handler(unsigned long data)
adisc = zfcp_sg_to_address(send_els->resp); adisc = zfcp_sg_to_address(send_els->resp);
ZFCP_LOG_INFO("ADISC response from d_id 0x%08x to s_id " ZFCP_LOG_INFO("ADISC response from d_id 0x%06x to s_id "
"0x%08x (wwpn=0x%016Lx, wwnn=0x%016Lx, " "0x%06x (wwpn=0x%016Lx, wwnn=0x%016Lx, "
"hard_nport_id=0x%08x, nport_id=0x%08x)\n", "hard_nport_id=0x%06x, nport_id=0x%06x)\n",
d_id, fc_host_port_id(adapter->scsi_host), d_id, fc_host_port_id(adapter->scsi_host),
(wwn_t) adisc->wwpn, (wwn_t) adisc->wwnn, (wwn_t) adisc->wwpn, (wwn_t) adisc->wwnn,
adisc->hard_nport_id, adisc->nport_id); adisc->hard_nport_id, adisc->nport_id);
...@@ -1377,7 +1377,7 @@ zfcp_erp_port_failed(struct zfcp_port *port) ...@@ -1377,7 +1377,7 @@ zfcp_erp_port_failed(struct zfcp_port *port)
if (atomic_test_mask(ZFCP_STATUS_PORT_WKA, &port->status)) if (atomic_test_mask(ZFCP_STATUS_PORT_WKA, &port->status))
ZFCP_LOG_NORMAL("port erp failed (adapter %s, " ZFCP_LOG_NORMAL("port erp failed (adapter %s, "
"port d_id=0x%08x)\n", "port d_id=0x%06x)\n",
zfcp_get_busid_by_port(port), port->d_id); zfcp_get_busid_by_port(port), port->d_id);
else else
ZFCP_LOG_NORMAL("port erp failed (adapter %s, wwpn=0x%016Lx)\n", ZFCP_LOG_NORMAL("port erp failed (adapter %s, wwpn=0x%016Lx)\n",
...@@ -2401,7 +2401,7 @@ zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *erp_action) ...@@ -2401,7 +2401,7 @@ zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *erp_action)
retval = ZFCP_ERP_FAILED; retval = ZFCP_ERP_FAILED;
} }
} else { } else {
ZFCP_LOG_DEBUG("port 0x%016Lx has d_id=0x%08x -> " ZFCP_LOG_DEBUG("port 0x%016Lx has d_id=0x%06x -> "
"trying open\n", port->wwpn, port->d_id); "trying open\n", port->wwpn, port->d_id);
retval = zfcp_erp_port_strategy_open_port(erp_action); retval = zfcp_erp_port_strategy_open_port(erp_action);
} }
...@@ -2441,7 +2441,7 @@ zfcp_erp_port_strategy_open_nameserver(struct zfcp_erp_action *erp_action) ...@@ -2441,7 +2441,7 @@ zfcp_erp_port_strategy_open_nameserver(struct zfcp_erp_action *erp_action)
case ZFCP_ERP_STEP_UNINITIALIZED: case ZFCP_ERP_STEP_UNINITIALIZED:
case ZFCP_ERP_STEP_PHYS_PORT_CLOSING: case ZFCP_ERP_STEP_PHYS_PORT_CLOSING:
case ZFCP_ERP_STEP_PORT_CLOSING: case ZFCP_ERP_STEP_PORT_CLOSING:
ZFCP_LOG_DEBUG("port 0x%016Lx has d_id=0x%08x -> trying open\n", ZFCP_LOG_DEBUG("port 0x%016Lx has d_id=0x%06x -> trying open\n",
port->wwpn, port->d_id); port->wwpn, port->d_id);
retval = zfcp_erp_port_strategy_open_port(erp_action); retval = zfcp_erp_port_strategy_open_port(erp_action);
break; break;
......
drivers/s390/scsi/zfcp_fsf.c
View file @ 1d589edf
...@@ -828,7 +828,7 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req) ...@@ -828,7 +828,7 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req)
if (!port || (port->d_id != (status_buffer->d_id & ZFCP_DID_MASK))) { if (!port || (port->d_id != (status_buffer->d_id & ZFCP_DID_MASK))) {
ZFCP_LOG_NORMAL("bug: Reopen port indication received for" ZFCP_LOG_NORMAL("bug: Reopen port indication received for"
"nonexisting port with d_id 0x%08x on " "nonexisting port with d_id 0x%06x on "
"adapter %s. Ignored.\n", "adapter %s. Ignored.\n",
status_buffer->d_id & ZFCP_DID_MASK, status_buffer->d_id & ZFCP_DID_MASK,
zfcp_get_busid_by_adapter(adapter)); zfcp_get_busid_by_adapter(adapter));
...@@ -853,7 +853,7 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req) ...@@ -853,7 +853,7 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req)
&status_buffer->status_subtype, sizeof (u32)); &status_buffer->status_subtype, sizeof (u32));
ZFCP_LOG_NORMAL("bug: Undefined status subtype received " ZFCP_LOG_NORMAL("bug: Undefined status subtype received "
"for a reopen indication on port with " "for a reopen indication on port with "
"d_id 0x%08x on the adapter %s. " "d_id 0x%06x on the adapter %s. "
"Ignored. (debug info 0x%x)\n", "Ignored. (debug info 0x%x)\n",
status_buffer->d_id, status_buffer->d_id,
zfcp_get_busid_by_adapter(adapter), zfcp_get_busid_by_adapter(adapter),
...@@ -1156,7 +1156,7 @@ zfcp_fsf_abort_fcp_command(unsigned long old_req_id, ...@@ -1156,7 +1156,7 @@ zfcp_fsf_abort_fcp_command(unsigned long old_req_id,
} }
ZFCP_LOG_DEBUG("Abort FCP Command request initiated " ZFCP_LOG_DEBUG("Abort FCP Command request initiated "
"(adapter%s, port d_id=0x%08x, " "(adapter%s, port d_id=0x%06x, "
"unit x%016Lx, old_req_id=0x%lx)\n", "unit x%016Lx, old_req_id=0x%lx)\n",
zfcp_get_busid_by_adapter(adapter), zfcp_get_busid_by_adapter(adapter),
unit->port->d_id, unit->port->d_id,
...@@ -1554,7 +1554,7 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req) ...@@ -1554,7 +1554,7 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
case FSF_ACCESS_DENIED: case FSF_ACCESS_DENIED:
ZFCP_LOG_NORMAL("access denied, cannot send generic service " ZFCP_LOG_NORMAL("access denied, cannot send generic service "
"command (adapter %s, port d_id=0x%08x)\n", "command (adapter %s, port d_id=0x%06x)\n",
zfcp_get_busid_by_port(port), port->d_id); zfcp_get_busid_by_port(port), port->d_id);
for (counter = 0; counter < 2; counter++) { for (counter = 0; counter < 2; counter++) {
subtable = header->fsf_status_qual.halfword[counter * 2]; subtable = header->fsf_status_qual.halfword[counter * 2];
...@@ -1576,7 +1576,7 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req) ...@@ -1576,7 +1576,7 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
case FSF_GENERIC_COMMAND_REJECTED: case FSF_GENERIC_COMMAND_REJECTED:
ZFCP_LOG_INFO("generic service command rejected " ZFCP_LOG_INFO("generic service command rejected "
"(adapter %s, port d_id=0x%08x)\n", "(adapter %s, port d_id=0x%06x)\n",
zfcp_get_busid_by_port(port), port->d_id); zfcp_get_busid_by_port(port), port->d_id);
ZFCP_LOG_INFO("status qualifier:\n"); ZFCP_LOG_INFO("status qualifier:\n");
ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_INFO, ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_INFO,
...@@ -1602,7 +1602,7 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req) ...@@ -1602,7 +1602,7 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
case FSF_PORT_BOXED: case FSF_PORT_BOXED:
ZFCP_LOG_INFO("port needs to be reopened " ZFCP_LOG_INFO("port needs to be reopened "
"(adapter %s, port d_id=0x%08x)\n", "(adapter %s, port d_id=0x%06x)\n",
zfcp_get_busid_by_port(port), port->d_id); zfcp_get_busid_by_port(port), port->d_id);
debug_text_event(adapter->erp_dbf, 2, "fsf_s_pboxed"); debug_text_event(adapter->erp_dbf, 2, "fsf_s_pboxed");
zfcp_erp_port_boxed(port); zfcp_erp_port_boxed(port);
...@@ -1683,7 +1683,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els) ...@@ -1683,7 +1683,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
NULL, &lock_flags, &fsf_req); NULL, &lock_flags, &fsf_req);
if (ret < 0) { if (ret < 0) {
ZFCP_LOG_INFO("error: creation of ELS request failed " ZFCP_LOG_INFO("error: creation of ELS request failed "
"(adapter %s, port d_id: 0x%08x)\n", "(adapter %s, port d_id: 0x%06x)\n",
zfcp_get_busid_by_adapter(adapter), d_id); zfcp_get_busid_by_adapter(adapter), d_id);
goto failed_req; goto failed_req;
} }
...@@ -1708,7 +1708,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els) ...@@ -1708,7 +1708,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
ZFCP_MAX_SBALS_PER_ELS_REQ); ZFCP_MAX_SBALS_PER_ELS_REQ);
if (bytes <= 0) { if (bytes <= 0) {
ZFCP_LOG_INFO("error: creation of ELS request failed " ZFCP_LOG_INFO("error: creation of ELS request failed "
"(adapter %s, port d_id: 0x%08x)\n", "(adapter %s, port d_id: 0x%06x)\n",
zfcp_get_busid_by_adapter(adapter), d_id); zfcp_get_busid_by_adapter(adapter), d_id);
if (bytes == 0) { if (bytes == 0) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -1725,7 +1725,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els) ...@@ -1725,7 +1725,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
ZFCP_MAX_SBALS_PER_ELS_REQ); ZFCP_MAX_SBALS_PER_ELS_REQ);
if (bytes <= 0) { if (bytes <= 0) {
ZFCP_LOG_INFO("error: creation of ELS request failed " ZFCP_LOG_INFO("error: creation of ELS request failed "
"(adapter %s, port d_id: 0x%08x)\n", "(adapter %s, port d_id: 0x%06x)\n",
zfcp_get_busid_by_adapter(adapter), d_id); zfcp_get_busid_by_adapter(adapter), d_id);
if (bytes == 0) { if (bytes == 0) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -1739,7 +1739,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els) ...@@ -1739,7 +1739,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
/* reject request */ /* reject request */
ZFCP_LOG_INFO("error: microcode does not support chained SBALs" ZFCP_LOG_INFO("error: microcode does not support chained SBALs"
", ELS request too big (adapter %s, " ", ELS request too big (adapter %s, "
"port d_id: 0x%08x)\n", "port d_id: 0x%06x)\n",
zfcp_get_busid_by_adapter(adapter), d_id); zfcp_get_busid_by_adapter(adapter), d_id);
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto failed_send; goto failed_send;
...@@ -1760,13 +1760,13 @@ zfcp_fsf_send_els(struct zfcp_send_els *els) ...@@ -1760,13 +1760,13 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
ret = zfcp_fsf_req_send(fsf_req); ret = zfcp_fsf_req_send(fsf_req);
if (ret) { if (ret) {
ZFCP_LOG_DEBUG("error: initiation of ELS request failed " ZFCP_LOG_DEBUG("error: initiation of ELS request failed "
"(adapter %s, port d_id: 0x%08x)\n", "(adapter %s, port d_id: 0x%06x)\n",
zfcp_get_busid_by_adapter(adapter), d_id); zfcp_get_busid_by_adapter(adapter), d_id);
goto failed_send; goto failed_send;
} }
ZFCP_LOG_DEBUG("ELS request initiated (adapter %s, port d_id: " ZFCP_LOG_DEBUG("ELS request initiated (adapter %s, port d_id: "
"0x%08x)\n", zfcp_get_busid_by_adapter(adapter), d_id); "0x%06x)\n", zfcp_get_busid_by_adapter(adapter), d_id);
goto out; goto out;
failed_send: failed_send:
...@@ -1859,7 +1859,7 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req) ...@@ -1859,7 +1859,7 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
case FSF_ELS_COMMAND_REJECTED: case FSF_ELS_COMMAND_REJECTED:
ZFCP_LOG_INFO("ELS has been rejected because command filter " ZFCP_LOG_INFO("ELS has been rejected because command filter "
"prohibited sending " "prohibited sending "
"(adapter: %s, port d_id: 0x%08x)\n", "(adapter: %s, port d_id: 0x%06x)\n",
zfcp_get_busid_by_adapter(adapter), d_id); zfcp_get_busid_by_adapter(adapter), d_id);
break; break;
...@@ -1907,7 +1907,7 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req) ...@@ -1907,7 +1907,7 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
case FSF_ACCESS_DENIED: case FSF_ACCESS_DENIED:
ZFCP_LOG_NORMAL("access denied, cannot send ELS command " ZFCP_LOG_NORMAL("access denied, cannot send ELS command "
"(adapter %s, port d_id=0x%08x)\n", "(adapter %s, port d_id=0x%06x)\n",
zfcp_get_busid_by_adapter(adapter), d_id); zfcp_get_busid_by_adapter(adapter), d_id);
for (counter = 0; counter < 2; counter++) { for (counter = 0; counter < 2; counter++) {
subtable = header->fsf_status_qual.halfword[counter * 2]; subtable = header->fsf_status_qual.halfword[counter * 2];
...@@ -2070,7 +2070,7 @@ zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *fsf_req, int xchg_ok) ...@@ -2070,7 +2070,7 @@ zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *fsf_req, int xchg_ok)
ZFCP_LOG_NORMAL("The adapter %s reported the following characteristics:\n" ZFCP_LOG_NORMAL("The adapter %s reported the following characteristics:\n"
"WWNN 0x%016Lx, " "WWNN 0x%016Lx, "
"WWPN 0x%016Lx, " "WWPN 0x%016Lx, "
"S_ID 0x%08x,\n" "S_ID 0x%06x,\n"
"adapter version 0x%x, " "adapter version 0x%x, "
"LIC version 0x%x, " "LIC version 0x%x, "
"FC link speed %d Gb/s\n", "FC link speed %d Gb/s\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7