linux-s390.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christof Schmitt <christof.schmitt@de.ibm.com>
To: James Bottomley <James.Bottomley@suse.de>
Cc: linux-scsi@vger.kernel.org, linux-s390@vger.kernel.org,
	schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
	Christof Schmitt <christof.schmitt@de.ibm.com>
Subject: [patch 4/9] zfcp: Do not unblock rport from REOPEN_PORT_FORCED
Date: Thu, 08 Jul 2010 09:53:05 +0200	[thread overview]
Message-ID: <20100708080110.337185000@de.ibm.com> (raw)
In-Reply-To: 20100708075301.347904000@de.ibm.com

[-- Attachment #1: 708-zfcp-rport-unblock.diff --]
[-- Type: text/plain, Size: 1123 bytes --]

From: Christof Schmitt <christof.schmitt@de.ibm.com>

When the REOPEN_PORT_FORCED erp action succeeds, the port has been
closed. A REOPEN_PORT will try to open the port after the
REPORT_PORT_FORCED. The rport should only be unblocked after the
successful completion of the reopen port.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
---

 drivers/s390/scsi/zfcp_erp.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -urpN linux-2.6/drivers/s390/scsi/zfcp_erp.c linux-2.6-patched/drivers/s390/scsi/zfcp_erp.c
--- linux-2.6/drivers/s390/scsi/zfcp_erp.c	2010-07-06 09:22:09.000000000 +0200
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_erp.c	2010-07-06 09:22:11.000000000 +0200
@@ -1197,10 +1197,11 @@ static void zfcp_erp_action_cleanup(stru
 		put_device(&unit->dev);
 		break;
 
-	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
 	case ZFCP_ERP_ACTION_REOPEN_PORT:
 		if (result == ZFCP_ERP_SUCCEEDED)
 			zfcp_scsi_schedule_rport_register(port);
+		/* fall through */
+	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
 		put_device(&port->dev);
 		break;
 

  parent reply	other threads:[~2010-07-08  7:53 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-08  7:53 [patch 0/9] zfcp bug fixes for 2.6.35-rc4 Christof Schmitt
2010-07-08  7:53 ` [patch 1/9] zfcp: Fix check whether unchained ct_els is possible Christof Schmitt
2010-07-08  7:53 ` [patch 2/9] zfcp: Do not wait for SBALs on stopped queue Christof Schmitt
2010-07-08  7:53 ` [patch 3/9] zfcp: Update status read mempool Christof Schmitt
2010-07-08  7:53 ` Christof Schmitt [this message]
2010-07-08  7:53 ` [patch 5/9] zfcp: Do not try "forced close" when port is already closed Christof Schmitt
2010-07-08  7:53 ` [patch 6/9] zfcp: Register SCSI devices after successful fc_remote_port_add Christof Schmitt
2010-07-08  7:53 ` [patch 7/9] zfcp: Use forced_reopen in terminate_rport_io callback Christof Schmitt
2010-07-08  7:53 ` [patch 8/9] zfcp: Fail erp after timeout Christof Schmitt
2010-07-08  7:53 ` [patch 9/9] zfcp: Fix retry after failed "open port" erp action Christof Schmitt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100708080110.337185000@de.ibm.com \
    --to=christof.schmitt@de.ibm.com \
    --cc=James.Bottomley@suse.de \
    --cc=heiko.carstens@de.ibm.com \
    --cc=linux-s390@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=schwidefsky@de.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).