forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fc4/fc: fix warnings and errors related to recent SCSI EH updates

Browse source
This commit is contained in:
Jeff Garzik 2005-06-19 21:47:56 -04:00 • committed by Jeff Garzik
parent 7df551254a
commit 98f72a1c51
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/fc4/fc.c
View file

@ -765,8 +765,6 @@ void fcp_release(fc_channel *fcchain, int count) /* count must > 0 */
static void fcp_scsi_done (Scsi_Cmnd *SCpnt) static void fcp_scsi_done (Scsi_Cmnd *SCpnt)
{ {
unsigned long flags;
if (FCP_CMND(SCpnt)->done) if (FCP_CMND(SCpnt)->done)
FCP_CMND(SCpnt)->done(SCpnt); FCP_CMND(SCpnt)->done(SCpnt);
} }
@ -907,8 +905,6 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt)
*/ */
if (++fc->abort_count < (fc->can_queue >> 1)) { if (++fc->abort_count < (fc->can_queue >> 1)) {
unsigned long flags;
SCpnt->result = DID_ABORT; SCpnt->result = DID_ABORT;
fcmd->done(SCpnt); fcmd->done(SCpnt);
printk("FC: soft abort\n"); 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) int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
{ {
unsigned long flags;
fcp_cmd *cmd; fcp_cmd *cmd;
fcp_cmnd *fcmd; fcp_cmnd *fcmd;
fc_channel *fc = FC_SCMND(SCpnt); 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) int fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
{ {
unsigned long flags;
int rc; int rc;
spin_lock_irqsave(SCpnt->device->host->host_lock, flags); spin_lock_irqsave(SCpnt->device->host->host_lock, flags);