diff options
| author | Swen Schillig <swen@vnet.ibm.com> | 2009-07-13 15:06:12 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-07-30 08:49:58 -0500 |
| commit | 17a093ef018481ee1760da19568bad3c11da395d (patch) | |
| tree | 9e08225c884c1fe22c2e1b25e2715aed185a9241 /drivers/s390/scsi | |
| parent | 379d6bf6573ee6541a38bbe9140c1f0b94e3feae (diff) | |
| download | kernel_goldelico_gta04-17a093ef018481ee1760da19568bad3c11da395d.zip kernel_goldelico_gta04-17a093ef018481ee1760da19568bad3c11da395d.tar.gz kernel_goldelico_gta04-17a093ef018481ee1760da19568bad3c11da395d.tar.bz2 | |
[SCSI] zfcp: avoid double notify in lowmem scenario
In a LOWMEM condition an ERP notification would have been sent twice
causing an unpredictable behaviour of the ERP.
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@HansenPartnership.com>
Diffstat (limited to 'drivers/s390/scsi')
| -rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index b5562f9..c75d6f3 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c @@ -848,11 +848,17 @@ void zfcp_erp_port_strategy_open_lookup(struct work_struct *work) gid_pn_work); retval = zfcp_fc_ns_gid_pn(&port->erp_action); - if (retval == -ENOMEM) + if (!retval) { + port->erp_action.step = ZFCP_ERP_STEP_NAMESERVER_LOOKUP; + goto out; + } + if (retval == -ENOMEM) { zfcp_erp_notify(&port->erp_action, ZFCP_STATUS_ERP_LOWMEM); - port->erp_action.step = ZFCP_ERP_STEP_NAMESERVER_LOOKUP; - if (retval) - zfcp_erp_notify(&port->erp_action, 0); + goto out; + } + /* all other error condtions */ + zfcp_erp_notify(&port->erp_action, 0); +out: zfcp_port_put(port); } |