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

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 10942fc9808d0e8ef3d41adc07a613aa5f9fc1f7..903b0586ded391e9a5236147ee302b73da51a33a 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -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;
                                }
                        }