From: Hannes Reinecke <hare@suse.de>
To: James Bottomley <jbottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org, Ewan Milne <emilne@redhat.com>,
Ren Mingxin <renmx@cn.fujitsu.com>, Joern Engel <joern@logfs.org>,
James Smart <james.smart@emulex.com>,
Bart Van Assche <bvanassche@acm.org>,
Roland Dreier <roland@purestorage.com>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 6/9] mptsas: Enable new EH timeout handler
Date: Thu, 29 Aug 2013 15:32:17 +0200 [thread overview]
Message-ID: <1377783140-57191-7-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1377783140-57191-1-git-send-email-hare@suse.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/message/fusion/mptsas.c | 3 ++-
drivers/message/fusion/mptscsih.c | 7 +++++++
drivers/message/fusion/mptscsih.h | 1 +
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index dd239bd..b3c87b2 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1986,7 +1986,8 @@ static struct scsi_host_template mptsas_driver_template = {
.slave_configure = mptsas_slave_configure,
.target_destroy = mptsas_target_destroy,
.slave_destroy = mptscsih_slave_destroy,
- .change_queue_depth = mptscsih_change_queue_depth,
+ .change_queue_depth = mptscsih_change_queue_depth,
+ .eh_timed_out = mptscsih_timed_out,
.eh_abort_handler = mptscsih_abort,
.eh_device_reset_handler = mptscsih_dev_reset,
.eh_host_reset_handler = mptscsih_host_reset,
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 727819c..e743e84 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1679,6 +1679,13 @@ mptscsih_get_tm_timeout(MPT_ADAPTER *ioc)
}
}
+enum blk_eh_timer_return
+mptscsih_timed_out(struct scsi_cmnd *SCpnt)
+{
+ return scsi_abort_command(SCpnt);
+}
+EXPORT_SYMBOL(mptscsih_timed_out);
+
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/**
* mptscsih_abort - Abort linux scsi_cmnd routine, new_eh variant
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index 83f5031..3f2dd05 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -118,6 +118,7 @@ extern int mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel,
u8 id, int lun, int ctx2abort, ulong timeout);
extern void mptscsih_slave_destroy(struct scsi_device *device);
extern int mptscsih_slave_configure(struct scsi_device *device);
+enum blk_eh_timer_return mptscsih_timed_out(struct scsi_cmnd *SCpnt);
extern int mptscsih_abort(struct scsi_cmnd * SCpnt);
extern int mptscsih_dev_reset(struct scsi_cmnd * SCpnt);
extern int mptscsih_bus_reset(struct scsi_cmnd * SCpnt);
--
1.7.12.4
next prev parent reply other threads:[~2013-08-29 13:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-29 13:32 [PATCHv4 0/9] New EH command timeout handler Hannes Reinecke
2013-08-29 13:32 ` [PATCH 1/9] scsi: Fix erratic device offline during EH Hannes Reinecke
2013-08-29 13:32 ` [PATCH 2/9] blk-timeout: add BLK_EH_SCHEDULED return code Hannes Reinecke
2013-08-29 13:32 ` [PATCH 3/9] scsi: improved eh timeout handler Hannes Reinecke
2013-08-29 13:32 ` [PATCH 4/9] virtio_scsi: Enable new EH " Hannes Reinecke
2013-08-30 12:45 ` Christoph Hellwig
2013-08-30 12:47 ` Hannes Reinecke
2013-08-29 13:32 ` [PATCH 5/9] libsas: " Hannes Reinecke
2013-08-29 13:32 ` Hannes Reinecke [this message]
2013-08-29 13:32 ` [PATCH 7/9] mpt2sas: " Hannes Reinecke
2013-08-29 13:32 ` [PATCH 8/9] mpt3sas: " Hannes Reinecke
2013-08-29 13:32 ` [PATCH 9/9] scsi_transport_fc: " Hannes Reinecke
-- strict thread matches above, loose matches on Subject: below --
2013-09-02 7:12 [PATCHv5 0/9] New EH command " Hannes Reinecke
2013-09-02 7:13 ` [PATCH 6/9] mptsas: Enable new EH " Hannes Reinecke
2013-07-01 14:24 [PATCHv3 0/9] New EH command " Hannes Reinecke
2013-07-01 14:24 ` [PATCH 6/9] mptsas: Enable new EH " 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=1377783140-57191-7-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=bvanassche@acm.org \
--cc=emilne@redhat.com \
--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).