summaryrefslogtreecommitdiff
path: root/drivers/fc4
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-06-27 22:43:06 +0200
committerJames Bottomley <jejb@mulgrave.(none)>2005-07-02 19:12:10 -0500
commitfc2b035d38c06a884cb521bb4a1e1183f5eaccf1 (patch)
tree421258fe7c6fc4d49b7ed9f6ef3995f25b361358 /drivers/fc4
parenteda912e34a0cc40ddd502b3f984e37ebb2b13a71 (diff)
downloadlinux-3.10-fc2b035d38c06a884cb521bb4a1e1183f5eaccf1.tar.gz
linux-3.10-fc2b035d38c06a884cb521bb4a1e1183f5eaccf1.tar.bz2
linux-3.10-fc2b035d38c06a884cb521bb4a1e1183f5eaccf1.zip
[SCSI] ifdef out broken fc4 EH code
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>
Diffstat (limited to 'drivers/fc4')
-rw-r--r--drivers/fc4/fc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index e3c95882353..5d961f5e0ca 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -365,6 +365,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
kfree (fc->scsi_bitmap);
kfree (fc->cmd_slots);
FCND(("Unregistering\n"));
+#if 0
if (fc->rst_pkt) {
if (fc->rst_pkt->eh_state == SCSI_STATE_UNUSED)
kfree(fc->rst_pkt);
@@ -373,6 +374,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
printk("FC: Reset in progress. Now?!");
}
}
+#endif
FCND(("Unregistered\n"));
}
} else
@@ -915,6 +917,7 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt)
}
}
+#if 0
void fcp_scsi_reset_done(Scsi_Cmnd *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;
up(fc->rst_pkt->device->host->eh_action);
}
+#endif
#define FCP_RESET_TIMEOUT (2*HZ)
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;
fcp_cmd *cmd;
fcp_cmnd *fcmd;
@@ -1000,6 +1005,7 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
}
fc->rst_pkt->eh_state = SCSI_STATE_UNUSED;
return SUCCESS;
+#endif
}
static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)