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

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

[SCSI] aha152x: Clean Reset path 



What Reset code was doing:  Save command's important/dangerous
Info on stack. NULL those members from scsi_cmnd.
Issue a Reset. wait for it to finish than restore members
and return.

What I do is save or NULL nothing. But use the "resetting"
hint in aha152x_internal_queue() to NULL out working members
and leave struct scsi_cmnd alone.

The indent here looks funny but it will change/drop in last
patch and it is clear this way what changed.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 0ceb4798

drivers/scsi/aha152x.c

+9 −9
Original line number Diff line number Diff line
@@ -1022,6 +1022,14 @@ static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct completion *complete, 
	   SCp.buffer           : next buffer

	   SCp.buffers_residual : left buffers in list

	   SCp.phase            : current state of the command */



	if(phase & resetting) {

		SCpnt->SCp.ptr           = NULL;

		SCpnt->SCp.this_residual = 0;

		SCpnt->resid             = 0;

		SCpnt->SCp.buffer           = NULL;

		SCpnt->SCp.buffers_residual = 0;

	} else {

	if (SCpnt->use_sg) {

		SCpnt->SCp.buffer           = (struct scatterlist *) SCpnt->request_buffer;

		SCpnt->SCp.ptr              = SG_ADDRESS(SCpnt->SCp.buffer);
@@ -1033,6 +1041,7 @@ static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct completion *complete, 
		SCpnt->SCp.buffer           = NULL;

		SCpnt->SCp.buffers_residual = 0;

	}

	}



	DO_LOCK(flags);
@@ -1150,9 +1159,6 @@ static int aha152x_device_reset(Scsi_Cmnd * SCpnt) 
	DECLARE_COMPLETION(done);

	int ret, issued, disconnected;

	unsigned char old_cmd_len = SCpnt->cmd_len;

	unsigned short old_use_sg = SCpnt->use_sg;

	void *old_buffer = SCpnt->request_buffer;

	unsigned old_bufflen = SCpnt->request_bufflen;

	unsigned long flags;

	unsigned long timeleft;
@@ -1174,9 +1180,6 @@ static int aha152x_device_reset(Scsi_Cmnd * SCpnt) 
	DO_UNLOCK(flags);



	SCpnt->cmd_len         = 0;

	SCpnt->use_sg          = 0;

	SCpnt->request_buffer  = NULL;

	SCpnt->request_bufflen = 0;



	aha152x_internal_queue(SCpnt, &done, resetting, reset_done);
@@ -1189,9 +1192,6 @@ static int aha152x_device_reset(Scsi_Cmnd * SCpnt) 
	}



	SCpnt->cmd_len         = old_cmd_len;

	SCpnt->use_sg          = old_use_sg;

  	SCpnt->request_buffer  = old_buffer;

       	SCpnt->request_bufflen = old_bufflen;



	DO_LOCK(flags);