Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4f4e47e authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley
Browse files

[SCSI] add residual argument to scsi_execute and scsi_execute_req 



scsi_execute() and scsi_execute_req() discard the residual length
information. Some callers need it. This adds residual argument
(optional) to scsi_execute and scsi_execute_req.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent a528ab7a

drivers/ata/libata-scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) 
	/* Good values for timeout and retries?  Values below

	   from scsi_ioctl_send_command() for default case... */

	cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,

				  sensebuf, (10*HZ), 5, 0);

				  sensebuf, (10*HZ), 5, 0, NULL);



	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

		u8 *desc = sensebuf + 8;
@@ -603,7 +603,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
	/* Good values for timeout and retries?  Values below

	   from scsi_ioctl_send_command() for default case... */

	cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0,

				sensebuf, (10*HZ), 5, 0);

				sensebuf, (10*HZ), 5, 0, NULL);



	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

		u8 *desc = sensebuf + 8;

drivers/scsi/ch.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd, 


        result = scsi_execute_req(ch->device, cmd, direction, buffer,

				  buflength, &sshdr, timeout * HZ,

				  MAX_RETRIES);

				  MAX_RETRIES, NULL);



	dprintk("result: 0x%x\n",result);

	if (driver_byte(result) & DRIVER_SENSE) {

drivers/scsi/scsi_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd, 
	SCSI_LOG_IOCTL(1, printk("Trying ioctl with scsi command %d\n", *cmd));



	result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, 0,

				  &sshdr, timeout, retries);

				  &sshdr, timeout, retries, NULL);



	SCSI_LOG_IOCTL(2, printk("Ioctl returned  0x%x\n", result));

drivers/scsi/scsi_lib.c

+11 −6
Original line number Diff line number Diff line
@@ -183,13 +183,15 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason) 
 * @timeout:	request timeout in seconds

 * @retries:	number of times to retry request

 * @flags:	or into request flags;

 * @resid:	optional residual length

 *

 * returns the req->errors value which is the scsi_cmnd result

 * field.

 */

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 flags)

		 unsigned char *sense, int timeout, int retries, int flags,

		 int *resid)

{

	struct request *req;

	int write = (data_direction == DMA_TO_DEVICE);
@@ -224,6 +226,8 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, 
	if (unlikely(req->data_len > 0 && req->data_len <= bufflen))

		memset(buffer + (bufflen - req->data_len), 0, req->data_len);



	if (resid)

		*resid = req->data_len;

	ret = req->errors;

 out:

	blk_put_request(req);
@@ -235,7 +239,8 @@ EXPORT_SYMBOL(scsi_execute); 


int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,

		     int data_direction, void *buffer, unsigned bufflen,

		     struct scsi_sense_hdr *sshdr, int timeout, int retries)

		     struct scsi_sense_hdr *sshdr, int timeout, int retries,

		     int *resid)

{

	char *sense = NULL;

	int result;
@@ -246,7 +251,7 @@ int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd, 
			return DRIVER_ERROR << 24;

	}

	result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen,

			      sense, timeout, retries, 0);

			      sense, timeout, retries, 0, resid);

	if (sshdr)

		scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, sshdr);
@@ -2016,7 +2021,7 @@ scsi_mode_select(struct scsi_device *sdev, int pf, int sp, int modepage, 
	}



	ret = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, real_buffer, len,

			       sshdr, timeout, retries);

			       sshdr, timeout, retries, NULL);

	kfree(real_buffer);

	return ret;

}
@@ -2081,7 +2086,7 @@ scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage, 
	memset(buffer, 0, len);



	result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buffer, len,

				  sshdr, timeout, retries);

				  sshdr, timeout, retries, NULL);



	/* This code looks awful: what it's doing is making sure an

	 * ILLEGAL REQUEST sense return identifies the actual command
@@ -2163,7 +2168,7 @@ scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries, 
	/* try to eat the UNIT_ATTENTION if there are enough retries */

	do {

		result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, 0, sshdr,

					  timeout, retries);

					  timeout, retries, NULL);

		if (sdev->removable && scsi_sense_valid(sshdr) &&

		    sshdr->sense_key == UNIT_ATTENTION)

			sdev->changed = 1;

drivers/scsi/scsi_scan.c

+4 −3
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void scsi_unlock_floptical(struct scsi_device *sdev, 
	scsi_cmd[4] = 0x2a;     /* size */

	scsi_cmd[5] = 0;

	scsi_execute_req(sdev, scsi_cmd, DMA_FROM_DEVICE, result, 0x2a, NULL,

			 SCSI_TIMEOUT, 3);

			 SCSI_TIMEOUT, 3, NULL);

}



/**
@@ -581,7 +581,8 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, 


		result = scsi_execute_req(sdev,  scsi_cmd, DMA_FROM_DEVICE,

					  inq_result, try_inquiry_len, &sshdr,

					  HZ / 2 + HZ * scsi_inq_timeout, 3);

					  HZ / 2 + HZ * scsi_inq_timeout, 3,

					  NULL);



		SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: INQUIRY %s "

				"with code 0x%x\n",
@@ -1390,7 +1391,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, 


		result = scsi_execute_req(sdev, scsi_cmd, DMA_FROM_DEVICE,

					  lun_data, length, &sshdr,

					  SCSI_TIMEOUT + 4 * HZ, 3);

					  SCSI_TIMEOUT + 4 * HZ, 3, NULL);



		SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "scsi scan: REPORT LUNS"

				" %s (try %d) result 0x%x\n", result