Commit fdad4aaf authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen

scsi: mptfc: Do not call fc_block_scsi_eh() on host reset

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: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 23cb27fd
...@@ -104,7 +104,6 @@ static void mptfc_remove(struct pci_dev *pdev); ...@@ -104,7 +104,6 @@ static void mptfc_remove(struct pci_dev *pdev);
static int mptfc_abort(struct scsi_cmnd *SCpnt); static int mptfc_abort(struct scsi_cmnd *SCpnt);
static int mptfc_dev_reset(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_bus_reset(struct scsi_cmnd *SCpnt);
static int mptfc_host_reset(struct scsi_cmnd *SCpnt);
static struct scsi_host_template mptfc_driver_template = { static struct scsi_host_template mptfc_driver_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
...@@ -123,7 +122,7 @@ static struct scsi_host_template mptfc_driver_template = { ...@@ -123,7 +122,7 @@ static struct scsi_host_template mptfc_driver_template = {
.eh_abort_handler = mptfc_abort, .eh_abort_handler = mptfc_abort,
.eh_device_reset_handler = mptfc_dev_reset, .eh_device_reset_handler = mptfc_dev_reset,
.eh_bus_reset_handler = mptfc_bus_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, .bios_param = mptscsih_bios_param,
.can_queue = MPT_FC_CAN_QUEUE, .can_queue = MPT_FC_CAN_QUEUE,
.this_id = -1, .this_id = -1,
...@@ -254,13 +253,6 @@ mptfc_bus_reset(struct scsi_cmnd *SCpnt) ...@@ -254,13 +253,6 @@ mptfc_bus_reset(struct scsi_cmnd *SCpnt)
mptfc_block_error_handler(SCpnt, mptscsih_bus_reset, __func__); 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 static void
mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout) mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment