diff options
author | Joe Eykholt <jeykholt@cisco.com> | 2009-08-25 17:01:12 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-09-10 13:07:43 -0400 |
commit | 4c0f62b5679321b2e5572cf541ffb9f7b344d47c (patch) | |
tree | 0c4fba12e9098c63cfdc37dac15313f313887b1a | |
parent | 629f44279d169f29b084d406e9f1c33314f220fa (diff) |
[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>
-rw-r--r-- | drivers/scsi/libfc/fc_disc.c | 2 | ||||
-rw-r--r-- | drivers/scsi/libfc/fc_lport.c | 4 | ||||
-rw-r--r-- | drivers/scsi/libfc/fc_rport.c | 4 | ||||
-rw-r--r-- | include/scsi/libfc.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c index 5f839b625e50..e5e5b260a572 100644 --- 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, | |||
118 | rdata->ids.port_id); | 118 | rdata->ids.port_id); |
119 | 119 | ||
120 | switch (event) { | 120 | switch (event) { |
121 | case RPORT_EV_CREATED: | 121 | case RPORT_EV_READY: |
122 | if (disc) { | 122 | if (disc) { |
123 | mutex_lock(&disc->disc_mutex); | 123 | mutex_lock(&disc->disc_mutex); |
124 | list_add_tail(&rdata->peers, &disc->rports); | 124 | list_add_tail(&rdata->peers, &disc->rports); |
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c index a7fe6b8d38b8..016f771ebe69 100644 --- 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, | |||
147 | rdata->ids.port_id); | 147 | rdata->ids.port_id); |
148 | 148 | ||
149 | switch (event) { | 149 | switch (event) { |
150 | case RPORT_EV_CREATED: | 150 | case RPORT_EV_READY: |
151 | if (rdata->ids.port_id == FC_FID_DIR_SERV) { | 151 | if (rdata->ids.port_id == FC_FID_DIR_SERV) { |
152 | mutex_lock(&lport->lp_mutex); | 152 | mutex_lock(&lport->lp_mutex); |
153 | if (lport->state == LPORT_ST_DNS) { | 153 | if (lport->state == LPORT_ST_DNS) { |
154 | lport->dns_rp = rdata; | 154 | lport->dns_rp = rdata; |
155 | fc_lport_enter_rpn_id(lport); | 155 | fc_lport_enter_rpn_id(lport); |
156 | } else { | 156 | } else { |
157 | FC_LPORT_DBG(lport, "Received an CREATED event " | 157 | FC_LPORT_DBG(lport, "Received an READY event " |
158 | "on port (%6x) for the directory " | 158 | "on port (%6x) for the directory " |
159 | "server, but the lport is not " | 159 | "server, but the lport is not " |
160 | "in the DNS state, it's in the " | 160 | "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 d0a45425cc3f..50959ba0a9a0 100644 --- 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) | |||
244 | rport = rdata->rport; | 244 | rport = rdata->rport; |
245 | 245 | ||
246 | switch (event) { | 246 | switch (event) { |
247 | case RPORT_EV_CREATED: | 247 | case RPORT_EV_READY: |
248 | ids = rdata->ids; | 248 | ids = rdata->ids; |
249 | rdata->event = RPORT_EV_NONE; | 249 | rdata->event = RPORT_EV_NONE; |
250 | mutex_unlock(&rdata->rp_mutex); | 250 | mutex_unlock(&rdata->rp_mutex); |
@@ -413,7 +413,7 @@ static void fc_rport_enter_ready(struct fc_rport_priv *rdata) | |||
413 | 413 | ||
414 | if (rdata->event == RPORT_EV_NONE) | 414 | if (rdata->event == RPORT_EV_NONE) |
415 | queue_work(rport_event_queue, &rdata->event_work); | 415 | queue_work(rport_event_queue, &rdata->event_work); |
416 | rdata->event = RPORT_EV_CREATED; | 416 | rdata->event = RPORT_EV_READY; |
417 | } | 417 | } |
418 | 418 | ||
419 | /** | 419 | /** |
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h index a94d216d2207..d324df8c36e6 100644 --- a/include/scsi/libfc.h +++ b/include/scsi/libfc.h | |||
@@ -167,7 +167,7 @@ struct fc_disc_port { | |||
167 | 167 | ||
168 | enum fc_rport_event { | 168 | enum fc_rport_event { |
169 | RPORT_EV_NONE = 0, | 169 | RPORT_EV_NONE = 0, |
170 | RPORT_EV_CREATED, | 170 | RPORT_EV_READY, |
171 | RPORT_EV_FAILED, | 171 | RPORT_EV_FAILED, |
172 | RPORT_EV_STOP, | 172 | RPORT_EV_STOP, |
173 | RPORT_EV_LOGO | 173 | RPORT_EV_LOGO |