firewire: fw-ohci: extend logging of bus generations and node ID

[safe/jmp/linux-2.6] / include / scsi / scsi_eh.h

diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index d160880..25071d5 100644 (file)
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -1,9 +1,10 @@
 #ifndef _SCSI_SCSI_EH_H
 #define _SCSI_SCSI_EH_H
 
-struct scsi_cmnd;
+#include <linux/scatterlist.h>
+
+#include <scsi/scsi_cmnd.h>
 struct scsi_device;
-struct scsi_request;
 struct Scsi_Host;
 
 /*
@@ -43,8 +44,6 @@ extern void scsi_report_device_reset(struct Scsi_Host *, int, int);
 extern int scsi_block_when_processing_errors(struct scsi_device *);
 extern int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
                struct scsi_sense_hdr *sshdr);
-extern int scsi_request_normalize_sense(struct scsi_request *sreq,
-               struct scsi_sense_hdr *sshdr);
 extern int scsi_command_normalize_sense(struct scsi_cmnd *cmd,
                struct scsi_sense_hdr *sshdr);
 
@@ -68,4 +67,24 @@ extern int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len,
 
 extern int scsi_reset_provider(struct scsi_device *, int);
 
+struct scsi_eh_save {
+       /* saved state */
+       int result;
+       enum dma_data_direction data_direction;
+       unsigned char cmd_len;
+       unsigned char cmnd[MAX_COMMAND_SIZE];
+       struct scsi_data_buffer sdb;
+       struct request *next_rq;
+
+       /* new command support */
+       struct scatterlist sense_sgl;
+};
+
+extern void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd,
+               struct scsi_eh_save *ses, unsigned char *cmnd,
+               int cmnd_size, unsigned sense_bytes);
+
+extern void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd,
+               struct scsi_eh_save *ses);
+
 #endif /* _SCSI_SCSI_EH_H */