From: Swen Schillig <swen@vnet.ibm.com>
Date: Wed, 1 Oct 2008 10:42:23 +0000 (+0200)
Subject: [SCSI] zfcp: prevent fc_remote_port_delete calls for unregistered rport
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e4e9ba5d9313f362d2192fb7a2d35a3bfb714b1e;p=deliverable%2Flinux.git

[SCSI] zfcp: prevent fc_remote_port_delete calls for unregistered rport

In case of an adapter reopen all rports have to be deleted from the
environment. This should only happen for already registered rports
otherwise fc_remote_port_delete is called with a NULL pointer.

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>
---

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index f5ebeb7ca2be..8c117416d5ad 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1236,6 +1236,8 @@ static void zfcp_erp_rports_del(struct zfcp_adapter *adapter)
 {
 	struct zfcp_port *port;
 	list_for_each_entry(port, &adapter->port_list_head, list) {
+		if (!port->rport)
+			continue;
 		fc_remote_port_delete(port->rport);
 		port->rport = NULL;
 	}