2007-11-05 11:46:34

by Swen Schillig

[permalink] [raw]
Subject: [patch 2/6] zfcp: Use also port and adapter to identify unit in messages.

From: Christof Schmitt <[email protected]>

Signed-off-by: Christof Schmitt <[email protected]>
Signed-off-by: Swen Schillig <[email protected]>
---

drivers/s390/scsi/zfcp_scsi.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff -urpN linux-2.6/drivers/s390/scsi/zfcp_scsi.c linux-2.6-patched/drivers/s390/scsi/zfcp_scsi.c
--- linux-2.6/drivers/s390/scsi/zfcp_scsi.c 2007-11-02 08:38:25.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_scsi.c 2007-11-02 08:38:25.000000000 +0100
@@ -458,7 +458,9 @@ zfcp_scsi_eh_device_reset_handler(struct
retval = SUCCESS;
goto out;
}
- ZFCP_LOG_NORMAL("resetting unit 0x%016Lx\n", unit->fcp_lun);
+ ZFCP_LOG_NORMAL("resetting unit 0x%016Lx on port 0x%016Lx, adapter %s\n",
+ unit->fcp_lun, unit->port->wwpn,
+ zfcp_get_busid_by_adapter(unit->port->adapter));

/*
* If we do not know whether the unit supports 'logical unit reset'
@@ -552,7 +554,9 @@ static int zfcp_scsi_eh_host_reset_handl
adapter = unit->port->adapter;

ZFCP_LOG_NORMAL("host reset because of problems with "
- "unit 0x%016Lx\n", unit->fcp_lun);
+ "unit 0x%016Lx on port 0x%016Lx, adapter %s\n",
+ unit->fcp_lun, unit->port->wwpn,
+ zfcp_get_busid_by_adapter(unit->port->adapter));

zfcp_erp_adapter_reopen(adapter, 0);
zfcp_erp_wait(adapter);

--