iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: qla2xxx: Update rscn_rcvd field to more meaningful scan_needed

Browse Source 
Rename rscn_rcvd field to scan_needed to be more meaningful.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Quinn Tran 2018-08-31 11:24:29 -07:00 committed by Martin K. Petersen
parent 49cecca7dd
commit cb873ba400
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2351,7 +2351,7 @@ typedef struct fc_port {
unsigned int login_succ:1; unsigned int login_succ:1;
unsigned int query:1; unsigned int query:1;
unsigned int id_changed:1; unsigned int id_changed:1;
unsigned int rscn_rcvd:1; unsigned int scan_needed:1;
struct work_struct nvme_del_work; struct work_struct nvme_del_work;
struct completion nvme_del_done; struct completion nvme_del_done;

12
drivers/scsi/qla2xxx/qla_gs.c
View File

@ -3951,7 +3951,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
list_for_each_entry(fcport, &vha->vp_fcports, list) { list_for_each_entry(fcport, &vha->vp_fcports, list) {
if (memcmp(rp->port_name, fcport->port_name, WWN_SIZE)) if (memcmp(rp->port_name, fcport->port_name, WWN_SIZE))
continue; continue;
fcport->rscn_rcvd = 0; fcport->scan_needed = 0;
fcport->scan_state = QLA_FCPORT_FOUND; fcport->scan_state = QLA_FCPORT_FOUND;
found = true; found = true;
/* /*
@ -3981,12 +3981,12 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
*/ */
list_for_each_entry(fcport, &vha->vp_fcports, list) { list_for_each_entry(fcport, &vha->vp_fcports, list) {
if ((fcport->flags & FCF_FABRIC_DEVICE) == 0) { if ((fcport->flags & FCF_FABRIC_DEVICE) == 0) {
fcport->rscn_rcvd = 0; fcport->scan_needed = 0;
continue; continue;
} }
if (fcport->scan_state != QLA_FCPORT_FOUND) { if (fcport->scan_state != QLA_FCPORT_FOUND) {
fcport->rscn_rcvd = 0; fcport->scan_needed = 0;
if ((qla_dual_mode_enabled(vha) || if ((qla_dual_mode_enabled(vha) ||
qla_ini_mode_enabled(vha)) && qla_ini_mode_enabled(vha)) &&
atomic_read(&fcport->state) == FCS_ONLINE) { atomic_read(&fcport->state) == FCS_ONLINE) {
@ -4005,7 +4005,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
} }
} }
} else { } else {
if (fcport->rscn_rcvd || if (fcport->scan_needed ||
fcport->disc_state != DSC_LOGIN_COMPLETE) { fcport->disc_state != DSC_LOGIN_COMPLETE) {
if (fcport->login_retry == 0) { if (fcport->login_retry == 0) {
fcport->login_retry = fcport->login_retry =
@ -4015,7 +4015,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
fcport->port_name, fcport->loop_id, fcport->port_name, fcport->loop_id,
fcport->login_retry); fcport->login_retry);
} }
fcport->rscn_rcvd = 0; fcport->scan_needed = 0;
qla24xx_fcport_handle_login(vha, fcport); qla24xx_fcport_handle_login(vha, fcport);
} }
} }
@ -4030,7 +4030,7 @@ out:
if (recheck) { if (recheck) {
list_for_each_entry(fcport, &vha->vp_fcports, list) { list_for_each_entry(fcport, &vha->vp_fcports, list) {
if (fcport->rscn_rcvd) { if (fcport->scan_needed) {
set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
break; break;

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

@ -1551,7 +1551,7 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)
fcport = qla2x00_find_fcport_by_nportid fcport = qla2x00_find_fcport_by_nportid
(vha, &ea->id, 1); (vha, &ea->id, 1);
if (fcport) if (fcport)
fcport->rscn_rcvd = 1; fcport->scan_needed = 1;
spin_lock_irqsave(&vha->work_lock, flags); spin_lock_irqsave(&vha->work_lock, flags);
if (vha->scan.scan_flags == 0) { if (vha->scan.scan_flags == 0) {