From: Hannes Reinecke <hare@suse.de>
To: James Bottomley <jbottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org, Joern Engel <joern@logfs.org>,
Ewan Milne <emilne@redhat.com>,
James Smart <james.smart@emulex.com>,
Ren Mingxin <renmx@cn.fujitsu.com>,
Roland Dreier <roland@purestorage.com>,
Bryn Reeves <bmr@redhat.com>,
Christoph Hellwig <hch@infradead.org>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 1/9] scsi: move initialization of scmd->eh_entry
Date: Mon, 10 Jun 2013 09:40:50 +0200 [thread overview]
Message-ID: <1370850058-27613-2-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1370850058-27613-1-git-send-email-hare@suse.de>
The 'eh_entry' list might be used even before scsi_softirq_done()
is called. Hence we should rather initialize it together with
the other eh-related variables.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/scsi_lib.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 86d5220..c1774de 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -317,6 +317,8 @@ static void scsi_init_cmd_errh(struct scsi_cmnd *cmd)
memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
if (cmd->cmd_len == 0)
cmd->cmd_len = scsi_command_size(cmd->cmnd);
+ INIT_LIST_HEAD(&cmd->eh_entry);
+ cmd->eh_eflags = 0;
}
void scsi_device_unbusy(struct scsi_device *sdev)
@@ -1482,8 +1484,6 @@ static void scsi_softirq_done(struct request *rq)
unsigned long wait_for = (cmd->allowed + 1) * rq->timeout;
int disposition;
- INIT_LIST_HEAD(&cmd->eh_entry);
-
atomic_inc(&cmd->device->iodone_cnt);
if (cmd->result)
atomic_inc(&cmd->device->ioerr_cnt);
--
1.7.12.4
next prev parent reply other threads:[~2013-06-10 7:41 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-10 7:40 [PATCHv2 0/9] New SCSI command timeout handler Hannes Reinecke
2013-06-10 7:40 ` Hannes Reinecke [this message]
2013-06-10 8:17 ` [PATCH 1/9] scsi: move initialization of scmd->eh_entry Christoph Hellwig
2013-06-10 7:40 ` [PATCH 2/9] blk-timeout: add BLK_EH_SCHEDULED return code Hannes Reinecke
2013-06-10 7:40 ` [PATCH 3/9] scsi: improved eh timeout handler Hannes Reinecke
2013-06-10 8:20 ` Christoph Hellwig
2013-06-10 9:00 ` Hannes Reinecke
2013-06-10 15:19 ` Jörn Engel
2013-06-10 23:24 ` Jörn Engel
2013-06-11 6:18 ` Hannes Reinecke
2013-06-11 16:35 ` Jörn Engel
2013-06-11 18:57 ` James Bottomley
2013-06-11 20:41 ` Ewan Milne
2013-06-11 20:54 ` James Bottomley
2013-06-12 5:54 ` Hannes Reinecke
2013-06-12 6:34 ` Bart Van Assche
2013-06-12 6:42 ` Hannes Reinecke
2013-06-10 15:47 ` Jörn Engel
2013-06-10 7:40 ` [PATCH 4/9] virtio_scsi: Enable new EH " Hannes Reinecke
2013-06-12 14:54 ` Paolo Bonzini
2013-06-13 1:58 ` Asias He
2013-06-10 7:40 ` [PATCH 5/9] virtio-scsi: Implement TMF timeout Hannes Reinecke
2013-06-12 14:54 ` Paolo Bonzini
2013-06-13 1:58 ` Asias He
2013-06-10 7:40 ` [PATCH 6/9] libsas: Enable new EH timeout handler Hannes Reinecke
2013-06-10 7:40 ` [PATCH 7/9] mptsas: " Hannes Reinecke
2013-06-10 7:40 ` [PATCH 8/9] mpt2sas: " Hannes Reinecke
2013-06-10 15:31 ` Jörn Engel
2013-06-11 5:41 ` Hannes Reinecke
2013-06-10 7:40 ` [PATCH 9/9] mpt3sas: " Hannes Reinecke
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=1370850058-27613-2-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=bmr@redhat.com \
--cc=emilne@redhat.com \
--cc=hch@infradead.org \
--cc=james.smart@emulex.com \
--cc=jbottomley@parallels.com \
--cc=joern@logfs.org \
--cc=linux-scsi@vger.kernel.org \
--cc=renmx@cn.fujitsu.com \
--cc=roland@purestorage.com \
/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).