Commit 6ff236e8 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: zbc: Convert to scsi_execute_cmd() 



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

Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent af16cd63

drivers/scsi/sd_zbc.c

+5 −3
Original line number Diff line number Diff line
@@ -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);