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

scsi: remove scsi_execute_req_flags 



And switch all callers to use scsi_execute instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 76aaf87b

drivers/scsi/device_handler/scsi_dh_alua.c

+6 −10
Original line number Diff line number Diff line
@@ -151,11 +151,9 @@ static int submit_rtpg(struct scsi_device *sdev, unsigned char *buff, 
		cdb[1] = MI_REPORT_TARGET_PGS;

	put_unaligned_be32(bufflen, &cdb[6]);



	return scsi_execute_req_flags(sdev, cdb, DMA_FROM_DEVICE,

				      buff, bufflen, sshdr,

				      ALUA_FAILOVER_TIMEOUT * HZ,

				      ALUA_FAILOVER_RETRIES, NULL,

				      req_flags, 0);

	return scsi_execute(sdev, cdb, DMA_FROM_DEVICE, buff, bufflen, NULL,

			sshdr, ALUA_FAILOVER_TIMEOUT * HZ,

			ALUA_FAILOVER_RETRIES, req_flags, 0, NULL);

}



/*
@@ -185,11 +183,9 @@ static int submit_stpg(struct scsi_device *sdev, int group_id, 
	cdb[1] = MO_SET_TARGET_PGS;

	put_unaligned_be32(stpg_len, &cdb[6]);



	return scsi_execute_req_flags(sdev, cdb, DMA_TO_DEVICE,

				      stpg_data, stpg_len,

	return scsi_execute(sdev, cdb, DMA_TO_DEVICE, stpg_data, stpg_len, NULL,

			sshdr, ALUA_FAILOVER_TIMEOUT * HZ,

				      ALUA_FAILOVER_RETRIES, NULL,

				      req_flags, 0);

			ALUA_FAILOVER_RETRIES, req_flags, 0, NULL);

}



static struct alua_port_group *alua_find_get_pg(char *id_str, size_t id_size,

drivers/scsi/device_handler/scsi_dh_emc.c

+3 −4
Original line number Diff line number Diff line
@@ -276,10 +276,9 @@ static int send_trespass_cmd(struct scsi_device *sdev, 
	BUG_ON((len > CLARIION_BUFFER_SIZE));

	memcpy(csdev->buffer, page22, len);



	err = scsi_execute_req_flags(sdev, cdb, DMA_TO_DEVICE,

				     csdev->buffer, len, &sshdr,

				     CLARIION_TIMEOUT * HZ, CLARIION_RETRIES,

				     NULL, req_flags, 0);

	err = scsi_execute(sdev, cdb, DMA_TO_DEVICE, csdev->buffer, len, NULL,

			&sshdr, CLARIION_TIMEOUT * HZ, CLARIION_RETRIES,

			req_flags, 0, NULL);

	if (err) {

		if (scsi_sense_valid(&sshdr))

			res = trespass_endio(sdev, &sshdr);

drivers/scsi/device_handler/scsi_dh_hp_sw.c

+4 −6
Original line number Diff line number Diff line
@@ -100,9 +100,8 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h) 
		REQ_FAILFAST_DRIVER;



retry:

	res = scsi_execute_req_flags(sdev, cmd, DMA_NONE, NULL, 0, &sshdr,

				     HP_SW_TIMEOUT, HP_SW_RETRIES,

				     NULL, req_flags, 0);

	res = scsi_execute(sdev, cmd, DMA_NONE, NULL, 0, NULL, &sshdr,

			HP_SW_TIMEOUT, HP_SW_RETRIES, req_flags, 0, NULL);

	if (res) {

		if (scsi_sense_valid(&sshdr))

			ret = tur_done(sdev, h, &sshdr);
@@ -139,9 +138,8 @@ static int hp_sw_start_stop(struct hp_sw_dh_data *h) 
		REQ_FAILFAST_DRIVER;



retry:

	res = scsi_execute_req_flags(sdev, cmd, DMA_NONE, NULL, 0, &sshdr,

				     HP_SW_TIMEOUT, HP_SW_RETRIES,

				     NULL, req_flags, 0);

	res = scsi_execute(sdev, cmd, DMA_NONE, NULL, 0, NULL, &sshdr,

			HP_SW_TIMEOUT, HP_SW_RETRIES, req_flags, 0, NULL);

	if (res) {

		if (!scsi_sense_valid(&sshdr)) {

			sdev_printk(KERN_WARNING, sdev,

drivers/scsi/device_handler/scsi_dh_rdac.c

+3 −4
Original line number Diff line number Diff line
@@ -555,10 +555,9 @@ static void send_mode_select(struct work_struct *work) 
		(char *) h->ctlr->array_name, h->ctlr->index,

		(retry_cnt == RDAC_RETRY_COUNT) ? "queueing" : "retrying");



	if (scsi_execute_req_flags(sdev, cdb, DMA_TO_DEVICE,

				   &h->ctlr->mode_select, data_size, &sshdr,

				   RDAC_TIMEOUT * HZ,

				   RDAC_RETRIES, NULL, req_flags, 0)) {

	if (scsi_execute(sdev, cdb, DMA_TO_DEVICE, &h->ctlr->mode_select,

			data_size, NULL, &sshdr, RDAC_TIMEOUT * HZ,

			RDAC_RETRIES, req_flags, 0, NULL)) {

		err = mode_select_handle_sense(sdev, &sshdr);

		if (err == SCSI_DH_RETRY && retry_cnt--)

			goto retry;

drivers/scsi/scsi_lib.c

+0 −11
Original line number Diff line number Diff line
@@ -289,17 +289,6 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, 
}

EXPORT_SYMBOL(scsi_execute);



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

		     int data_direction, void *buffer, unsigned bufflen,

		     struct scsi_sense_hdr *sshdr, int timeout, int retries,

		     int *resid, u64 flags, req_flags_t rq_flags)

{

	return scsi_execute(sdev, cmd, data_direction, buffer, bufflen,

			      NULL, sshdr, timeout, retries, flags, rq_flags,

			      resid);

}

EXPORT_SYMBOL(scsi_execute_req_flags);



/*

 * Function:    scsi_init_cmd_errh()

 *