From patchwork Tue Mar 20 05:58:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10296443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79723600F6 for ; Tue, 20 Mar 2018 05:59:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 689EB28AA5 for ; Tue, 20 Mar 2018 05:59:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D41A29516; Tue, 20 Mar 2018 05:59:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF0262951F for ; Tue, 20 Mar 2018 05:59:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751753AbeCTF7M (ORCPT ); Tue, 20 Mar 2018 01:59:12 -0400 Received: from mail-by2nam01on0067.outbound.protection.outlook.com ([104.47.34.67]:2657 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751687AbeCTF64 (ORCPT ); Tue, 20 Mar 2018 01:58:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=0AIPZef9ZOVeQkk0XeQaHbwZS5nOC/g5bq3MIQZfhdg=; b=crydmG5n//txdYhm5BHyupPyVmWsSXVef2ym+WpW5qW/fm9KfWKVZYHwN7jOcaNPHrQlbgAA9ECmRZAis94lgYCO/GIE2s+Da1SngngyBbdBbF86qid3kZRNxdLXItZHoatloceeDyEd4xCaSWkFfIMaAKPHHAJxwxVf4jgU5RI= Received: from SN1PR0701CA0032.namprd07.prod.outlook.com (2a01:111:e400:5173::42) by BN7PR07MB4211.namprd07.prod.outlook.com (2603:10b6:406:b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.567.14; Tue, 20 Mar 2018 05:58:53 +0000 Received: from BL2FFO11FD025.protection.gbl (2a01:111:f400:7c09::114) by SN1PR0701CA0032.outlook.office365.com (2a01:111:e400:5173::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.588.14 via Frontend Transport; Tue, 20 Mar 2018 05:58:53 +0000 Authentication-Results: spf=fail (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: Fail (protection.outlook.com: domain of cavium.com does not designate 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD025.mail.protection.outlook.com (10.173.161.104) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.527.18 via Frontend Transport; Tue, 20 Mar 2018 05:58:52 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Mon, 19 Mar 2018 22:58:39 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id w2K5wdwb005313; Mon, 19 Mar 2018 22:58:39 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w2K5wdjx005312; Mon, 19 Mar 2018 22:58:39 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v3 08/13] qla2xxx: Remove nvme_done_list Date: Mon, 19 Mar 2018 22:58:32 -0700 Message-ID: <20180320055837.5246-9-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180320055837.5246-1-himanshu.madhani@cavium.com> References: <20180320055837.5246-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39380400002)(376002)(396003)(346002)(39850400004)(2980300002)(1109001)(1110001)(339900001)(199004)(189003)(51416003)(72206003)(81156014)(16586007)(76176011)(336012)(186003)(8936002)(26005)(8676002)(2906002)(50226002)(81166006)(305945005)(106466001)(356003)(59450400001)(85426001)(478600001)(87636003)(86362001)(575784001)(5660300001)(36756003)(4326008)(105606002)(50466002)(48376002)(69596002)(54906003)(80596001)(47776003)(6666003)(2950100002)(1076002)(110136005)(42186006)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR07MB4211; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD025; 1:fwC9n5ArdDzBOSrOXG4HmGlF64lamw1kLbKcwSMBDcNkMTMoRc/R4Qfa0RNxDFBNIMtjUSQ86tLEX7eBsqef6Upz+1ZGTut83Aa8tZ5OLboNQWp2oZtdDIj94Jxo9LC7 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 500a8034-b4fb-4633-2b15-08d58e27a8f2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:BN7PR07MB4211; X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4211; 3:aVvajl661x9JXXjZt1AO387hL8gWAepgSDnqQG/RfE4LL9WjmkTo7R+acVvYRZBDObQj6rWgq9LLS/eLg/E+CDXCgnX9gKK33vSDROloOgzDx3S7KjNfrGa1V7c+g8K2t2lw/a+cNlH8hwcivyRrlqcwedBQsuIGIYTq6bz+RphNtBd8lUT2+3ponpgILli3Ttack86YnyTLuVY071hoxsKt/C52jgGBFQKjFtCByc0tOZ0HN1FMncOF7CoDjVMJcY9Ca6br/4dYK6/hzeCkwfxSarVZaQZO/ZH29LENVtz3MS721EB1IJumSQnWXpkZdKhMO4ac5uAdPeM/iodaqCM7cscC2I5gSZUhdzq9sgI=; 25:q7KrvNMzYrQ/ltFY8qk9lpE6BHOhJ1iRcxnnyuHAQ89nMXrKTkWk+RGRyeHsjLo9Buz9cB4lKHlFSecdrnIFIbgBzjPejw/y7fnqpGi5JVt7tD/Kn9sm7Q9uy04dGfd5FYoliI16cS1go7cQIrUI909fdRv1eKGBQ8nTIip8/MpNm5qX0zWxgsMTKmUzZJviQNzah+XjfeIiCiN6Rc1Gu8w2c7/+FwKmxkVcdMhV6Wc6zyEH/gM6t0Omivsdjn9t9oNoSUDNY09ZY8Yth6O7R6utz/8ETczYGkEzagU0LIvEo+eYQtiw4NP7dRtCZVLGbLAlNi9Qq6urqDMAdqC1kw== X-MS-TrafficTypeDiagnostic: BN7PR07MB4211: X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4211; 31:I5fwEe7j2ZVGEnrL3AFTVRuotGxP/nDv2ozT1jp2Oy7n0hao5w4FYTwx7oZLkA5TdfG7bTqcy/E95gFvsmgMKrvd/FbsciOAA/sjTWY4WKhkiNIohWeMAAjxZq4mIlkSM4/LHDV1yx44BOqJJIMVbf6Ekaz3pqCCm+kuT/08+gpeX8dxGo46J6oDeL7oCLQ9obn+Ql34mNK/B6svOdQeZvlfzcM1002C3lVo8ZdS2CQ=; 20:9E94MTrUvCQwWV1BeSqrVmAiGFVKmVE1V+shSVPXGquhjpNvNYEbX7d0WnWLtZRRge3A2YqRWwXfxhGR2hauPODWzgmBDD26hgyPWTkoM669UcJfHrA6B0ZrSCa6GuO/CdtKLCUhqh3RKBY+neXsx2FyMCY8rWrF9Lu245+Mq41hnTsk0SxLBk2r9ta5zCb8O98/BzJblIYhJNXlnU2MVGDXCBMGQ3IumWa7V92W0OGLLjp5K9bjY0vRTDefMNgWzSqCcFOSAW/mAcX+phYiItghFxJyS7Vwvnhr/Zrr9u59p8AZx3pra5QLW+AOUqEgm6Xtj3pk1dvk1Pi8gxen00pfyognAOMPJ8B7Yl8eqq3WX1XqXZUha3hr0LmD6KLJ+7evmZ+w90WXNvtvCNw5hYhsq1a0lAkPXfiQ5wk0oMx04OuwMcqNOEBJ0KJcXQZRyiI+8TfhCo8LvnsiPeG/cYj5/dxahaOYJwnGIiR/Hx1yskn+DinYxY83rW1IgdUj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231221)(944501307)(52105095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:BN7PR07MB4211; BCL:0; PCL:0; RULEID:; SRVR:BN7PR07MB4211; X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4211; 4:izgxZllE6oI0MsfBl1SC4Scz0aI6589ZfCK/zm43U8H1A5cRNCne1dhwhKug2F0/wGYIL7FSAVFCFL7jZ6wN+SmWwsqLNHE8gdwwkiMmP3rJTavMkE2GAnZp+ujkr6omJX1UCSXKJ6eJZp+Hz3TP647HvMM/iWII9K1zVjVjDgxWdyzLZJwG8ln9h+d+wT6tUFf+nsgBY5D5cl8VylKUJZ0oKT/tvycCxJIMEiFp0vUgXjgUnOS/YMZbd17Ykhr+sKlzQf9dXM9COU+p6uC9Mw== X-Forefront-PRVS: 061725F016 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN7PR07MB4211; 23:foVayWfhOPVYGTk8vspPmSscqWUuEJJTAVpEzKF45?= =?us-ascii?Q?z/eUaGNSMQjn0P+cOHL6a2I3HQp+Kr6aTywT2SCTxznkWCIhm18XWtpNAyeP?= =?us-ascii?Q?6gE3A4DEw9VdgdqqwyzMXg/fqc2bp2CqtOfs5k8+kpnFGj6O85bzvIu+xg+U?= =?us-ascii?Q?Gm3UBkPJLWQ87nfGMq10hbIRiq30nPK2iCy3KXXFHAG/Dqge51KMCAe/9aYT?= =?us-ascii?Q?VzpVoq7Q9s4KVp5BVsR2OjcLPnJPLn5NHkP71PA80FBkjc8Nvx9zjSr2lEkz?= =?us-ascii?Q?aVMn4e1L7BYNzsPGdj3Z8QUy2Ix2MPSotxtRz1q3wLypEMTK/UfqyqjawbC2?= =?us-ascii?Q?ydqDR/Bj6hhhXMlJ+P1P1Gy3Umi8aRFkXF8Lagn7kerP9ga1Q9VAHrZ7SUyn?= =?us-ascii?Q?+oZVKHIz8+d1+yM4We2YLZABEG5E4qmttOhwCDUws//FOfUgq4M1K99ZKl5t?= =?us-ascii?Q?EW3nUw/mRonObMxoJ1goshxBRFHbYipadjeYZjXzbiryCkkztf5v/hd33Nzt?= =?us-ascii?Q?+8EaVThTG9Ll0Kjj8DJLrZ4XvjX827Hcz/yAupK+t7rj3S4H8sdYfJ+7jRZv?= =?us-ascii?Q?RIpN47zPKKdzPTwypOyTtulyB5cRERamGiY/wTWLTdHsDlFgo8Qxq5ioWz8H?= =?us-ascii?Q?TJth5iiN1pwzhTCdADpLjLPuddune99peCAmqn1Kua2ZKFxEuDthgI8kSXbj?= =?us-ascii?Q?8soMSgfD7fzusBYsDoWVgDEKdsNpf22TUzjMOsE8f/ZZ5YyPtg02DYtvbpsN?= =?us-ascii?Q?DSXw56lTR67P5WalXF0BEigNCGSkqwdzGaXiw7utCsdUiTuX4ZwTJE1j0NfZ?= =?us-ascii?Q?c5BLDbX1lI1+4brf1rN9mUlUCGZkbZRsHSNKipSrSB1mX2RhS1xnT8Dwxjp3?= =?us-ascii?Q?OnF2P9nRLg+HsTySIPoFbOSKrRKM2W8kcfz11pQgZqXZLbPxPglasUVNZ5bf?= =?us-ascii?Q?BdGg5IRZtmyhpgFX/9m/V26Kzu53p4yGYJ6omxUJXvbo3ZKlaGdMqTWkIIdC?= =?us-ascii?Q?8hgkSb978jeBp0kNd9NfIjF9RihQWO2IWnuOr9Fo1+EtMawFDzbWpdQEBGKZ?= =?us-ascii?Q?HOq/pyYEBKWnji2vSkhPs5SibRyzHeaFIknIac7tjR4e5D2S1wOftDebRFUp?= =?us-ascii?Q?w0nCoCaLg7pdU2jC4ifxbIS0lp/Ephr?= X-Microsoft-Antispam-Message-Info: DKRchTroTtdbPYSauEKBZe5Mqji+7HI9tuqf67lp9hQNNrC/EgnUxGaw3GX/Ms9CBsDMglMewLdbU5SgtDQKAN8qz4S+PDxu2YEPy80BreoJdGin4ehuN+XoM4r5/rerPmbcsDlWP5vLo2JrxbuwJl0M9CAlEk1wP+xalfpuULYAPDS9WhjQXrK3Kbk1iLyn X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4211; 6:nFBd4Cf7zAbJNeqQ9jebnfsUDKIo5NU4zFQKufHeRxVmAmQESpLgbfd63MbLJTfHtcumqHE8xKx5TUZJ0pAUxg2WEhJQJflXs4HVeuFHXXpBlHuj782lQb33bs6j7dIOGs/ahoe37YD4R89c7CAIHUucrZrG3TazGIgbRk0rpjAwPPE8huCuOA3gCopxXZgYv8d64JQiH1wxlElL252Yv+WZ+pJO+xmNoyy0t+rIpecFYagm/aa1qBimeBXLV5dLbCEkUpBXZbiNSJrcooi2JDa+boYoWMtXfkXxM9gLPMUSmFlXTon61vK4hvVi73j9DcRzAEjpXzHp/ypwiPrIsIU7AsNrDSVcvUC1Cs0vkAs=; 5://e3EIybF85HYhiecsD1w/9TT4oiSPjD2Tc8VayOtM4atAGCUp0TxazwTN8t9VUE9e5FuNxu8JMGAUvSfoxvn4RalIlUoYEUUyvADUqllB9V3H4XO88THcQ/ZTqAoaYy2JBOE5FHow0Imx6lTiCzycffSQBCD0kHt7kyuqYtV0Y=; 24:QQ9lxENs6yXSRlB9yS18iMl9Gcc/d4qD+IzO5t936bzGc8efZSmdew4hAL3szxcA8kAr+ebHRmslK7iFuQDy6bTe5zFrPRJ11ZWNVxFeRzQ=; 7:Fd6LQdPQtitu34suMngPSdlbCQzU9hpBjjVGfhW8Bt7VsFksqiSUwD7ksn4KHK9zJLxu3P+5C05sllgDbDpUoT6lnrPnhyIMJ+7fgEDgROb0p2uVXxIqwZx7qUk2fndi+sqBO0mAE/SNfRUTSisf1eciwEX4rySy5xP1ng+bR76sI0HSx+/6t0b4RD7HZWcW1gMXfBsw7BzyQSOMkt3kXt1sVJzy+ou3LrF/GMtEAzGgHTWG2x6eb5U476XInT7q SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2018 05:58:52.8516 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 500a8034-b4fb-4633-2b15-08d58e27a8f2 X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR07MB4211 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darren Trapp Signed-off-by: Darren Trapp Signed-off-by: Himanshu Madhani Reviewed-by: Johannes Thumshirn --- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_gbl.h | 2 -- drivers/scsi/qla2xxx/qla_init.c | 1 - drivers/scsi/qla2xxx/qla_mid.c | 6 ------ drivers/scsi/qla2xxx/qla_nvme.c | 13 ++----------- drivers/scsi/qla2xxx/qla_os.c | 1 - 6 files changed, 2 insertions(+), 22 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 59c449b141cd..6aae126add0c 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -3464,7 +3464,6 @@ struct qla_qpair { struct work_struct q_work; struct list_head qp_list_elem; /* vha->qp_list */ struct list_head hints_list; - struct list_head nvme_done_list; uint16_t cpuid; struct qla_tgt_counters tgt_counters; }; diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index e9295398050c..19f44e12926b 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -896,6 +896,4 @@ void qlt_update_host_map(struct scsi_qla_host *, port_id_t); void qlt_remove_target_resources(struct qla_hw_data *); void qlt_clr_qp_table(struct scsi_qla_host *vha); -void qla_nvme_cmpl_io(struct srb_iocb *); - #endif /* _QLA_GBL_H */ diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 7f8bfa0454d2..33823d74c782 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -8405,7 +8405,6 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, qpair->vp_idx = vp_idx; qpair->fw_started = ha->flags.fw_started; INIT_LIST_HEAD(&qpair->hints_list); - INIT_LIST_HEAD(&qpair->nvme_done_list); qpair->chip_reset = ha->base_qpair->chip_reset; qpair->enable_class_2 = ha->base_qpair->enable_class_2; qpair->enable_explicit_conf = diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c index e965b16f21e3..da85cd89639f 100644 --- a/drivers/scsi/qla2xxx/qla_mid.c +++ b/drivers/scsi/qla2xxx/qla_mid.c @@ -778,18 +778,12 @@ static void qla_do_work(struct work_struct *work) struct qla_qpair *qpair = container_of(work, struct qla_qpair, q_work); struct scsi_qla_host *vha; struct qla_hw_data *ha = qpair->hw; - struct srb_iocb *nvme, *nxt_nvme; spin_lock_irqsave(&qpair->qp_lock, flags); vha = pci_get_drvdata(ha->pdev); qla24xx_process_response_queue(vha, qpair->rsp); spin_unlock_irqrestore(&qpair->qp_lock, flags); - list_for_each_entry_safe(nvme, nxt_nvme, &qpair->nvme_done_list, - u.nvme.entry) { - list_del_init(&nvme->u.nvme.entry); - qla_nvme_cmpl_io(nvme); - } } /* create response queue */ diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c index adeda6a4e4fd..8c05df30c083 100644 --- a/drivers/scsi/qla2xxx/qla_nvme.c +++ b/drivers/scsi/qla2xxx/qla_nvme.c @@ -149,16 +149,6 @@ static void qla_nvme_sp_ls_done(void *ptr, int res) qla2x00_rel_sp(sp); } -void qla_nvme_cmpl_io(struct srb_iocb *nvme) -{ - srb_t *sp; - struct nvmefc_fcp_req *fd = nvme->u.nvme.desc; - - sp = container_of(nvme, srb_t, u.iocb_cmd); - fd->done(fd); - qla2xxx_rel_qpair_sp(sp->qpair, sp); -} - static void qla_nvme_sp_done(void *ptr, int res) { srb_t *sp = ptr; @@ -177,7 +167,8 @@ static void qla_nvme_sp_done(void *ptr, int res) fd->status = NVME_SC_INTERNAL; fd->rcv_rsplen = nvme->u.nvme.rsp_pyld_len; - list_add_tail(&nvme->u.nvme.entry, &sp->qpair->nvme_done_list); + fd->done(fd); + qla2xxx_rel_qpair_sp(sp->qpair, sp); return; } diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 12ee6e02d146..bd37a243c0bd 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -397,7 +397,6 @@ static void qla_init_base_qpair(struct scsi_qla_host *vha, struct req_que *req, ha->base_qpair->use_shadow_reg = IS_SHADOW_REG_CAPABLE(ha) ? 1 : 0; ha->base_qpair->msix = &ha->msix_entries[QLA_MSIX_RSP_Q]; INIT_LIST_HEAD(&ha->base_qpair->hints_list); - INIT_LIST_HEAD(&ha->base_qpair->nvme_done_list); ha->base_qpair->enable_class_2 = ql2xenableclass2; /* init qpair to this cpu. Will adjust at run time. */ qla_cpu_update(rsp->qpair, raw_smp_processor_id());