Commit 4c0f62b5 authored by Joe Eykholt's avatar Joe Eykholt Committed by James Bottomley
Browse files

[SCSI] libfc: rename rport event CREATED to READY 



Remote ports will become READY more than once after
ADISC is implemented in a later patch.

The event callback that has been called "CREATED" will mean "READY".
Rename it now in preparation for those changes.

Signed-off-by: default avatarJoe Eykholt <jeykholt@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 629f4427

drivers/scsi/libfc/fc_disc.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void fc_disc_rport_callback(struct fc_lport *lport, 
		    rdata->ids.port_id);



	switch (event) {

	case RPORT_EV_CREATED:

	case RPORT_EV_READY:

		if (disc) {

			mutex_lock(&disc->disc_mutex);

			list_add_tail(&rdata->peers, &disc->rports);

drivers/scsi/libfc/fc_lport.c

+2 −2
Original line number Diff line number Diff line
@@ -147,14 +147,14 @@ static void fc_lport_rport_callback(struct fc_lport *lport, 
		     rdata->ids.port_id);



	switch (event) {

	case RPORT_EV_CREATED:

	case RPORT_EV_READY:

		if (rdata->ids.port_id == FC_FID_DIR_SERV) {

			mutex_lock(&lport->lp_mutex);

			if (lport->state == LPORT_ST_DNS) {

				lport->dns_rp = rdata;

				fc_lport_enter_rpn_id(lport);

			} else {

				FC_LPORT_DBG(lport, "Received an CREATED event "

				FC_LPORT_DBG(lport, "Received an READY event "

					     "on port (%6x) for the directory "

					     "server, but the lport is not "

					     "in the DNS state, it's in the "

drivers/scsi/libfc/fc_rport.c

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void fc_rport_work(struct work_struct *work) 
	rport = rdata->rport;



	switch (event) {

	case RPORT_EV_CREATED:

	case RPORT_EV_READY:

		ids = rdata->ids;

		rdata->event = RPORT_EV_NONE;

		mutex_unlock(&rdata->rp_mutex);
@@ -413,7 +413,7 @@ static void fc_rport_enter_ready(struct fc_rport_priv *rdata) 


	if (rdata->event == RPORT_EV_NONE)

		queue_work(rport_event_queue, &rdata->event_work);

	rdata->event = RPORT_EV_CREATED;

	rdata->event = RPORT_EV_READY;

}



/**

include/scsi/libfc.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct fc_disc_port { 


enum fc_rport_event {

	RPORT_EV_NONE = 0,

	RPORT_EV_CREATED,

	RPORT_EV_READY,

	RPORT_EV_FAILED,

	RPORT_EV_STOP,

	RPORT_EV_LOGO

CRA Git | Maintained and supported by SUSTech CRA and CCSE