From: Brian King <brking@linux.vnet.ibm.com>
To: Bart Van Assche <Bart.VanAssche@wdc.com>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
"abdhalee@linux.vnet.ibm.com" <abdhalee@linux.vnet.ibm.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"hch@lst.de" <hch@lst.de>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
"sfr@canb.auug.org.au" <sfr@canb.auug.org.au>,
"sachinp@linux.vnet.ibm.com" <sachinp@linux.vnet.ibm.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"hare@suse.com" <hare@suse.com>,
"mpe@ellerman.id.au" <mpe@ellerman.id.au>
Subject: [PATCH 2/2] scsi: Preserve retry counter through scsi_prep_fn
Date: Mon, 21 Aug 2017 17:14:00 -0500 [thread overview]
Message-ID: <e24506f3-e333-16b9-a8c9-5d25f3c19ccf@linux.vnet.ibm.com> (raw)
In-Reply-To: <f4ec8576-f4d7-4be3-0f38-c1a9d7ef4251@linux.vnet.ibm.com>
Save / restore the retry counter in scsi_cmd in scsi_init_command.
This allows us to go back through scsi_init_command for retries
and not forget we are doing a retry.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
---
Index: linux-2.6.git/drivers/scsi/scsi_lib.c
===================================================================
--- linux-2.6.git.orig/drivers/scsi/scsi_lib.c
+++ linux-2.6.git/drivers/scsi/scsi_lib.c
@@ -1155,6 +1155,7 @@ void scsi_init_command(struct scsi_devic
void *prot = cmd->prot_sdb;
unsigned int unchecked_isa_dma = cmd->flags & SCMD_UNCHECKED_ISA_DMA;
unsigned long jiffies_at_alloc = cmd->jiffies_at_alloc;
+ int retries = cmd->retries;
/* zero out the cmd, except for the embedded scsi_request */
memset((char *)cmd + sizeof(cmd->req), 0,
@@ -1166,6 +1167,7 @@ void scsi_init_command(struct scsi_devic
cmd->flags = unchecked_isa_dma;
INIT_DELAYED_WORK(&cmd->abort_work, scmd_eh_abort_handler);
cmd->jiffies_at_alloc = jiffies_at_alloc;
+ cmd->retries = retries;
scsi_add_cmd_to_list(cmd);
}
next prev parent reply other threads:[~2017-08-21 22:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-16 17:00 [BUG][bisected 270065e] linux-next fails to boot on powerpc Abdul Haleem
2017-08-16 17:21 ` Bart Van Assche
2017-08-16 23:18 ` Brian King
2017-08-17 15:52 ` Bart Van Assche
2017-08-18 21:04 ` Brian King
2017-08-18 21:17 ` [PATCH] ipr: Set no_report_opcodes for RAID arrays Brian King
2017-08-21 20:22 ` Martin K. Petersen
2017-08-18 21:41 ` [BUG][bisected 270065e] linux-next fails to boot on powerpc Bart Van Assche
2017-08-18 21:57 ` Brian King
2017-08-18 22:13 ` Bart Van Assche
2017-08-21 22:11 ` [PATCH 0/2] Allow scsi_prep_fn to occur for retried commands Brian King
2017-08-21 22:13 ` [PATCH 1/2] scsi: Move scsi_cmd->jiffies_at_alloc initialization to allocation time Brian King
2017-08-21 22:16 ` Brian King
2017-08-21 22:40 ` [PATCHv2 " Brian King
2017-08-22 6:51 ` [PATCH " hch
2017-08-21 22:14 ` Brian King [this message]
2017-08-22 6:51 ` [PATCH 2/2] scsi: Preserve retry counter through scsi_prep_fn hch
2017-08-22 6:42 ` [PATCH 0/2] Allow scsi_prep_fn to occur for retried commands Abdul Haleem
2017-08-21 20:27 ` [BUG][bisected 270065e] linux-next fails to boot on powerpc Martin K. Petersen
2017-08-17 1:33 ` Michael Ellerman
2017-08-16 20:25 ` Bart Van Assche
2017-08-17 7:06 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e24506f3-e333-16b9-a8c9-5d25f3c19ccf@linux.vnet.ibm.com \
--to=brking@linux.vnet.ibm.com \
--cc=Bart.VanAssche@wdc.com \
--cc=abdhalee@linux.vnet.ibm.com \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=sachinp@linux.vnet.ibm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).