[PATCH v2 05/35] scsi: libata: Convert to scsi_exec_req

Mike Christie
2022-09-29T02:56:46Z

scsi_execute* is going to be removed. Convert libata to scsi_exec_req so
we pass all args in a scsi_exec_args struct.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/ata/libata-scsi.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 29e2f55c6faa..484eed985db6 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -413,9 +413,17 @@ 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, &sshdr, (10*HZ), 5, 0, 0, NULL);
-
+ cmd_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = scsidev,
+ .cmd = scsi_cmd,
+ .data_dir = data_dir,
+ .buf = argbuf,
+ .buf_len = argsize,
+ .sense = sensebuf,
+ .sense_len = sizeof(sensebuf),
+ .sshdr = &sshdr,
+ .timeout = 10 * HZ,
+ .retries = 5 }));
if (cmd_result < 0) {
rc = cmd_result;
goto error;
@@ -497,9 +505,15 @@ 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, &sshdr, (10*HZ), 5, 0, 0, NULL);
-
+ cmd_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = scsidev,
+ .cmd = scsi_cmd,
+ .data_dir = DMA_NONE,
+ .sense = sensebuf,
+ .sense_len = sizeof(sensebuf),
+ .sshdr = &sshdr,
+ .timeout = 10 * HZ,
+ .retries = 5 }));
if (cmd_result < 0) {
rc = cmd_result;
goto error;
--
2.25.1