From: Hannes Reinecke <hare@suse.de>
To: James Bottomley <jbottomley@parallels.com>
Cc: Christoph Hellwig <hch@infradead.org>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Subject: [PATCH 2/7] mptfc: Do not call fc_block_scsi_eh() on host reset
Date: Fri, 27 Jun 2014 08:27:00 +0200 [thread overview]
Message-ID: <1403850425-89297-3-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1403850425-89297-1-git-send-email-hare@suse.de>
When we're resetting the host any remote port states will
be reset anyway, so it's pointless to wait for dev_loss_tmo
during host reset.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Cc: Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
---
drivers/message/fusion/mptfc.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index bf2a2ce..b84dc26 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -104,7 +104,6 @@ static void mptfc_remove(struct pci_dev *pdev);
static int mptfc_abort(struct scsi_cmnd *SCpnt);
static int mptfc_dev_reset(struct scsi_cmnd *SCpnt);
static int mptfc_bus_reset(struct scsi_cmnd *SCpnt);
-static int mptfc_host_reset(struct scsi_cmnd *SCpnt);
static struct scsi_host_template mptfc_driver_template = {
.module = THIS_MODULE,
@@ -122,7 +121,7 @@ static struct scsi_host_template mptfc_driver_template = {
.eh_abort_handler = mptfc_abort,
.eh_device_reset_handler = mptfc_dev_reset,
.eh_bus_reset_handler = mptfc_bus_reset,
- .eh_host_reset_handler = mptfc_host_reset,
+ .eh_host_reset_handler = mptscsih_host_reset,
.bios_param = mptscsih_bios_param,
.can_queue = MPT_FC_CAN_QUEUE,
.this_id = -1,
@@ -253,13 +252,6 @@ mptfc_bus_reset(struct scsi_cmnd *SCpnt)
mptfc_block_error_handler(SCpnt, mptscsih_bus_reset, __func__);
}
-static int
-mptfc_host_reset(struct scsi_cmnd *SCpnt)
-{
- return
- mptfc_block_error_handler(SCpnt, mptscsih_host_reset, __func__);
-}
-
static void
mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
{
--
1.7.12.4
next prev parent reply other threads:[~2014-06-27 6:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-27 6:26 [PATCH 0/7] Use 'Scsi_Host' as argument for host reset Hannes Reinecke
2014-06-27 6:26 ` [PATCH 1/7] scsi: fix comment in scsi_device_set_state() Hannes Reinecke
2014-06-27 6:27 ` Hannes Reinecke [this message]
2014-06-27 6:27 ` [PATCH 3/7] ibmvfc: Do not call fc_block_scsi_eh() on host reset Hannes Reinecke
2014-06-27 6:27 ` [PATCH 4/7] libfc: " Hannes Reinecke
2014-06-27 6:27 ` [PATCH 5/7] scsi_transport_fc: Use fc_rport as argument for fc_block_scsi_eh Hannes Reinecke
2014-06-27 12:46 ` Steffen Maier
2014-06-27 6:27 ` [PATCH 6/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler Hannes Reinecke
2014-06-27 10:47 ` Steffen Maier
2014-06-27 11:04 ` Hannes Reinecke
2014-06-27 11:52 ` Martin Peschke
2014-06-27 12:00 ` Hannes Reinecke
2014-06-27 14:41 ` Steffen Maier
2014-06-27 17:52 ` Hannes Reinecke
2014-06-27 6:27 ` [PATCH 7/7] scsi_error: do not use command list for host reset Hannes Reinecke
2014-06-27 7:06 ` Bart Van Assche
2014-06-27 7:58 ` Christoph Hellwig
2014-06-27 10:42 ` Steffen Maier
2014-06-27 7:59 ` [PATCH 0/7] Use 'Scsi_Host' as argument " Christoph Hellwig
2014-06-27 8:14 ` Hannes Reinecke
2014-06-27 8:15 ` Christoph Hellwig
2014-09-07 16:21 ` Christoph Hellwig
2014-09-08 6:49 ` 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=1403850425-89297-3-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=Sreekanth.Reddy@avagotech.com \
--cc=hch@infradead.org \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.