[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: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index 5f839b625e509696a060f124170bc1177146e921..e5e5b260a572af94c84aaeebec0332ebb1ba90f3 100644 (file)
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -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);

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index a7fe6b8d38b87ef0ff82e2dcd2fd1e1927256bd3..016f771ebe6914e2e52927647ce4e1e06a539db4 100644 (file)
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -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 "

diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index d0a45425cc3fcf87d5125454bd3008b182477644..50959ba0a9a08bf0a22b825cc4641c50c55173bc 100644 (file)
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -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;
 }
 
 /**

diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index a94d216d2207c4f6071c6359616c2b95037b260b..d324df8c36e6a70f12ba7007ac20d6c2f68113e6 100644 (file)
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -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