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

Commit 8884efab authored Feb 24, 2006 by Brian King Committed by James Bottomley Feb 27, 2006

[SCSI] scsi: scsi command retries off by one fix



Fix up an off by one error in calculating retries for scsi
commands. This bug was discovered when an SG_IO request
was sent to scsi core with retries = 0, causing the overall
timeout check to go off in scsi_softirq_done.

Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent 147aab6a

drivers/scsi/scsi_error.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1308,7 +1308,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
		* the request was not marked fast fail. Note that above,
		* even if the request is marked fast fail, we still requeue
		* for queue congestion conditions (QUEUE_FULL or BUSY) */
		if ((++scmd->retries) < scmd->allowed
		if ((++scmd->retries) <= scmd->allowed
		&& !blk_noretry_request(scmd->request)) {
		return NEEDS_RETRY;
		} else {
		@@ -1433,7 +1433,7 @@ static void scsi_eh_flush_done_q(struct list_head *done_q)
		list_del_init(&scmd->eh_entry);
		if (scsi_device_online(scmd->device) &&
		!blk_noretry_request(scmd->request) &&
		(++scmd->retries < scmd->allowed)) {
		(++scmd->retries <= scmd->allowed)) {
		SCSI_LOG_ERROR_RECOVERY(3, printk("%s: flush"
		" retry cmd: %p\n",
		current->comm,

drivers/scsi/scsi_lib.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1498,7 +1498,7 @@ static void scsi_kill_request(struct request req, request_queue_t q)
		static void scsi_softirq_done(struct request *rq)
		{
		struct scsi_cmnd *cmd = rq->completion_data;
		unsigned long wait_for = cmd->allowed * cmd->timeout_per_command;
		unsigned long wait_for = (cmd->allowed + 1) * cmd->timeout_per_command;
		int disposition;

		INIT_LIST_HEAD(&cmd->eh_entry);