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

Commit 21cc0bd3 authored by Vasu Dev's avatar Vasu Dev Committed by James Bottomley
Browse files

[SCSI] libfc: block SCSI eh thread for blocked rports 



Call fc_block_scsi_eh() in all fcoe eh to blocks
the scsi_eh thread for blocked rports.

Signed-off-by: default avatarVasu Dev <vasu.dev@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Reviewed-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 77a2b73a

drivers/scsi/libfc/fc_fcp.c

+9 −2
Original line number Diff line number Diff line
@@ -2019,6 +2019,11 @@ int fc_eh_abort(struct scsi_cmnd *sc_cmd) 
	struct fc_fcp_internal *si;

	int rc = FAILED;

	unsigned long flags;

	int rval;



	rval = fc_block_scsi_eh(sc_cmd);

	if (rval)

		return rval;



	lport = shost_priv(sc_cmd->device->host);

	if (lport->state != LPORT_ST_READY)
@@ -2068,9 +2073,9 @@ int fc_eh_device_reset(struct scsi_cmnd *sc_cmd) 
	int rc = FAILED;

	int rval;



	rval = fc_remote_port_chkready(rport);

	rval = fc_block_scsi_eh(sc_cmd);

	if (rval)

		goto out;

		return rval;



	lport = shost_priv(sc_cmd->device->host);
@@ -2116,6 +2121,8 @@ int fc_eh_host_reset(struct scsi_cmnd *sc_cmd) 


	FC_SCSI_DBG(lport, "Resetting host\n");



	fc_block_scsi_eh(sc_cmd);



	lport->tt.lport_reset(lport);

	wait_tmo = jiffies + FC_HOST_RESET_TIMEOUT;

	while (!fc_fcp_lport_queue_ready(lport) && time_before(jiffies,