From: Chad Dupuis <chad.dupuis@qlogic.com>
To: jbottomley@parallels.com
Cc: giridhar.malavali@qlogic.com, chad.dupuis@qlogic.com,
andrew.vasquez@qlogic.com, linux-scsi@vger.kernel.org
Subject: [PATCH 07/11] qla2xxx: Remove check for null fcport from host reset handler.
Date: Thu, 9 Feb 2012 11:14:09 -0800 [thread overview]
Message-ID: <1328814853-21764-8-git-send-email-chad.dupuis@qlogic.com> (raw)
In-Reply-To: <1328814853-21764-1-git-send-email-chad.dupuis@qlogic.com>
From: Michael Christie <mchristi@redhat.com>
Remove the check for a NULL fcport so that the host reset will run
unconditionally to unwedge any commands before the device is offlined and to
prevent a quick runthrough of the SCSI error handling.
Signed-off-by: Michael Christie <mchristi@redhat.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---
drivers/scsi/qla2xxx/qla_os.c | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 7e617a6..036030c 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1131,7 +1131,6 @@ static int
qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
{
scsi_qla_host_t *vha = shost_priv(cmd->device->host);
- fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
struct qla_hw_data *ha = vha->hw;
int ret = FAILED;
unsigned int id, lun;
@@ -1140,15 +1139,6 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
id = cmd->device->id;
lun = cmd->device->lun;
- if (!fcport) {
- return ret;
- }
-
- ret = fc_block_scsi_eh(cmd);
- if (ret != 0)
- return ret;
- ret = FAILED;
-
ql_log(ql_log_info, vha, 0x8018,
"ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);
--
1.6.0.2
next prev parent reply other threads:[~2012-02-09 19:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 19:14 [PATCH 00/11] qla2xxx: Patches for 3.3-rc Chad Dupuis
2012-02-09 19:14 ` [PATCH 01/11] qla2xxx: Propagate up abort failures Chad Dupuis
2012-02-09 19:14 ` [PATCH 02/11] qla2xxx: Add check for null fcport references in qla2xxx_queuecommand Chad Dupuis
2012-02-09 19:14 ` [PATCH 03/11] qla2xxx: Add an "is reset active" helper Chad Dupuis
2012-02-09 19:14 ` [PATCH 04/11] qla2xxx: Clear options-flags while issuing stop-firmware mbx command Chad Dupuis
2012-02-09 19:14 ` [PATCH 05/11] qla2xxx: Remove errant clearing of MBX_INTERRUPT flag during CT-IOCB processing Chad Dupuis
2012-02-09 19:14 ` [PATCH 06/11] qla2xxx: Correct out of bounds read of ISP2200 mailbox registers Chad Dupuis
2012-02-09 19:14 ` Chad Dupuis [this message]
2012-02-09 19:14 ` [PATCH 08/11] qla2xxx: Complete mailbox command timedout to avoid initialization failures during next reset cycle Chad Dupuis
2012-02-09 19:14 ` [PATCH 09/11] qla2xxx: Remove resetting memory during device initialization for ISP82xx Chad Dupuis
2012-02-09 19:14 ` [PATCH 10/11] qla2xxx: Proper detection of firmware abort error code " Chad Dupuis
2012-02-09 19:14 ` [PATCH 11/11] qla2xxx: Update version number to 8.03.07.13-k Chad Dupuis
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=1328814853-21764-8-git-send-email-chad.dupuis@qlogic.com \
--to=chad.dupuis@qlogic.com \
--cc=andrew.vasquez@qlogic.com \
--cc=giridhar.malavali@qlogic.com \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
/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).