mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

[SCSI] advansys: Enable interrupts earlier in queuecommand

Browse source 
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>
This commit is contained in:
Matthew Wilcox 2007-09-09 08:56:35 -06:00 committed by James Bottomley
parent 349d2c4429
commit b2a7a4ba04
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/scsi/advansys.c
View file

@ -3176,23 +3176,24 @@ static void asc_scsi_done(struct scsi_cmnd *scp)
* in the 'scp' result field. * in the 'scp' result field.
*/ */
static int 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; struct Scsi_Host *shost = scp->device->host;
asc_board_t *boardp; asc_board_t *boardp = ASC_BOARDP(shost);
ulong flags; unsigned long flags;
int asc_res, result = 0; int asc_res, result = 0;
shost = scp->device->host;
boardp = ASC_BOARDP(shost);
ASC_STATS(shost, queuecommand); ASC_STATS(shost, queuecommand);
/* 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; scp->scsi_done = done;
/*
* host_lock taken by mid-level prior to call, but need
* to protect against own ISR
*/
spin_lock_irqsave(&boardp->lock, flags);
asc_res = asc_execute_scsi_cmnd(scp); asc_res = asc_execute_scsi_cmnd(scp);
spin_unlock_irqrestore(&boardp->lock, flags);
switch (asc_res) { switch (asc_res) {
case ASC_NOERROR: case ASC_NOERROR:
break; break;
@ -3201,11 +3202,9 @@ advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *))
break; break;
case ASC_ERROR: case ASC_ERROR:
default: default:
/* Interrupts could be enabled here. */
asc_scsi_done(scp); asc_scsi_done(scp);
break; break;
} }
spin_unlock_irqrestore(&boardp->lock, flags);
return result; return result;
} }