Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

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

diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index c5c0f6762a013b0ebcd186e668e4a6f61a9f18cd..44224ba4dd9065cb89d93a10aa1c7daf95b2f6bd 100644 (file)
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -1,7 +1,7 @@
 #ifndef _SCSI_SCSI_EH_H
 #define _SCSI_SCSI_EH_H
 
-struct scsi_cmnd;
+#include <scsi/scsi_cmnd.h>
 struct scsi_device;
 struct Scsi_Host;
 
@@ -65,4 +65,25 @@ 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 {
+       int result;
+       enum dma_data_direction data_direction;
+       unsigned char cmd_len;
+       unsigned char cmnd[MAX_COMMAND_SIZE];
+
+       void *buffer;
+       unsigned bufflen;
+       unsigned short use_sg;
+       int resid;
+
+       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 */