scsi: zbc: Convert to scsi_execute_cmd()

scsi_execute_req() is going to be removed. Conver zbc to
scsi_execute_cmd().

Signed-off-by: Mike Christie <michael.christie@oracle.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index 62abebbaf2e7e51c688d68768c8a77259712a6da..6b3a02d4406c08614ea2fbcbe508a43c4de7ed54 100644 (file)
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -148,6 +148,9 @@ static int sd_zbc_do_report_zones(struct scsi_disk *sdkp, unsigned char *buf,
        struct scsi_device *sdp = sdkp->device;
        const int timeout = sdp->request_queue->rq_timeout;
        struct scsi_sense_hdr sshdr;
+       const struct scsi_exec_args exec_args = {
+               .sshdr = &sshdr,
+       };
        unsigned char cmd[16];
        unsigned int rep_len;
        int result;
@@ -160,9 +163,8 @@ static int sd_zbc_do_report_zones(struct scsi_disk *sdkp, unsigned char *buf,
        if (partial)
                cmd[14] = ZBC_REPORT_ZONE_PARTIAL;
 
-       result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
-                                 buf, buflen, &sshdr,
-                                 timeout, SD_MAX_RETRIES, NULL);
+       result = scsi_execute_cmd(sdp, cmd, REQ_OP_DRV_IN, buf, buflen,
+                                 timeout, SD_MAX_RETRIES, &exec_args);
        if (result) {
                sd_printk(KERN_ERR, sdkp,
                          "REPORT ZONES start lba %llu failed\n", lba);