[SCSI] libfc: make rport module maintain the rport list
The list of remote ports (struct fc_rport_priv) has been maintained by the discovery module. In preparation for having lport->tt.rport_create() do a lookup first, maintain the rports list in the rport module. It will still be protected by the disc_mutex. The DNS rport is an exception for until after further patches. For now, do not add it to the list. The point-to-point rport will be in the discovery list. So at shutdown, it doesn't need to be separately logged out. 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:

committed by
James Bottomley

parent
b5cbf08373
commit
48f00902ba
@@ -91,8 +91,7 @@ static const char *fc_rport_state_names[] = {
|
||||
* @lport: local port.
|
||||
* @ids: remote port identifiers.
|
||||
*
|
||||
* Locking note: this may be called without locks held, but
|
||||
* is usually called from discovery with the disc_mutex held.
|
||||
* Locking note: must be called with the disc_mutex held.
|
||||
*/
|
||||
static struct fc_rport_priv *fc_rport_create(struct fc_lport *lport,
|
||||
struct fc_rport_identifiers *ids)
|
||||
@@ -115,6 +114,8 @@ static struct fc_rport_priv *fc_rport_create(struct fc_lport *lport,
|
||||
rdata->maxframe_size = FC_MIN_MAX_PAYLOAD;
|
||||
INIT_DELAYED_WORK(&rdata->retry_work, fc_rport_timeout);
|
||||
INIT_WORK(&rdata->event_work, fc_rport_work);
|
||||
if (ids->port_id != FC_FID_DIR_SERV)
|
||||
list_add(&rdata->peers, &lport->disc.rports);
|
||||
return rdata;
|
||||
}
|
||||
|
||||
@@ -258,6 +259,12 @@ static void fc_rport_work(struct work_struct *work)
|
||||
port_id = rdata->ids.port_id;
|
||||
mutex_unlock(&rdata->rp_mutex);
|
||||
|
||||
if (port_id != FC_FID_DIR_SERV) {
|
||||
mutex_lock(&lport->disc.disc_mutex);
|
||||
list_del(&rdata->peers);
|
||||
mutex_unlock(&lport->disc.disc_mutex);
|
||||
}
|
||||
|
||||
if (rport_ops->event_callback) {
|
||||
FC_RPORT_DBG(rdata, "callback ev %d\n", event);
|
||||
rport_ops->event_callback(lport, rdata, event);
|
||||
|
Reference in New Issue
Block a user