scsi: core: Remove struct scsi_request

[sfrench/cifs-2.6.git] / include / scsi / scsi_cmnd.h

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 47add5b32f46098ce2affc16c98270a6adb1cac9..4b33ca6a7c7d6e3bac8371c3b4af2e61acb145cc 100644 (file)
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -68,7 +68,6 @@ enum scsi_cmnd_submitter {
 } __packed;
 
 struct scsi_cmnd {
-       struct scsi_request req;
        struct scsi_device *device;
        struct list_head eh_entry; /* entry for the host eh_abort_list/eh_cmd_q */
        struct delayed_work abort_work;
@@ -111,7 +110,7 @@ struct scsi_cmnd {
                                   (ie, between disconnect / 
                                   reconnects.   Probably == sector
                                   size */
-
+       unsigned resid_len;     /* residual count */
        unsigned sense_len;
        unsigned char *sense_buffer;
                                /* obtained by REQUEST SENSE when
@@ -200,12 +199,12 @@ static inline unsigned scsi_bufflen(struct scsi_cmnd *cmd)
 
 static inline void scsi_set_resid(struct scsi_cmnd *cmd, unsigned int resid)
 {
-       cmd->req.resid_len = resid;
+       cmd->resid_len = resid;
 }
 
 static inline unsigned int scsi_get_resid(struct scsi_cmnd *cmd)
 {
-       return cmd->req.resid_len;
+       return cmd->resid_len;
 }
 
 #define scsi_for_each_sg(cmd, sg, nseg, __i)                   \