mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
scsi: core: Move resid from scsi_data_buffer to scsi_cmnd
This patch does not change any functionality but reduces the size of struct scsi_cmnd. Cc: Douglas Gilbert <dgilbert@interlog.com> Cc: Hannes Reinecke <hare@suse.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
80f82c169b
commit
9fa505adf9
2 changed files with 2 additions and 4 deletions
|
@ -938,7 +938,6 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
|
||||||
* scsi_result_to_blk_status may have reset the host_byte
|
* scsi_result_to_blk_status may have reset the host_byte
|
||||||
*/
|
*/
|
||||||
scsi_req(req)->result = cmd->result;
|
scsi_req(req)->result = cmd->result;
|
||||||
scsi_req(req)->resid_len = scsi_get_resid(cmd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -35,7 +35,6 @@ struct scsi_driver;
|
||||||
struct scsi_data_buffer {
|
struct scsi_data_buffer {
|
||||||
struct sg_table table;
|
struct sg_table table;
|
||||||
unsigned length;
|
unsigned length;
|
||||||
int resid;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* embedded in scsi_cmnd */
|
/* embedded in scsi_cmnd */
|
||||||
|
@ -202,12 +201,12 @@ static inline unsigned scsi_bufflen(struct scsi_cmnd *cmd)
|
||||||
|
|
||||||
static inline void scsi_set_resid(struct scsi_cmnd *cmd, int resid)
|
static inline void scsi_set_resid(struct scsi_cmnd *cmd, int resid)
|
||||||
{
|
{
|
||||||
cmd->sdb.resid = resid;
|
cmd->req.resid_len = resid;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int scsi_get_resid(struct scsi_cmnd *cmd)
|
static inline int scsi_get_resid(struct scsi_cmnd *cmd)
|
||||||
{
|
{
|
||||||
return cmd->sdb.resid;
|
return cmd->req.resid_len;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define scsi_for_each_sg(cmd, sg, nseg, __i) \
|
#define scsi_for_each_sg(cmd, sg, nseg, __i) \
|
||||||
|
|
Loading…
Reference in a new issue