diff options
author | Vasu Dev <vasu.dev@intel.com> | 2009-10-21 19:27:33 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-04 13:00:30 -0500 |
commit | 3f127ad97a985d43b3cdf4b644e77a775b6035d4 (patch) | |
tree | 73e10ad634ad25ea8fa72442fb8fa2397a121e24 /drivers/scsi/libfc | |
parent | 89f19a59de0ec4626c64d90d2f5e255961cab879 (diff) |
[SCSI] libfc: adds missing exch release for accepted RRQ
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>
Diffstat (limited to 'drivers/scsi/libfc')
-rw-r--r-- | drivers/scsi/libfc/fc_exch.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c index bdae9a9e7ae9..8ce418296537 100644 --- a/drivers/scsi/libfc/fc_exch.c +++ b/drivers/scsi/libfc/fc_exch.c | |||
@@ -1718,7 +1718,7 @@ retry: | |||
1718 | */ | 1718 | */ |
1719 | static void fc_exch_els_rrq(struct fc_seq *sp, struct fc_frame *fp) | 1719 | static void fc_exch_els_rrq(struct fc_seq *sp, struct fc_frame *fp) |
1720 | { | 1720 | { |
1721 | struct fc_exch *ep; /* request or subject exchange */ | 1721 | struct fc_exch *ep = NULL; /* request or subject exchange */ |
1722 | struct fc_els_rrq *rp; | 1722 | struct fc_els_rrq *rp; |
1723 | u32 sid; | 1723 | u32 sid; |
1724 | u16 xid; | 1724 | u16 xid; |
@@ -1768,15 +1768,16 @@ static void fc_exch_els_rrq(struct fc_seq *sp, struct fc_frame *fp) | |||
1768 | * Send LS_ACC. | 1768 | * Send LS_ACC. |
1769 | */ | 1769 | */ |
1770 | fc_seq_ls_acc(sp); | 1770 | fc_seq_ls_acc(sp); |
1771 | fc_frame_free(fp); | 1771 | goto out; |
1772 | return; | ||
1773 | 1772 | ||
1774 | unlock_reject: | 1773 | unlock_reject: |
1775 | spin_unlock_bh(&ep->ex_lock); | 1774 | spin_unlock_bh(&ep->ex_lock); |
1776 | fc_exch_release(ep); /* drop hold from fc_exch_find */ | ||
1777 | reject: | 1775 | reject: |
1778 | fc_seq_ls_rjt(sp, ELS_RJT_LOGIC, explan); | 1776 | fc_seq_ls_rjt(sp, ELS_RJT_LOGIC, explan); |
1777 | out: | ||
1779 | fc_frame_free(fp); | 1778 | fc_frame_free(fp); |
1779 | if (ep) | ||
1780 | fc_exch_release(ep); /* drop hold from fc_exch_find */ | ||
1780 | } | 1781 | } |
1781 | 1782 | ||
1782 | struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *lport, | 1783 | struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *lport, |