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

Commit dff6de73 authored by Boaz Harrosh's avatar Boaz Harrosh Committed by James Bottomley
Browse files

[SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution 



  - Use new scsi_eh_prep/restor_cmnd() for synchronous
    REQUEST_SENSE invocation.

Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent e1c23468

drivers/usb/storage/transport.c

+4 −42
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#include <linux/slab.h>



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_eh.h>

#include <scsi/scsi_device.h>



#include "usb.h"
@@ -580,25 +580,11 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) 
	/* Now, if we need to do the auto-sense, let's do it */

	if (need_auto_sense) {

		int temp_result;

		void* old_request_buffer;

		unsigned short old_sg;

		unsigned old_request_bufflen;

		unsigned char old_sc_data_direction;

		unsigned char old_cmd_len;

		unsigned char old_cmnd[MAX_COMMAND_SIZE];

		int old_resid;

		struct scsi_eh_save ses;



		US_DEBUGP("Issuing auto-REQUEST_SENSE\n");



		/* save the old command */

		memcpy(old_cmnd, srb->cmnd, MAX_COMMAND_SIZE);

		old_cmd_len = srb->cmd_len;



		/* set the command and the LUN */

		memset(srb->cmnd, 0, MAX_COMMAND_SIZE);

		srb->cmnd[0] = REQUEST_SENSE;

		srb->cmnd[1] = old_cmnd[1] & 0xE0;

		srb->cmnd[4] = 18;

		scsi_eh_prep_cmnd(srb, &ses, NULL, 0, US_SENSE_SIZE);



		/* FIXME: we must do the protocol translation here */

		if (us->subclass == US_SC_RBC || us->subclass == US_SC_SCSI)
@@ -606,36 +592,12 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) 
		else

			srb->cmd_len = 12;



		/* set the transfer direction */

		old_sc_data_direction = srb->sc_data_direction;

		srb->sc_data_direction = DMA_FROM_DEVICE;



		/* use the new buffer we have */

		old_request_buffer = srb->request_buffer;

		srb->request_buffer = us->sensebuf;



		/* set the buffer length for transfer */

		old_request_bufflen = srb->request_bufflen;

		srb->request_bufflen = US_SENSE_SIZE;



		/* set up for no scatter-gather use */

		old_sg = srb->use_sg;

		srb->use_sg = 0;



		/* issue the auto-sense command */

		old_resid = srb->resid;

		srb->resid = 0;

		temp_result = us->transport(us->srb, us);



		/* let's clean up right away */

		memcpy(srb->sense_buffer, us->sensebuf, US_SENSE_SIZE);

		srb->resid = old_resid;

		srb->request_buffer = old_request_buffer;

		srb->request_bufflen = old_request_bufflen;

		srb->use_sg = old_sg;

		srb->sc_data_direction = old_sc_data_direction;

		srb->cmd_len = old_cmd_len;

		memcpy(srb->cmnd, old_cmnd, MAX_COMMAND_SIZE);

		scsi_eh_restore_cmnd(srb, &ses);



		if (test_bit(US_FLIDX_TIMED_OUT, &us->flags)) {

			US_DEBUGP("-- auto-sense aborted\n");