mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-17 20:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

From ac2ef12020817c8e8edb7b4fe57f053c62cc833e Mon Sep 17 00:00:00 2001

Browse Source 
From: Andrew Vasquez <andrew.vasquez@qlogic.com> 
Date: Thu, 14 Aug 2008 09:39:35 -0700 
Subject: qla2xxx: Set an rport's dev_loss_tmo value in a consistent manner. 
 
[ Upstream commit 85821c906cf3563a00a3d98fa380a2581a7a5ff1 ] 
 
As there's no point in adding a fixed-fudge value (originally 5 
seconds), honor the user settings only.  We also remove the 
driver's dead-callback get_rport_dev_loss_tmo function 
(qla2x00_get_rport_loss_tmo()). 
 
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> 
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> 
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 

Submitted by Gal Rosen <galr@storwize.com>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1239 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2009-10-22 12:39:36 +00:00
parent f01c5a9355
commit ed5513284c
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qla2x00t/qla_attr.c
+2 -18
View File
@@ -1467,27 +1467,13 @@ qla2x00_get_starget_port_id(struct scsi_target *starget)
fc_starget_port_id(starget) = port_id;
}
static void
qla2x00_get_rport_loss_tmo(struct fc_rport *rport)
{
struct Scsi_Host *host = rport_to_shost(rport);
scsi_qla_host_t *ha = shost_priv(host);
rport->dev_loss_tmo = ha->port_down_retry_count + 5;
}
static void
qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
{
struct Scsi_Host *host = rport_to_shost(rport);
scsi_qla_host_t *ha = shost_priv(host);
if (timeout)
ha->port_down_retry_count = timeout;
rport->dev_loss_tmo = timeout;
else
ha->port_down_retry_count = 1;
rport->dev_loss_tmo = ha->port_down_retry_count + 5;
rport->dev_loss_tmo = 1;
}
static void
@@ -1771,7 +1757,6 @@ struct fc_function_template qla2xxx_transport_functions = {
.get_starget_port_id = qla2x00_get_starget_port_id,
.show_starget_port_id = 1,
.get_rport_dev_loss_tmo = qla2x00_get_rport_loss_tmo,
.set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo,
.show_rport_dev_loss_tmo = 1,
@@ -1816,7 +1801,6 @@ struct fc_function_template qla2xxx_transport_vport_functions = {
.get_starget_port_id = qla2x00_get_starget_port_id,
.show_starget_port_id = 1,
.get_rport_dev_loss_tmo = qla2x00_get_rport_loss_tmo,
.set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo,
.show_rport_dev_loss_tmo = 1,
qla2x00t/qla_os.c
+1 -1
View File
@@ -1138,7 +1138,7 @@ qla2xxx_slave_configure(struct scsi_device *sdev)
else
scsi_deactivate_tcq(sdev, ha->max_q_depth);
rport->dev_loss_tmo = ha->port_down_retry_count + 5;
rport->dev_loss_tmo = ha->port_down_retry_count;
return 0;
}