diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-26 08:45:39 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-26 08:45:39 -0500 |
| commit | fa4c49669f0408557bc52cd7054c920a8790dec6 (patch) | |
| tree | 78dadb45b6779538e907e13666bd59b81e0df1f8 /drivers | |
| parent | 849717383abc795b8f5efe7b9e0792b2e1f8916a (diff) | |
| download | op-kernel-dev-fa4c49669f0408557bc52cd7054c920a8790dec6.zip op-kernel-dev-fa4c49669f0408557bc52cd7054c920a8790dec6.tar.gz | |
[SCSI] megaraid: fix compilation after eh locking changes
From: Christoph Hellwig <hch@lst.de>
Patch fixed up and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/megaraid.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index ec81532..6ee88c5 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -1938,7 +1938,7 @@ megaraid_abort(Scsi_Cmnd *cmd) static int -__megaraid_reset(Scsi_Cmnd *cmd) +megaraid_reset(struct scsi_cmnd *cmd) { adapter_t *adapter; megacmd_t mc; @@ -1950,7 +1950,6 @@ __megaraid_reset(Scsi_Cmnd *cmd) mc.cmd = MEGA_CLUSTER_CMD; mc.opcode = MEGA_RESET_RESERVATIONS; - spin_unlock_irq(&adapter->lock); if( mega_internal_command(adapter, LOCK_INT, &mc, NULL) != 0 ) { printk(KERN_WARNING "megaraid: reservation reset failed.\n"); @@ -1958,9 +1957,10 @@ __megaraid_reset(Scsi_Cmnd *cmd) else { printk(KERN_INFO "megaraid: reservation reset.\n"); } - spin_lock_irq(&adapter->lock); #endif + spin_lock_irq(&adapter->lock); + 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. */ mega_rundoneq(adapter); - - 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; + return rval; } - /** * megaraid_abort_and_reset() * @adapter - megaraid soft state |
