lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] megaraid: fix compilation after eh locking changes

Browse Source 
From: Christoph Hellwig <hch@lst.de>

Patch fixed up and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2005-06-26 08:45:39 -05:00
parent 849717383a
commit fa4c49669f
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/scsi/megaraid.c
View File

@@ -1938,7 +1938,7 @@ megaraid_abort(Scsi_Cmnd *cmd)
static int static int
__megaraid_reset(Scsi_Cmnd *cmd) megaraid_reset(struct scsi_cmnd *cmd)
{ {
adapter_t *adapter; adapter_t *adapter;
megacmd_t mc; megacmd_t mc;
@@ -1950,7 +1950,6 @@ __megaraid_reset(Scsi_Cmnd *cmd)
mc.cmd = MEGA_CLUSTER_CMD; mc.cmd = MEGA_CLUSTER_CMD;
mc.opcode = MEGA_RESET_RESERVATIONS; mc.opcode = MEGA_RESET_RESERVATIONS;
spin_unlock_irq(&adapter->lock);
if( mega_internal_command(adapter, LOCK_INT, &mc, NULL) != 0 ) { if( mega_internal_command(adapter, LOCK_INT, &mc, NULL) != 0 ) {
printk(KERN_WARNING printk(KERN_WARNING
"megaraid: reservation reset failed.\n"); "megaraid: reservation reset failed.\n");
@@ -1958,9 +1957,10 @@ __megaraid_reset(Scsi_Cmnd *cmd)
else { else {
printk(KERN_INFO "megaraid: reservation reset.\n"); printk(KERN_INFO "megaraid: reservation reset.\n");
} }
spin_lock_irq(&adapter->lock);
#endif #endif
spin_lock_irq(&adapter->lock);
rval = megaraid_abort_and_reset(adapter, cmd, SCB_RESET); rval = megaraid_abort_and_reset(adapter, cmd, SCB_RESET);
/* /*
@@ -1968,24 +1968,11 @@ __megaraid_reset(Scsi_Cmnd *cmd)
* to be communicated over to the mid layer. * to be communicated over to the mid layer.
*/ */
mega_rundoneq(adapter); mega_rundoneq(adapter);
spin_unlock_irq(&adapter->lock);
return rval; return rval;
} }
static int
megaraid_reset(Scsi_Cmnd *cmd)
{
adapter_t *adapter = (adapter_t *)cmd->device->host->hostdata;
int rc;
spin_lock_irq(&adapter->lock);
rc = __megaraid_reset(cmd);
spin_unlock_irq(&adapter->lock);
return rc;
}
/** /**
* megaraid_abort_and_reset() * megaraid_abort_and_reset()
* @adapter - megaraid soft state * @adapter - megaraid soft state