libfc: don't WARN_ON in lport_timeout for RESET state

commit 22655ac22289d7b7def8ef2d72eafe5024bd57fe upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index eefe87d8efb301bac9bdeee6ad174727056e25a1..0d19ffa88716d0528f222b2e4ebde6f378781718 100644 (file)
--- 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)
 
        switch (lport->state) {
        case LPORT_ST_DISABLED:
+               WARN_ON(1);
+               break;
        case LPORT_ST_READY:
-       case LPORT_ST_RESET:
                WARN_ON(1);
                break;
+       case LPORT_ST_RESET:
+               break;
        case LPORT_ST_FLOGI:
                fc_lport_enter_flogi(lport);
                break;