[SCSI] libfc: rport retry on LS_RJT from certain ELS

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

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index a37a814..01a4c58 100644 (file)
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -159,8 +159,6 @@ struct scsi_device {
        atomic_t iodone_cnt;
        atomic_t ioerr_cnt;
 
-       int timeout;
-
        struct device           sdev_gendev,
                                sdev_dev;
 
@@ -367,10 +365,11 @@ extern int scsi_is_target_device(const struct device *);
 extern int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
                        int data_direction, void *buffer, unsigned bufflen,
                        unsigned char *sense, int timeout, int retries,
-                       int flag);
+                       int flag, int *resid);
 extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
                            int data_direction, void *buffer, unsigned bufflen,
-                           struct scsi_sense_hdr *, int timeout, int retries);
+                           struct scsi_sense_hdr *, int timeout, int retries,
+                           int *resid);
 extern int scsi_execute_async(struct scsi_device *sdev,
                              const unsigned char *cmd, int cmd_len, int data_direction,
                              void *buffer, unsigned bufflen, int use_sg,