From 074d11da3a60d5e7341a26a42df8dd453774e71a Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Fri, 6 Aug 2010 03:02:39 -0500 Subject: [PATCH] --- yaml --- r: 213305 b: refs/heads/master c: 143beaa811aa3cfc4ae8b4a2092f232ad78b33da h: refs/heads/master i: 213303: 7bdef82b4f5120eef1a298284ccf8f7702479bdf v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_attr.c | 10 ++++++++++ trunk/drivers/scsi/lpfc/lpfc_scsi.c | 10 ---------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e57721d110bd..85e40e5d46a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a74bdf4661441d79a700f7ab3fc6d225ea2cf409 +refs/heads/master: 143beaa811aa3cfc4ae8b4a2092f232ad78b33da diff --git a/trunk/drivers/scsi/lpfc/lpfc_attr.c b/trunk/drivers/scsi/lpfc/lpfc_attr.c index 23ce45708335..87c2b6b858f7 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_attr.c +++ b/trunk/drivers/scsi/lpfc/lpfc_attr.c @@ -4370,6 +4370,14 @@ lpfc_get_starget_port_name(struct scsi_target *starget) ndlp ? wwn_to_u64(ndlp->nlp_portname.u.wwn) : 0; } +static void +lpfc_get_host_def_loss_tmo(struct Scsi_Host *shost) +{ + struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; + + fc_host_def_dev_loss_tmo(shost) = vport->cfg_devloss_tmo; +} + /** * lpfc_set_rport_loss_tmo - Set the rport dev loss tmo * @rport: fc rport address. @@ -4478,6 +4486,7 @@ struct fc_function_template lpfc_transport_functions = { .get_host_fabric_name = lpfc_get_host_fabric_name, .show_host_fabric_name = 1, + .get_host_def_dev_loss_tmo = lpfc_get_host_def_loss_tmo, /* * The LPFC driver treats linkdown handling as target loss events * so there are no sysfs handlers for link_down_tmo. @@ -4545,6 +4554,7 @@ struct fc_function_template lpfc_vport_transport_functions = { .get_host_fabric_name = lpfc_get_host_fabric_name, .show_host_fabric_name = 1, + .get_host_def_dev_loss_tmo = lpfc_get_host_def_loss_tmo, /* * The LPFC driver treats linkdown handling as target loss events * so there are no sysfs handlers for link_down_tmo. diff --git a/trunk/drivers/scsi/lpfc/lpfc_scsi.c b/trunk/drivers/scsi/lpfc/lpfc_scsi.c index 2e51aa6b45b3..6e331c73170e 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_scsi.c +++ b/trunk/drivers/scsi/lpfc/lpfc_scsi.c @@ -3656,7 +3656,6 @@ lpfc_slave_alloc(struct scsi_device *sdev) * * This routine configures following items * - Tag command queuing support for @sdev if supported. - * - Dev loss time out value of fc_rport. * - Enable SLI polling for fcp ring if ENABLE_FCP_RING_POLLING flag is set. * * Return codes: @@ -3667,21 +3666,12 @@ lpfc_slave_configure(struct scsi_device *sdev) { struct lpfc_vport *vport = (struct lpfc_vport *) sdev->host->hostdata; struct lpfc_hba *phba = vport->phba; - struct fc_rport *rport = starget_to_rport(sdev->sdev_target); if (sdev->tagged_supported) scsi_activate_tcq(sdev, vport->cfg_lun_queue_depth); else scsi_deactivate_tcq(sdev, vport->cfg_lun_queue_depth); - /* - * Initialize the fc transport attributes for the target - * containing this scsi device. Also note that the driver's - * target pointer is stored in the starget_data for the - * driver's sysfs entry point functions. - */ - rport->dev_loss_tmo = vport->cfg_devloss_tmo; - if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) { lpfc_sli_handle_fast_ring_event(phba, &phba->sli.ring[LPFC_FCP_RING], HA_R0RE_REQ);