On 11/5/21 3:10 PM, Mike Christie wrote: > We can race where iscsi_session_recovery_timedout has woken up the error > handler thread and it's now setting the devices to offline, and > session_recovery_timedout's call to scsi_target_unblock is also trying to > set the device's state to transport-offline. We can then get a mix of > states. > > For the case where we can't relogin we want the devices to be in > transport-offline so when we have repaired the connection > __iscsi_unblock_session can set the state back to running. So this patch > has us set the device state then call into libiscsi to wake up the error > handler. > > Signed-off-by: Mike Christie <michael.christie@xxxxxxxxxx> > --- > drivers/scsi/scsi_transport_iscsi.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c > index 78343d3f9385..554b6f784223 100644 > --- a/drivers/scsi/scsi_transport_iscsi.c > +++ b/drivers/scsi/scsi_transport_iscsi.c > @@ -1899,12 +1899,12 @@ static void session_recovery_timedout(struct work_struct *work) > } > spin_unlock_irqrestore(&session->lock, flags); > > - if (session->transport->session_recovery_timedout) > - session->transport->session_recovery_timedout(session); > - > ISCSI_DBG_TRANS_SESSION(session, "Unblocking SCSI target\n"); > scsi_target_unblock(&session->dev, SDEV_TRANSPORT_OFFLINE); > ISCSI_DBG_TRANS_SESSION(session, "Completed unblocking SCSI target\n"); > + > + if (session->transport->session_recovery_timedout) > + session->transport->session_recovery_timedout(session); > } > > static void __iscsi_unblock_session(struct work_struct *work) > Reviewed-by: Lee Duncan <lduncan@xxxxxxxx>
