From: Michael Christie <mchristi@redhat.com>
Date: Tue, 10 Apr 2012 11:20:23 +0000 (+0530)
Subject: qla2xxx: Remove check for null fcport from host reset handler.
X-Git-Tag: v2.6.39-400.9.0~423^2~93
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ef3ad4e10775254dbd0812ea0496ac5d85b0f22d;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Remove check for null fcport from host reset handler.

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.

JIRA Key: V2632FC-89

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 0827af88fc6bb..ed318d10a2239 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1112,7 +1112,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;
@@ -1121,15 +1120,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);