diff options
author | Swen Schillig <swen@vnet.ibm.com> | 2010-12-02 09:16:16 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-21 13:24:46 -0500 |
commit | ea4a3a6ac40e2a585654808d4aefb39a6d57dca0 (patch) | |
tree | c0da0843fc8d4087448ffc4e1b7992dab6aa62f5 /drivers/s390/scsi/zfcp_scsi.c | |
parent | 250a1352b95e1db3216e5c5d4f4365bea5122f4a (diff) |
[SCSI] zfcp: Redesign of the debug tracing final cleanup.
This patch is the final cleanup of the redesign from the zfcp tracing.
Structures and elements which were used by multiple areas of the
former debug tracing are now changed to the new scheme.
Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/s390/scsi/zfcp_scsi.c')
-rw-r--r-- | drivers/s390/scsi/zfcp_scsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index 8c5c1c89c098..59a653d15a19 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
@@ -154,7 +154,7 @@ static int zfcp_scsi_slave_alloc(struct scsi_device *sdev) | |||
154 | spin_lock_init(&zfcp_sdev->latencies.lock); | 154 | spin_lock_init(&zfcp_sdev->latencies.lock); |
155 | 155 | ||
156 | zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_RUNNING); | 156 | zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_RUNNING); |
157 | zfcp_erp_lun_reopen(sdev, 0, "scsla_1", NULL); | 157 | zfcp_erp_lun_reopen(sdev, 0, "scsla_1"); |
158 | zfcp_erp_wait(port->adapter); | 158 | zfcp_erp_wait(port->adapter); |
159 | 159 | ||
160 | return 0; | 160 | return 0; |
@@ -278,7 +278,7 @@ static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt) | |||
278 | struct zfcp_adapter *adapter = zfcp_sdev->port->adapter; | 278 | struct zfcp_adapter *adapter = zfcp_sdev->port->adapter; |
279 | int ret; | 279 | int ret; |
280 | 280 | ||
281 | zfcp_erp_adapter_reopen(adapter, 0, "schrh_1", scpnt); | 281 | zfcp_erp_adapter_reopen(adapter, 0, "schrh_1"); |
282 | zfcp_erp_wait(adapter); | 282 | zfcp_erp_wait(adapter); |
283 | ret = fc_block_scsi_eh(scpnt); | 283 | ret = fc_block_scsi_eh(scpnt); |
284 | if (ret) | 284 | if (ret) |
@@ -516,7 +516,7 @@ static void zfcp_scsi_terminate_rport_io(struct fc_rport *rport) | |||
516 | port = zfcp_get_port_by_wwpn(adapter, rport->port_name); | 516 | port = zfcp_get_port_by_wwpn(adapter, rport->port_name); |
517 | 517 | ||
518 | if (port) { | 518 | if (port) { |
519 | zfcp_erp_port_forced_reopen(port, 0, "sctrpi1", NULL); | 519 | zfcp_erp_port_forced_reopen(port, 0, "sctrpi1"); |
520 | put_device(&port->dev); | 520 | put_device(&port->dev); |
521 | } | 521 | } |
522 | } | 522 | } |