openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] qla2xxx: Use an rport's scsi_target_id member consistently throughout driver. 

Rather than using a duplicate/cached value stored in the driver's
internal fcport structure.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Andrew Vasquez 2008-04-03 13:13:16 -07:00 committed by James Bottomley
parent 0ddda2d152
commit 5ab5a4dd54
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/qla2xxx/qla_attr.c
View File

@ -900,7 +900,8 @@ qla2x00_get_starget_node_name(struct scsi_target *starget)
u64 node_name = 0; u64 node_name = 0;
list_for_each_entry(fcport, &ha->fcports, list) { list_for_each_entry(fcport, &ha->fcports, list) {
if (starget->id == fcport->os_target_id) { if (fcport->rport &&
starget->id == fcport->rport->scsi_target_id) {
node_name = wwn_to_u64(fcport->node_name); node_name = wwn_to_u64(fcport->node_name);
break; break;
} }
@ -918,7 +919,8 @@ qla2x00_get_starget_port_name(struct scsi_target *starget)
u64 port_name = 0; u64 port_name = 0;
list_for_each_entry(fcport, &ha->fcports, list) { list_for_each_entry(fcport, &ha->fcports, list) {
if (starget->id == fcport->os_target_id) { if (fcport->rport &&
starget->id == fcport->rport->scsi_target_id) {
port_name = wwn_to_u64(fcport->port_name); port_name = wwn_to_u64(fcport->port_name);
break; break;
} }
@ -936,7 +938,8 @@ qla2x00_get_starget_port_id(struct scsi_target *starget)
uint32_t port_id = ~0U; uint32_t port_id = ~0U;
list_for_each_entry(fcport, &ha->fcports, list) { list_for_each_entry(fcport, &ha->fcports, list) {
if (starget->id == fcport->os_target_id) { if (fcport->rport &&
starget->id == fcport->rport->scsi_target_id) {
port_id = fcport->d_id.b.domain << 16 | port_id = fcport->d_id.b.domain << 16 |
fcport->d_id.b.area << 8 | fcport->d_id.b.al_pa; fcport->d_id.b.area << 8 | fcport->d_id.b.al_pa;
break; break;

2
drivers/scsi/qla2xxx/qla_def.h
View File

@ -1542,8 +1542,6 @@ typedef struct fc_port {
atomic_t state; atomic_t state;
uint32_t flags; uint32_t flags;
unsigned int os_target_id;
int port_login_retry_count; int port_login_retry_count;
int login_retry; int login_retry;
atomic_t port_down_timer; atomic_t port_down_timer;

4
drivers/scsi/qla2xxx/qla_init.c
View File

@ -2251,10 +2251,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
if (fcport->port_type == FCT_TARGET) if (fcport->port_type == FCT_TARGET)
rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET; rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET;
fc_remote_port_rolechg(rport, rport_ids.roles); fc_remote_port_rolechg(rport, rport_ids.roles);
if (rport->scsi_target_id != -1 &&
rport->scsi_target_id < ha->host->max_id)
fcport->os_target_id = rport->scsi_target_id;
} }
/* /*