From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, ohering@suse.com,
jbottomley@parallels.com, hch@infradead.org,
linux-scsi@vger.kernel.org, apw@canonical.com,
jasowang@redhat.com
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Subject: [PATCH 1/1] [SCSI] Fix a bug in deriving the FLUSH_TIMEOUT from the basic I/O timeout
Date: Wed, 4 Jun 2014 09:33:43 -0700 [thread overview]
Message-ID: <1401899623-24194-1-git-send-email-kys@microsoft.com> (raw)
Commit ID: 7e660100d85af860e7ad763202fff717adcdaacd added code to derive the
FLUSH_TIMEOUT from the basic I/O timeout. However, this patch did not use the
basic I/O timeout of the device. Fix this bug.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
drivers/scsi/sd.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e9689d5..54150b1 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -832,7 +832,9 @@ static int sd_setup_write_same_cmnd(struct scsi_device *sdp, struct request *rq)
static int scsi_setup_flush_cmnd(struct scsi_device *sdp, struct request *rq)
{
- rq->timeout *= SD_FLUSH_TIMEOUT_MULTIPLIER;
+ int timeout = sdp->request_queue->rq_timeout;
+
+ rq->timeout = (timeout * SD_FLUSH_TIMEOUT_MULTIPLIER);
rq->retries = SD_MAX_RETRIES;
rq->cmd[0] = SYNCHRONIZE_CACHE;
rq->cmd_len = 10;
--
1.7.4.1
next reply other threads:[~2014-06-04 15:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 16:33 K. Y. Srinivasan [this message]
2014-06-04 17:02 ` [PATCH 1/1] [SCSI] Fix a bug in deriving the FLUSH_TIMEOUT from the basic I/O timeout James Bottomley
2014-06-04 17:15 ` KY Srinivasan
2014-06-06 1:32 ` Mike Christie
2014-06-06 2:53 ` KY Srinivasan
2014-06-06 17:18 ` Mike Christie
2014-06-06 17:52 ` James Bottomley
2014-06-06 18:22 ` Jens Axboe
2014-06-20 21:36 ` KY Srinivasan
2014-07-17 23:53 ` KY Srinivasan
2014-07-18 0:51 ` Elliott, Robert (Server Storage)
2014-07-18 15:11 ` Christoph Hellwig (hch@infradead.org)
2014-07-18 15:39 ` James Bottomley
2014-07-18 17:17 ` Elliott, Robert (Server Storage)
2014-07-18 17:41 ` James Bottomley
2014-07-18 18:16 ` Douglas Gilbert
2014-07-18 15:10 ` Christoph Hellwig (hch@infradead.org)
2014-07-18 16:44 ` KY Srinivasan
2014-07-18 16:57 ` James Bottomley
2014-07-18 17:01 ` hch
2014-07-18 17:05 ` KY Srinivasan
2014-07-18 17:12 ` hch
2014-07-18 17:15 ` hch
2014-07-18 17:00 ` Christoph Hellwig
2014-07-18 17:03 ` James Bottomley
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=1401899623-24194-1-git-send-email-kys@microsoft.com \
--to=kys@microsoft.com \
--cc=apw@canonical.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=jasowang@redhat.com \
--cc=jbottomley@parallels.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=ohering@suse.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