From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15347C33C8C for ; Tue, 19 Nov 2019 05:59:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF0C32084D for ; Tue, 19 Nov 2019 05:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574143151; bh=j0vVPIXMypYqTEMvMdKlvJ6+YOCotT63Oz/wwCbmGG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CB0QetTq1HuhR4JW83PssZll7OhNhKmuWSKqEQ9WoVuixH069bTTaDF1OG8BHwfl0 SXNFX5C6vGVYC+0IPMrDZ4jxblvK1q1KOYjDa2YV27ab/gISh4MDN6XQTkOL5ZvyMH 2oWhljZrkk73Ak7q7UkMESwC0rINjEGVY39x5DQE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731013AbfKSFsD (ORCPT ); Tue, 19 Nov 2019 00:48:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:44520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731305AbfKSFsC (ORCPT ); Tue, 19 Nov 2019 00:48:02 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3EB07222ED; Tue, 19 Nov 2019 05:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142481; bh=j0vVPIXMypYqTEMvMdKlvJ6+YOCotT63Oz/wwCbmGG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QyfcEFVRdjHrZH5mIF6pVPLxG3a0jXduyNjU5RJnx/Ttb+Wrg2S7AmvCNGMf2wCB4 K0s/RdtwhHfGK2ZXpZhyLHGo2PQagm34OMNgm1hA2FU3FPyR24/B2SYH4NXX8obShg Npy0l1R166ZTxX4bOBywhfxY7eWp3rybk2P0TI7E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Quinn Tran , Himanshu Madhani , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.14 097/239] scsi: qla2xxx: Fix dropped srb resource. Date: Tue, 19 Nov 2019 06:18:17 +0100 Message-Id: <20191119051323.293701082@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Quinn Tran [ Upstream commit 527b8ae3948bb59c13ebaa7d657ced56ea25ab05 ] When FW rejects a command due to "entry_status" error (malform IOCB), the srb resource needs to be returned back for cleanup. The filter to catch this is in the wrong location. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_isr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index df94ef816826b..6a76d72175154 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -2792,6 +2792,7 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt) case ELS_IOCB_TYPE: case ABORT_IOCB_TYPE: case MBX_IOCB_TYPE: + default: sp = qla2x00_get_sp_from_handle(vha, func, req, pkt); if (sp) { sp->done(sp, res); @@ -2802,7 +2803,6 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt) case ABTS_RESP_24XX: case CTIO_TYPE7: case CTIO_CRC2: - default: return 1; } fatal: -- 2.20.1