Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7a99278 authored by Michael Christie's avatar Michael Christie Committed by James Bottomley
Browse files

[SCSI] 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.

Signed-off-by: default avatarMichael Christie <mchristi@redhat.com>
Signed-off-by: default avatarChad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 67ddda35

drivers/scsi/qla2xxx/qla_os.c

+0 −10
Original line number Diff line number Diff line
@@ -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);