mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-18 11:11:27 +00:00
Merge of the trunk's r2582:
Mainline commit 3c01b4f9fbb43fc911acd33ea7a14ea7a4f9866b: From: Seokmann Ju <seokmann.ju@qlogic.com> Date: Thu, 22 Jan 2009 09:45:38 -0800 Subject: [PATCH] [SCSI] qla2xxx: Add checks for a valid fcport in dev-loss-tmo/terminate_rport_io callbacks. Commit f78badb1ae07e7f8b835ab2ea0b456ed3fc4caf4 ([SCSI] fc transport: pre-emptively terminate i/o upon dev_loss_tmo timeout) changed the callback semantics of dev_loss_tmo and terminate_rport_io such that repeated calls could be made. This could result in the the driver using stale (NULLed-out, in dev_loss_tmo) data from the rport. Correct this by addint a simple check to ensure a valid fcport is attached. Signed-off-by: Seokmann Ju <seokmann.ju@qlogic.com> Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@2599 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -1598,6 +1598,9 @@ qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport)
|
||||
struct Scsi_Host *host = rport_to_shost(rport);
|
||||
fc_port_t *fcport = *(fc_port_t **)rport->dd_data;
|
||||
|
||||
if (!fcport)
|
||||
return;
|
||||
|
||||
qla2x00_abort_fcport_cmds(fcport);
|
||||
|
||||
/*
|
||||
@@ -1615,6 +1618,9 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
|
||||
{
|
||||
fc_port_t *fcport = *(fc_port_t **)rport->dd_data;
|
||||
|
||||
if (!fcport)
|
||||
return;
|
||||
|
||||
qla2x00_abort_fcport_cmds(fcport);
|
||||
scsi_target_unblock(&rport->dev);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user