From 311964ade4a2c653066c338514e4be9f5844da32 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Sun, 28 Aug 2005 13:22:37 -0700 Subject: [PATCH] --- yaml --- r: 6033 b: refs/heads/master c: 20b1730af3ae05450b0e03f5aed40c4313f65db6 h: refs/heads/master i: 6031: 7660d54643bd82aafe677a5afe0fc19fafeaaf68 v: v3 --- [refs] | 2 +- trunk/drivers/s390/scsi/zfcp_aux.c | 5 ++--- trunk/drivers/s390/scsi/zfcp_ccw.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d7375221b31c..848585b4d2f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f84f226389fc5f47b3cb36818972e2e171607de +refs/heads/master: 20b1730af3ae05450b0e03f5aed40c4313f65db6 diff --git a/trunk/drivers/s390/scsi/zfcp_aux.c b/trunk/drivers/s390/scsi/zfcp_aux.c index 6fed4a532ca3..bfe3ba73bc0f 100644 --- a/trunk/drivers/s390/scsi/zfcp_aux.c +++ b/trunk/drivers/s390/scsi/zfcp_aux.c @@ -1403,15 +1403,14 @@ zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn, u32 status, void zfcp_port_dequeue(struct zfcp_port *port) { - struct fc_port *rport; - zfcp_port_wait(port); write_lock_irq(&zfcp_data.config_lock); list_del(&port->list); port->adapter->ports--; write_unlock_irq(&zfcp_data.config_lock); if (port->rport) - fc_remote_port_delete(rport); + fc_remote_port_delete(port->rport); + port->rport = NULL; zfcp_adapter_put(port->adapter); zfcp_sysfs_port_remove_files(&port->sysfs_device, atomic_read(&port->status)); diff --git a/trunk/drivers/s390/scsi/zfcp_ccw.c b/trunk/drivers/s390/scsi/zfcp_ccw.c index 3c65aedaa97f..b30abab77da3 100644 --- a/trunk/drivers/s390/scsi/zfcp_ccw.c +++ b/trunk/drivers/s390/scsi/zfcp_ccw.c @@ -203,7 +203,7 @@ zfcp_ccw_set_offline(struct ccw_device *ccw_device) { struct zfcp_adapter *adapter; struct zfcp_port *port; - struct fc_port *rport; + struct fc_rport *rport; down(&zfcp_data.config_sema); adapter = dev_get_drvdata(&ccw_device->dev);