redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[SCSI] libfc: simplify fc_lport_rport_callback

Browse source 
The lport rport callback can only be called for the dNS rport,
since its the only rport who's ops point to that function.

Remove unnecessary checking and debug messages.
Put the locking outside the switch statement as a simplification.

Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Joe Eykholt 2009-08-25 14:01:44 -07:00 committed by James Bottomley
parent cdbe6dfece
commit b5cbf08373
1 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/scsi/libfc/fc_lport.c
View file

@ -146,44 +146,31 @@ static void fc_lport_rport_callback(struct fc_lport *lport,
FC_LPORT_DBG(lport, "Received a %d event for port (%6x)\n", event, FC_LPORT_DBG(lport, "Received a %d event for port (%6x)\n", event,
rdata->ids.port_id); rdata->ids.port_id);
mutex_lock(&lport->lp_mutex);
switch (event) { switch (event) {
case RPORT_EV_READY: case RPORT_EV_READY:
if (rdata->ids.port_id == FC_FID_DIR_SERV) { if (lport->state == LPORT_ST_DNS) {
mutex_lock(&lport->lp_mutex); lport->dns_rp = rdata;
if (lport->state == LPORT_ST_DNS) { fc_lport_enter_rpn_id(lport);
lport->dns_rp = rdata; } else {
fc_lport_enter_rpn_id(lport); FC_LPORT_DBG(lport, "Received an READY event "
} else { "on port (%6x) for the directory "
FC_LPORT_DBG(lport, "Received an READY event " "server, but the lport is not "
"on port (%6x) for the directory " "in the DNS state, it's in the "
"server, but the lport is not " "%d state", rdata->ids.port_id,
"in the DNS state, it's in the " lport->state);
"%d state", rdata->ids.port_id, lport->tt.rport_logoff(rdata);
lport->state); }
lport->tt.rport_logoff(rdata);
}
mutex_unlock(&lport->lp_mutex);
} else
FC_LPORT_DBG(lport, "Received an event for port (%6x) "
"which is not the directory server\n",
rdata->ids.port_id);
break; break;
case RPORT_EV_LOGO: case RPORT_EV_LOGO:
case RPORT_EV_FAILED: case RPORT_EV_FAILED:
case RPORT_EV_STOP: case RPORT_EV_STOP:
if (rdata->ids.port_id == FC_FID_DIR_SERV) { lport->dns_rp = NULL;
mutex_lock(&lport->lp_mutex);
lport->dns_rp = NULL;
mutex_unlock(&lport->lp_mutex);
} else
FC_LPORT_DBG(lport, "Received an event for port (%6x) "
"which is not the directory server\n",
rdata->ids.port_id);
break; break;
case RPORT_EV_NONE: case RPORT_EV_NONE:
break; break;
} }
mutex_unlock(&lport->lp_mutex);
} }
/** /**