Move the resid member from struct scsi_data_buffer into struct scsi_cmnd
Subsystems (4)
PATCH v2 7/7 Move the resid member from struct scsi_data_buffer into struct scsi_cmnd
This patch does not change any functionality but reduces the size of struct scsi_cmnd.
Cc Oliver Neukum <[email protected]>
Cc Douglas Gilbert <[email protected]>
Cc Hannes Reinecke <[email protected]>
Cc Christoph Hellwig <[email protected]>
Signed-off-by Bart Van Assche <[email protected]>
--- drivers/scsi/scsi_lib.c | 2 -- drivers/usb/storage/uas.c | 8 +++++--- include/scsi/scsi_cmnd.h | 9 ++++----- 3 files changed, 9 insertions(+), 10 deletions(-)
drivers/scsi/scsi_lib.c +0 -2
@@ -945,14 +945,12 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)* scsi_result_to_blk_status may have reset the host_byte */ scsi_req (req)->result = cmd->result; -scsi_req (req)->resid_len =scsi_get_resid (cmd);if (unlikely (scsi_bidi_cmnd (cmd))) {/* * Bidi commands Must be complete as a whole, * both sides at once. */ -scsi_req (req->next_rq)->resid_len =scsi_in (cmd)->resid;if (scsi_end_request (req,BLK_STS_OK ,blk_rq_bytes (req),blk_rq_bytes (req->next_rq))) WARN_ONCE(true,
drivers/usb/storage/uas.c +5 -3
@@ -365,7 +365,7 @@ static void uas_stat_cmplt(struct urb *urb)static void uas_data_cmplt (struct urb *urb) { -struct scsi_cmnd *cmnd = urb->context; +struct scsi_cmnd *cmnd = urb->context, *cmpl_cmd =NULL ;struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp;struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata;struct scsi_data_buffer *sdb =NULL ;
@@ -375,10 +375,12 @@ static void uas_data_cmplt(struct urb *urb)spin_lock_irqsave (&devinfo->lock, flags);if (cmdinfo->data_in_urb == urb) { + cmpl_cmd =scsi_in_cmd (cmnd); sdb =scsi_in (cmnd); cmdinfo->state &= ~DATA_IN_URB_INFLIGHT ; cmdinfo->data_in_urb =NULL ; }else if (cmdinfo->data_out_urb == urb) { + cmpl_cmd =scsi_out_cmd (cmnd); sdb =scsi_out (cmnd); cmdinfo->state &= ~DATA_OUT_URB_INFLIGHT ; cmdinfo->data_out_urb =NULL ;
@@ -401,9 +403,9 @@ static void uas_data_cmplt(struct urb *urb)if (status != -ENOENT && status != -ECONNRESET && status != -ESHUTDOWN )uas_log_cmd_state (cmnd,"data cmplt err" , status);/* error: no data transfered */ - sdb->resid = sdb->length; + cmpl_cmd->req.resid_len = sdb->length; }else { - sdb->resid = sdb->length - urb->actual_length; + cmpl_cmd->req.resid_len = sdb->length - urb->actual_length; }uas_try_complete (cmnd, __func__); out:
include/scsi/scsi_cmnd.h +4 -5
@@ -35,7 +35,6 @@ struct scsi_driver;struct scsi_data_buffer {struct sg_table table;unsigned length; -int resid; };/* embedded in scsi_cmnd */
@@ -229,22 +228,22 @@ static inline unsigned scsi_bufflen(struct scsi_cmnd *cmd)static inline void scsi_in_set_resid (struct scsi_cmnd *cmd,int resid) { -scsi_in_cmd (cmd)->sdb.resid = resid; +scsi_in_cmd (cmd)->req.resid_len = resid; }static inline int scsi_in_get_resid (struct scsi_cmnd *cmd) { -return scsi_in_cmd (cmd)->sdb.resid; +return scsi_in_cmd (cmd)->req.resid_len; }static inline void scsi_out_set_resid (struct scsi_cmnd *cmd,int resid) { - cmd->sdb.resid = resid; + cmd->req.resid_len = resid; }static inline int scsi_out_get_resid (struct scsi_cmnd *cmd) { -return cmd->sdb.resid; +return cmd->req.resid_len; }static inline void scsi_set_resid (struct scsi_cmnd *cmd,int resid)