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

Commit 4cd3b6eb authored by Bill Kuzeja's avatar Bill Kuzeja Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix extraneous ref on sp's after adapter break 



Hung task timeouts can result if a qlogic board breaks unexpectedly
while running I/O. These tasks become hung because command srb reference
counts are not going to zero, hence the affected srbs and commands do
not get freed. This fix accounts for this extra reference in the srbs in
the case of a board failure.

Fixes: a465537a ("qla2xxx: Disable the adapter and skip error recovery in case of register disconnect")
Signed-off-by: default avatarBill Kuzeja <william.kuzeja@stratus.com>
Acked-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e6ef6a77

drivers/scsi/qla2xxx/qla_os.c

+6 −2
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ qla2x00_loop_reset(scsi_qla_host_t *vha) 
void

qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)

{

	int que, cnt;

	int que, cnt, status;

	unsigned long flags;

	srb_t *sp;

	struct qla_hw_data *ha = vha->hw;
@@ -1670,8 +1670,12 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res) 
					 */

					sp_get(sp);

					spin_unlock_irqrestore(&ha->hardware_lock, flags);

					qla2xxx_eh_abort(GET_CMD_SP(sp));

					status = qla2xxx_eh_abort(GET_CMD_SP(sp));

					spin_lock_irqsave(&ha->hardware_lock, flags);

					/* Get rid of extra reference if immediate exit

					 * from ql2xxx_eh_abort */

					if (status == FAILED && (qla2x00_isp_reg_stat(ha)))

						atomic_dec(&sp->ref_count);

				}

				req->outstanding_cmds[cnt] = NULL;

				sp->done(sp, res);