linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Saurav Kashyap <saurav.kashyap@qlogic.com>
To: jbottomley@parallels.com
Cc: giridhar.malavali@qlogic.com, saurav.kashyap@qlogic.com,
	andrew.vasquez@qlogic.com, linux-scsi@vger.kernel.org
Subject: [PATCH 02/16] qla2xxx: Set the index in outstanding command array to NULL when cmd is aborted when the request timeout.
Date: Tue, 25 Jun 2013 11:27:17 -0400	[thread overview]
Message-ID: <1372174051-4211-3-git-send-email-saurav.kashyap@qlogic.com> (raw)
In-Reply-To: <1372174051-4211-1-git-send-email-saurav.kashyap@qlogic.com>

From: Giridhar Malavali <giridhar.malavali@qlogic.com>

Call the generic BSG free routine to unmap the DMA buffers.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
---
 drivers/scsi/qla2xxx/qla_bsg.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 39719f8..5ba0cc1 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -2153,6 +2153,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
 					(sp->type == SRB_ELS_CMD_HST) ||
 					(sp->type == SRB_FXIOCB_BCMD))
 					&& (sp->u.bsg_job == bsg_job)) {
+					req->outstanding_cmds[cnt] = NULL;
 					spin_unlock_irqrestore(&ha->hardware_lock, flags);
 					if (ha->isp_ops->abort_command(sp)) {
 						ql_log(ql_log_warn, vha, 0x7089,
@@ -2180,8 +2181,6 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
 
 done:
 	spin_unlock_irqrestore(&ha->hardware_lock, flags);
-	if (bsg_job->request->msgcode == FC_BSG_HST_CT)
-		kfree(sp->fcport);
-	qla2x00_rel_sp(vha, sp);
+	sp->free(vha, sp);
 	return 0;
 }
-- 
1.7.7



  parent reply	other threads:[~2013-06-25 15:53 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-25 15:27 [PATCH 00/16] qla2xxx: Patches for scsi "misc" branch Saurav Kashyap
2013-06-25 15:27 ` [PATCH 01/16] qla2xxx: Clear the MBX_INTR_WAIT flag when the mailbox time-out happens Saurav Kashyap
2013-06-25 15:27 ` Saurav Kashyap [this message]
2013-06-25 15:27 ` [PATCH 03/16] qla2xxx: Move qla2x00_free_device to the correct location Saurav Kashyap
2013-06-25 15:27 ` [PATCH 04/16] qla2xxx: Do not query FC statistics during chip reset Saurav Kashyap
2013-06-25 15:27 ` [PATCH 05/16] qla2xxx: Do not take a second firmware dump when intentionally generating one Saurav Kashyap
2013-06-25 15:27 ` [PATCH 06/16] qla2xxx: Fix sparse warning from qla_mr.c and qla_iocb.c Saurav Kashyap
2013-06-25 15:27 ` [PATCH 07/16] qla2xxx: Clean up qla24xx_iidma() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 08/16] qla2xxx: Clean up qla84xx_mgmt_cmd() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 09/16] qla2xxx: Remove dead code in qla2x00_configure_hba() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 10/16] qla2xxx: Remove two superfluous tests Saurav Kashyap
2013-06-25 15:27 ` [PATCH 11/16] qla2xxx: Remove a dead assignment in qla24xx_build_scsi_crc_2_iocbs() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 12/16] qla2xxx: Remove redundant assignments Saurav Kashyap
2013-06-25 15:27 ` [PATCH 13/16] qla2xxx: Help Coverity with analyzing ct_sns_pkt initialization Saurav Kashyap
2013-06-25 15:27 ` [PATCH 14/16] qla2xxx: Fix qla2xxx_check_risc_status() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 15/16] qla2xxx: Remove an unused variable from qla2x00_remove_one() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 16/16] qla2xxx: Fix a memory leak in an error path of qla2x00_process_els() Saurav Kashyap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1372174051-4211-3-git-send-email-saurav.kashyap@qlogic.com \
    --to=saurav.kashyap@qlogic.com \
    --cc=andrew.vasquez@qlogic.com \
    --cc=giridhar.malavali@qlogic.com \
    --cc=jbottomley@parallels.com \
    --cc=linux-scsi@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).