aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Haverkamp <markh@osdl.org>2006-05-10 12:11:38 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-05-20 10:21:36 -0400
commitedb527ce35b0c86e72ed518af255f02e1cecb3b7 (patch)
treec53500fe591727d5f2f81c7c38a47c389472ec83
parent2ca48a132167f9f12efba179382979aafde0ab36 (diff)
[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: Mark Haverkamp <markh@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/aacraid/linit.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 6ef89c99dd12..9647dabc6612 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -453,15 +453,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
453 453
454 printk(KERN_ERR "%s: Host adapter reset request. SCSI hang ?\n", 454 printk(KERN_ERR "%s: Host adapter reset request. SCSI hang ?\n",
455 AAC_DRIVERNAME); 455 AAC_DRIVERNAME);
456
457
458 spin_lock_irq(host->host_lock);
459
460 aac = (struct aac_dev *)host->hostdata; 456 aac = (struct aac_dev *)host->hostdata;
461 if (aac_adapter_check_health(aac)) { 457 if (aac_adapter_check_health(aac)) {
462 printk(KERN_ERR "%s: Host adapter appears dead\n", 458 printk(KERN_ERR "%s: Host adapter appears dead\n",
463 AAC_DRIVERNAME); 459 AAC_DRIVERNAME);
464 spin_unlock_irq(host->host_lock);
465 return -ENODEV; 460 return -ENODEV;
466 } 461 }
467 /* 462 /*
@@ -487,13 +482,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
487 /* 482 /*
488 * We can exit If all the commands are complete 483 * We can exit If all the commands are complete
489 */ 484 */
490 spin_unlock_irq(host->host_lock);
491 if (active == 0) 485 if (active == 0)
492 return SUCCESS; 486 return SUCCESS;
493 ssleep(1); 487 ssleep(1);
494 spin_lock_irq(host->host_lock);
495 } 488 }
496 spin_unlock_irq(host->host_lock);
497 printk(KERN_ERR "%s: SCSI bus appears hung\n", AAC_DRIVERNAME); 489 printk(KERN_ERR "%s: SCSI bus appears hung\n", AAC_DRIVERNAME);
498 return -ETIMEDOUT; 490 return -ETIMEDOUT;
499} 491}