Commit edb527ce authored by Mark Haverkamp's avatar Mark Haverkamp Committed by James Bottomley

[SCSI] aacraid: remove unneeded locking

Received From Mark Salyzyn

Since new commands to the card are quiesced, respect the changes in
the SCSI error path which dropped locking around the hba reset handler
and similarly drop the lock requirement in the driver's path.
Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 2ca48a13
...@@ -453,15 +453,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd) ...@@ -453,15 +453,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
printk(KERN_ERR "%s: Host adapter reset request. SCSI hang ?\n", printk(KERN_ERR "%s: Host adapter reset request. SCSI hang ?\n",
AAC_DRIVERNAME); AAC_DRIVERNAME);
spin_lock_irq(host->host_lock);
aac = (struct aac_dev *)host->hostdata; aac = (struct aac_dev *)host->hostdata;
if (aac_adapter_check_health(aac)) { if (aac_adapter_check_health(aac)) {
printk(KERN_ERR "%s: Host adapter appears dead\n", printk(KERN_ERR "%s: Host adapter appears dead\n",
AAC_DRIVERNAME); AAC_DRIVERNAME);
spin_unlock_irq(host->host_lock);
return -ENODEV; return -ENODEV;
} }
/* /*
...@@ -487,13 +482,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd) ...@@ -487,13 +482,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
/* /*
* We can exit If all the commands are complete * We can exit If all the commands are complete
*/ */
spin_unlock_irq(host->host_lock);
if (active == 0) if (active == 0)
return SUCCESS; return SUCCESS;
ssleep(1); ssleep(1);
spin_lock_irq(host->host_lock);
} }
spin_unlock_irq(host->host_lock);
printk(KERN_ERR "%s: SCSI bus appears hung\n", AAC_DRIVERNAME); printk(KERN_ERR "%s: SCSI bus appears hung\n", AAC_DRIVERNAME);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment