evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCSI] ifdef out broken fc4 EH code

Browse source 
This code pokes deep into EH internals and duplicates scsi_error.c code
wrongly.  It doesn't compile anymore in scsi-misc, so let's #if 0 out
the code - the driver hasn't worked for more than five years anyway.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Christoph Hellwig 2005-06-27 22:43:06 +02:00 • committed by James Bottomley
parent eda912e34a
commit fc2b035d38
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/fc4/fc.c
View file

@ -365,6 +365,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
kfree (fc->scsi_bitmap); kfree (fc->scsi_bitmap);
kfree (fc->cmd_slots); kfree (fc->cmd_slots);
FCND(("Unregistering\n")); FCND(("Unregistering\n"));
#if 0
if (fc->rst_pkt) { if (fc->rst_pkt) {
if (fc->rst_pkt->eh_state == SCSI_STATE_UNUSED) if (fc->rst_pkt->eh_state == SCSI_STATE_UNUSED)
kfree(fc->rst_pkt); kfree(fc->rst_pkt);
@ -373,6 +374,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
printk("FC: Reset in progress. Now?!"); printk("FC: Reset in progress. Now?!");
} }
} }
#endif
FCND(("Unregistered\n")); FCND(("Unregistered\n"));
} }
} else } else
@ -915,6 +917,7 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt)
} }
} }
#if 0
void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt) void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt)
{ {
fc_channel *fc = FC_SCMND(SCpnt); fc_channel *fc = FC_SCMND(SCpnt);
@ -922,11 +925,13 @@ void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt)
fc->rst_pkt->eh_state = SCSI_STATE_FINISHED; fc->rst_pkt->eh_state = SCSI_STATE_FINISHED;
up(fc->rst_pkt->device->host->eh_action); up(fc->rst_pkt->device->host->eh_action);
} }
#endif
#define FCP_RESET_TIMEOUT (2*HZ) #define FCP_RESET_TIMEOUT (2*HZ)
int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt) int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
{ {
#if 0 /* broken junk, but if davem wants to compile this driver, let him.. */
unsigned long flags; unsigned long flags;
fcp_cmd *cmd; fcp_cmd *cmd;
fcp_cmnd *fcmd; fcp_cmnd *fcmd;
@ -1000,6 +1005,7 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
} }
fc->rst_pkt->eh_state = SCSI_STATE_UNUSED; fc->rst_pkt->eh_state = SCSI_STATE_UNUSED;
return SUCCESS; return SUCCESS;
#endif
} }
static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt) static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)