[SCSI] libfc: LOGO response code had extraeous enter_rtv
authorJoe Eykholt <jeykholt@cisco.com>
Tue, 25 Aug 2009 21:03:42 +0000 (14:03 -0700)
committerJames Bottomley <James.Bottomley@suse.de>
Thu, 10 Sep 2009 17:08:01 +0000 (12:08 -0500)
fc_rport_logo_resp() had a call to fc_rport_enter_rtv() if the
LOGO was accepted.  This must've been a copy/paste mistake, but
it didn't matter since we don't stay in the LOGO state long enough
to hit this code.

Change fc_rport_logo_resp() to just enter the delete state
no matter what.

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>
drivers/scsi/libfc/fc_rport.c

index dc97c603744ff2ed155031a6a3f3da120f4772f4..b5bc8724e1a07520c7ec4b7c3c79b5ff55d6fdc3 100644 (file)
@@ -725,12 +725,10 @@ static void fc_rport_logo_resp(struct fc_seq *sp, struct fc_frame *fp,
        }
 
        op = fc_frame_payload_op(fp);
-       if (op == ELS_LS_ACC) {
-               fc_rport_enter_rtv(rdata);
-       } else {
-               FC_RPORT_DBG(rdata, "Bad ELS response for LOGO command\n");
-               fc_rport_enter_delete(rdata, RPORT_EV_LOGO);
-       }
+       if (op != ELS_LS_ACC)
+               FC_RPORT_DBG(rdata, "Bad ELS response op %x for LOGO command\n",
+                            op);
+       fc_rport_enter_delete(rdata, RPORT_EV_LOGO);
 
 out:
        fc_frame_free(fp);