Commit da99e307 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley

[SCSI] ibmvfc: do not reset dev_loss_tmo in slave callout

This fixes a bug where the driver was resetting the
rport dev_loss_tmo when devices were added by adding
support for the get_host_def_dev_loss_tmo callout.

Patch has only been compile tested.
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 8196a934
...@@ -1030,6 +1030,11 @@ static void ibmvfc_get_host_port_state(struct Scsi_Host *shost) ...@@ -1030,6 +1030,11 @@ static void ibmvfc_get_host_port_state(struct Scsi_Host *shost)
spin_unlock_irqrestore(shost->host_lock, flags); spin_unlock_irqrestore(shost->host_lock, flags);
} }
static void ibmvfc_set_host_def_dev_loss_tmo(struct Scsi_Host *shost)
{
fc_host_def_dev_loss_tmo(shost) = dev_loss_tmo;
}
/** /**
* ibmvfc_set_rport_dev_loss_tmo - Set rport's device loss timeout * ibmvfc_set_rport_dev_loss_tmo - Set rport's device loss timeout
* @rport: rport struct * @rport: rport struct
...@@ -2788,7 +2793,6 @@ static int ibmvfc_target_alloc(struct scsi_target *starget) ...@@ -2788,7 +2793,6 @@ static int ibmvfc_target_alloc(struct scsi_target *starget)
static int ibmvfc_slave_configure(struct scsi_device *sdev) static int ibmvfc_slave_configure(struct scsi_device *sdev)
{ {
struct Scsi_Host *shost = sdev->host; struct Scsi_Host *shost = sdev->host;
struct fc_rport *rport = starget_to_rport(sdev->sdev_target);
unsigned long flags = 0; unsigned long flags = 0;
spin_lock_irqsave(shost->host_lock, flags); spin_lock_irqsave(shost->host_lock, flags);
...@@ -2800,8 +2804,6 @@ static int ibmvfc_slave_configure(struct scsi_device *sdev) ...@@ -2800,8 +2804,6 @@ static int ibmvfc_slave_configure(struct scsi_device *sdev)
scsi_activate_tcq(sdev, sdev->queue_depth); scsi_activate_tcq(sdev, sdev->queue_depth);
} else } else
scsi_deactivate_tcq(sdev, sdev->queue_depth); scsi_deactivate_tcq(sdev, sdev->queue_depth);
rport->dev_loss_tmo = dev_loss_tmo;
spin_unlock_irqrestore(shost->host_lock, flags); spin_unlock_irqrestore(shost->host_lock, flags);
return 0; return 0;
} }
...@@ -4889,6 +4891,8 @@ static struct fc_function_template ibmvfc_transport_functions = { ...@@ -4889,6 +4891,8 @@ static struct fc_function_template ibmvfc_transport_functions = {
.get_host_speed = ibmvfc_get_host_speed, .get_host_speed = ibmvfc_get_host_speed,
.show_host_speed = 1, .show_host_speed = 1,
.get_host_def_dev_loss_tmo = ibmvfc_set_host_def_dev_loss_tmo,
.issue_fc_host_lip = ibmvfc_issue_fc_host_lip, .issue_fc_host_lip = ibmvfc_issue_fc_host_lip,
.terminate_rport_io = ibmvfc_terminate_rport_io, .terminate_rport_io = ibmvfc_terminate_rport_io,
......
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