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

Commit 900a36e3 authored by Giridhar Malavali's avatar Giridhar Malavali Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout. 



Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: default avatarMadhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 0ce87911

drivers/scsi/qla2xxx/qla_bsg.c

+2 −0
Original line number Diff line number Diff line
@@ -1512,6 +1512,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job) 
				if (((sp_bsg->type == SRB_CT_CMD) ||

					(sp_bsg->type == SRB_ELS_CMD_HST))

					&& (sp_bsg->u.bsg_job == bsg_job)) {

					spin_unlock_irqrestore(&ha->hardware_lock, flags);

					if (ha->isp_ops->abort_command(sp)) {

						DEBUG2(qla_printk(KERN_INFO, ha,

						    "scsi(%ld): mbx "
@@ -1527,6 +1528,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job) 
						bsg_job->req->errors =

						bsg_job->reply->result = 0;

					}

					spin_lock_irqsave(&ha->hardware_lock, flags);

					goto done;

				}

			}