tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[SCSI] qla2xxx: Set an rport's dev_loss_tmo value in a consistent manner.

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>

authored by

Andrew Vasquez and committed by
James Bottomley 85821c90 5f3a9a20

+3 -19
unified split
+2 -18
drivers/scsi/qla2xxx/qla_attr.c
··· 972 } 973 974 static void 975 - qla2x00_get_rport_loss_tmo(struct fc_rport *rport) 976 - { 977 - struct Scsi_Host *host = rport_to_shost(rport); 978 - scsi_qla_host_t *ha = shost_priv(host); 979 - 980 - rport->dev_loss_tmo = ha->port_down_retry_count + 5; 981 - } 982 - 983 - static void 984 qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout) 985 { 986 - struct Scsi_Host *host = rport_to_shost(rport); 987 - scsi_qla_host_t *ha = shost_priv(host); 988 - 989 if (timeout) 990 - ha->port_down_retry_count = timeout; 991 else 992 - ha->port_down_retry_count = 1; 993 - 994 - rport->dev_loss_tmo = ha->port_down_retry_count + 5; 995 } 996 997 static void ··· 1261 .get_starget_port_id = qla2x00_get_starget_port_id, 1262 .show_starget_port_id = 1, 1263 1264 - .get_rport_dev_loss_tmo = qla2x00_get_rport_loss_tmo, 1265 .set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo, 1266 .show_rport_dev_loss_tmo = 1, 1267 ··· 1305 .get_starget_port_id = qla2x00_get_starget_port_id, 1306 .show_starget_port_id = 1, 1307 1308 - .get_rport_dev_loss_tmo = qla2x00_get_rport_loss_tmo, 1309 .set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo, 1310 .show_rport_dev_loss_tmo = 1, 1311
··· 972 } 973 974 static void 975 qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout) 976 { 977 if (timeout) 978 + rport->dev_loss_tmo = timeout; 979 else 980 + rport->dev_loss_tmo = 1; 981 } 982 983 static void ··· 1275 .get_starget_port_id = qla2x00_get_starget_port_id, 1276 .show_starget_port_id = 1, 1277 1278 .set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo, 1279 .show_rport_dev_loss_tmo = 1, 1280 ··· 1320 .get_starget_port_id = qla2x00_get_starget_port_id, 1321 .show_starget_port_id = 1, 1322 1323 .set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo, 1324 .show_rport_dev_loss_tmo = 1, 1325
+1 -1
drivers/scsi/qla2xxx/qla_os.c
··· 1107 else 1108 scsi_deactivate_tcq(sdev, ha->max_q_depth); 1109 1110 - rport->dev_loss_tmo = ha->port_down_retry_count + 5; 1111 1112 return 0; 1113 }
··· 1107 else 1108 scsi_deactivate_tcq(sdev, ha->max_q_depth); 1109 1110 + rport->dev_loss_tmo = ha->port_down_retry_count; 1111 1112 return 0; 1113 }