From b2a7a4ba0497f73295e3f4d20a8cedb1e3d2b1a7 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Sun, 9 Sep 2007 08:56:35 -0600
Subject: [PATCH] [SCSI] advansys: Enable interrupts earlier in queuecommand
Move as much as possible outside the critical section in queuecommand, eg:
- Set the scsi_done field before acquiring the lock
- Call asc_scsi_done after dropping the lock
Also remove a comment suggesting we should enable interrupts (now we do)
and do some minor reformatting for readability.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---
drivers/scsi/advansys.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 67cdfe6201cea..d7bc0cf72134b 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -3176,23 +3176,24 @@ static void asc_scsi_done(struct scsi_cmnd *scp)
* in the 'scp' result field.
*/
static int
-advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *))
+advansys_queuecommand(struct scsi_cmnd *scp, void (*done)(struct scsi_cmnd *))
{
- struct Scsi_Host *shost;
- asc_board_t *boardp;
- ulong flags;
+ struct Scsi_Host *shost = scp->device->host;
+ asc_board_t *boardp = ASC_BOARDP(shost);
+ unsigned long flags;
int asc_res, result = 0;
- shost = scp->device->host;
- boardp = ASC_BOARDP(shost);
ASC_STATS(shost, queuecommand);
+ scp->scsi_done = done;
- /* host_lock taken by mid-level prior to call but need to protect */
- /* against own ISR */
+ /*
+ * host_lock taken by mid-level prior to call, but need
+ * to protect against own ISR
+ */
spin_lock_irqsave(&boardp->lock, flags);
-
- scp->scsi_done = done;
asc_res = asc_execute_scsi_cmnd(scp);
+ spin_unlock_irqrestore(&boardp->lock, flags);
+
switch (asc_res) {
case ASC_NOERROR:
break;
@@ -3201,11 +3202,9 @@ advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *))
break;
case ASC_ERROR:
default:
- /* Interrupts could be enabled here. */
asc_scsi_done(scp);
break;
}
- spin_unlock_irqrestore(&boardp->lock, flags);
return result;
}
--
GitLab