diff options
author | Joe Eykholt <jeykholt@cisco.com> | 2009-10-21 19:27:22 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-04 13:00:29 -0500 |
commit | 22655ac22289d7b7def8ef2d72eafe5024bd57fe (patch) | |
tree | 2d7803d454239dd2be31a3b39d101c2845e31b71 /drivers/scsi | |
parent | 1b69bc062c2a4c8f3e15ac69f487afec3aa8d774 (diff) |
[SCSI] libfc: don't WARN_ON in lport_timeout for RESET state
It's possible and harmless to get FLOGI timeouts
while in RESET state. Don't do a WARN_ON in that case.
Also, split out the other WARN_ONs in fc_lport_timeout, so
we can tell which one is hit by its line number.
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/libfc/fc_lport.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c index eefe87d8efb3..0d19ffa88716 100644 --- a/drivers/scsi/libfc/fc_lport.c +++ b/drivers/scsi/libfc/fc_lport.c | |||
@@ -1237,10 +1237,13 @@ static void fc_lport_timeout(struct work_struct *work) | |||
1237 | 1237 | ||
1238 | switch (lport->state) { | 1238 | switch (lport->state) { |
1239 | case LPORT_ST_DISABLED: | 1239 | case LPORT_ST_DISABLED: |
1240 | WARN_ON(1); | ||
1241 | break; | ||
1240 | case LPORT_ST_READY: | 1242 | case LPORT_ST_READY: |
1241 | case LPORT_ST_RESET: | ||
1242 | WARN_ON(1); | 1243 | WARN_ON(1); |
1243 | break; | 1244 | break; |
1245 | case LPORT_ST_RESET: | ||
1246 | break; | ||
1244 | case LPORT_ST_FLOGI: | 1247 | case LPORT_ST_FLOGI: |
1245 | fc_lport_enter_flogi(lport); | 1248 | fc_lport_enter_flogi(lport); |
1246 | break; | 1249 | break; |