[SCSI] libfc: adds missing exch release for accepted RRQ
authorVasu Dev <vasu.dev@intel.com>
Wed, 21 Oct 2009 23:27:33 +0000 (16:27 -0700)
committerJames Bottomley <James.Bottomley@suse.de>
Fri, 4 Dec 2009 18:00:30 +0000 (12:00 -0600)
Adds missing exch release when RRQ is accepted by calling
fc_seq_ls_acc. Adds common exch release for fc_exch_els_rrq
by use of out label.

Reported-by: Alex Lyakas <alexl@mellanox.co.il>
Signed-off-by: Vasu Dev <vasu.dev@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/scsi/libfc/fc_exch.c

index bdae9a9e7ae9adfd60f2a2c028140b1d2f698457..8ce4182965379e94332b15925297eed1cb76a57c 100644 (file)
@@ -1718,7 +1718,7 @@ retry:
  */
 static void fc_exch_els_rrq(struct fc_seq *sp, struct fc_frame *fp)
 {
-       struct fc_exch *ep;             /* request or subject exchange */
+       struct fc_exch *ep = NULL;      /* request or subject exchange */
        struct fc_els_rrq *rp;
        u32 sid;
        u16 xid;
@@ -1768,15 +1768,16 @@ static void fc_exch_els_rrq(struct fc_seq *sp, struct fc_frame *fp)
         * Send LS_ACC.
         */
        fc_seq_ls_acc(sp);
-       fc_frame_free(fp);
-       return;
+       goto out;
 
 unlock_reject:
        spin_unlock_bh(&ep->ex_lock);
-       fc_exch_release(ep);    /* drop hold from fc_exch_find */
 reject:
        fc_seq_ls_rjt(sp, ELS_RJT_LOGIC, explan);
+out:
        fc_frame_free(fp);
+       if (ep)
+               fc_exch_release(ep);    /* drop hold from fc_exch_find */
 }
 
 struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *lport,