megaraid: fix compilation after eh locking changes
Subsystems (2)
PATCH 1/1 megaraid: fix compilation after eh locking changes
drivers/scsi/megaraid.c +4 -17
@@ -1939,7 +1939,7 @@static int -__megaraid_reset (Scsi_Cmnd *cmd) +megaraid_reset (struct scsi_cmnd *cmd) {adapter_t *adapter;megacmd_t mc;
@@ -1951,7 +1951,6 @@ 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" );
@@ -1959,9 +1958,10 @@ 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 );/*
@@ -1970,23 +1970,10 @@*/ mega_rundoneq (adapter); -return rval; -} - -static int -megaraid_reset (Scsi_Cmnd *cmd) -{ - 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