Commit a9a4ea11 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: core: Move the resid_len field from struct scsi_request to struct scsi_cmnd 

Prepare for removing the scsi_request structure by moving the resid_len
field to struct scsi_cmnd.

Link: https://lore.kernel.org/r/20220224175552.988286-6-hch@lst.de


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5b794f98

drivers/scsi/scsi_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -88,9 +88,9 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, 
	}



	if (rq_data_dir(rq) == READ)

		hdr->din_resid = sreq->resid_len;

		hdr->din_resid = scmd->resid_len;

	else

		hdr->dout_resid = sreq->resid_len;

		hdr->dout_resid = scmd->resid_len;



	blk_rq_unmap_user(bio);

drivers/scsi/scsi_error.c

+3 −3
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, 
	ses->data_direction = scmd->sc_data_direction;

	ses->sdb = scmd->sdb;

	ses->result = scmd->result;

	ses->resid_len = scmd->req.resid_len;

	ses->resid_len = scmd->resid_len;

	ses->underflow = scmd->underflow;

	ses->prot_op = scmd->prot_op;

	ses->eh_eflags = scmd->eh_eflags;
@@ -1016,7 +1016,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, 
	memset(scmd->cmnd, 0, sizeof(scmd->cmnd));

	memset(&scmd->sdb, 0, sizeof(scmd->sdb));

	scmd->result = 0;

	scmd->req.resid_len = 0;

	scmd->resid_len = 0;



	if (sense_bytes) {

		scmd->sdb.length = min_t(unsigned, SCSI_SENSE_BUFFERSIZE,
@@ -1069,7 +1069,7 @@ void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses) 
	scmd->sc_data_direction = ses->data_direction;

	scmd->sdb = ses->sdb;

	scmd->result = ses->result;

	scmd->req.resid_len = ses->resid_len;

	scmd->resid_len = ses->resid_len;

	scmd->underflow = ses->underflow;

	scmd->prot_op = ses->prot_op;

	scmd->eh_eflags = ses->eh_eflags;

drivers/scsi/scsi_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static int scsi_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, 
	hdr->info = 0;

	if (hdr->masked_status || hdr->host_status || hdr->driver_status)

		hdr->info |= SG_INFO_CHECK;

	hdr->resid = req->resid_len;

	hdr->resid = scmd->resid_len;

	hdr->sb_len_wr = 0;



	if (scmd->sense_len && hdr->sbp) {

drivers/scsi/scsi_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -251,11 +251,11 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, 
	 * is invalid.  Prevent the garbage from being misinterpreted

	 * and prevent security leaks by zeroing out the excess data.

	 */

	if (unlikely(rq->resid_len > 0 && rq->resid_len <= bufflen))

		memset(buffer + (bufflen - rq->resid_len), 0, rq->resid_len);

	if (unlikely(scmd->resid_len > 0 && scmd->resid_len <= bufflen))

		memset(buffer + bufflen - scmd->resid_len, 0, scmd->resid_len);



	if (resid)

		*resid = rq->resid_len;

		*resid = scmd->resid_len;

	if (sense && scmd->sense_len)

		memcpy(sense, scmd->sense_buffer, SCSI_SENSE_BUFFERSIZE);

	if (sshdr)

drivers/scsi/sg.c

+1 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status) 


	sense = scmd->sense_buffer;

	result = req->result;

	resid = req->resid_len;

	resid = scmd->resid_len;



	SCSI_LOG_TIMEOUT(4, sg_printk(KERN_INFO, sdp,

				      "sg_cmd_done: pack_id=%d, res=0x%x\n",