summaryrefslogtreecommitdiffstats
path: root/drivers/fc4
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-19 21:47:56 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-19 21:47:56 -0400
commit98f72a1c51cbf65f3eee54b5324863b3a70a4e61 (patch)
treeb40996c7a0a5446875aa3664045af7e377451bf6 /drivers/fc4
parent7df551254add79a445d2e47e8f849cef8fee6e38 (diff)
downloadlinux-98f72a1c51cbf65f3eee54b5324863b3a70a4e61.tar.bz2
fc4/fc: fix warnings and errors related to recent SCSI EH updates
Diffstat (limited to 'drivers/fc4')
-rw-r--r--drivers/fc4/fc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index fbd9ff79b7b8..e3c958823533 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -765,8 +765,6 @@ void fcp_release(fc_channel *fcchain, int count) /* count must > 0 */
static void fcp_scsi_done (Scsi_Cmnd *SCpnt)
{
- unsigned long flags;
-
if (FCP_CMND(SCpnt)->done)
FCP_CMND(SCpnt)->done(SCpnt);
}
@@ -907,8 +905,6 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt)
*/
if (++fc->abort_count < (fc->can_queue >> 1)) {
- unsigned long flags;
-
SCpnt->result = DID_ABORT;
fcmd->done(SCpnt);
printk("FC: soft abort\n");
@@ -931,6 +927,7 @@ void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt)
int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
{
+ unsigned long flags;
fcp_cmd *cmd;
fcp_cmnd *fcmd;
fc_channel *fc = FC_SCMND(SCpnt);
@@ -1028,6 +1025,7 @@ static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
int fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
{
+ unsigned long flags;
int rc;
spin_lock_irqsave(SCpnt->device->host->host_lock, flags);