From patchwork Mon Mar 12 18:16:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10276955 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 6CC82602BD for ; Mon, 12 Mar 2018 18:17:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55B8828E53 for ; Mon, 12 Mar 2018 18:17:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 473E028E72; Mon, 12 Mar 2018 18:17:24 +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 95B4F28E53 for ; Mon, 12 Mar 2018 18:17:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932745AbeCLSRW (ORCPT ); Mon, 12 Mar 2018 14:17:22 -0400 Received: from mail-by2nam01on0081.outbound.protection.outlook.com ([104.47.34.81]:54144 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932793AbeCLSRQ (ORCPT ); Mon, 12 Mar 2018 14:17:16 -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=e+2SX1MGnVWcQO0bFEobLjbg7allZ2jSeokP6HmPyFs=; b=Ik1Txf7hAhTWu4Vxh40j8/knzDvgRNFMbz0Ja6azqUmhjn3LuwPm6gt0BX6od0tfwEJAYSzRCHodEFtpfIWtTzguZg6MGf5k64anH1/oKhEPBFWOhs8ULMouYGAxhh6n/cMUL2KNDU5Tgt3vyGh52t+btXNKvAjYPiA6x8q6pJw= Received: from DM5PR07CA0035.namprd07.prod.outlook.com (2603:10b6:3:16::21) by SN6PR07MB4301.namprd07.prod.outlook.com (2603:10b6:805:55::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Mon, 12 Mar 2018 18:17:14 +0000 Received: from BL2FFO11OLC007.protection.gbl (2a01:111:f400:7c09::158) by DM5PR07CA0035.outlook.office365.com (2603:10b6:3:16::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.567.14 via Frontend Transport; Mon, 12 Mar 2018 18:17:14 +0000 Authentication-Results: spf=fail (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; HansenPartnership.com; dkim=none (message not signed) header.d=none;HansenPartnership.com; 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 BL2FFO11OLC007.mail.protection.outlook.com (10.173.160.142) 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; Mon, 12 Mar 2018 18:17:13 +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, 12 Mar 2018 11:16:52 -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 w2CIGruZ020771; Mon, 12 Mar 2018 11:16:53 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w2CIGrxx020770; Mon, 12 Mar 2018 11:16:53 -0700 From: Himanshu Madhani To: , , , , CC: , Subject: [PATCH 08/13] qla2xxx: Remove nvme_done_list Date: Mon, 12 Mar 2018 11:16:45 -0700 Message-ID: <20180312181650.20704-9-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180312181650.20704-1-himanshu.madhani@cavium.com> References: <20180312181650.20704-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)(39860400002)(396003)(376002)(346002)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(105606002)(356003)(47776003)(305945005)(1076002)(26005)(186003)(42186006)(16586007)(316002)(110136005)(54906003)(2906002)(69596002)(6666003)(2950100002)(80596001)(59450400001)(36756003)(76176011)(51416003)(81156014)(48376002)(85426001)(478600001)(86362001)(87636003)(336012)(2201001)(72206003)(50226002)(8936002)(8676002)(5660300001)(81166006)(50466002)(4326008)(106466001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR07MB4301; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC007; 1:ff0Curqtf1RhfSAOQOo3wpveZy2eLXZMdidol+arXonFHjcxLBMUrP0B1hTBwROfZNqD+HJm2alpTKPEUfV3MiuZtifOdRqJYdYIVU+xpc5k53BwC+WkTFpw97bXWD13 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed06fc40-3d64-4fc9-adba-08d588457af1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:SN6PR07MB4301; X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4301; 3:99IDJMUqHDA34yk24bNcO4cednxFUcsmdNItdggUKJKZfKJhMvOC5rgD906XhzU6Chq3//nPl0V76yFS+gDqwvJObdlgXmaypFVpckXaCJT10SkXJkJpvjiXc4H/z8e6F3xFD3cD3JLKDdtyFlUSrFb1LJe92jN+58rbcRI+OvVNApIF2o7K33RwAjGLzMH3E1Zhkxns3jCFIsAusSVAHoueaZkRfjLMoRrGaEi0bSe2Uomvs3a4jK8uyn8o0XVkkoPYA6mJl8v6EZ/r52p40RkSLzSulZnZD7G2I6VACvZHa32YdA2JHaR21B8aYaBkeqLaD5yO2gnklcNe4TXQRptlnY6PJzenkma+H3+qyZ0=; 25:FEY/xPtI24TEfKN22LPJUDiHlDZJagGLKzhuZRIq5iQSVDW/O2dBngaZkBkEaz7pAPuQEkMSe6B78xhsUS+tQYNFT7grT8IBuJd+ddfHuAsHzGObSqu3CNaiw/sXjHkcaWysawiOJsRPtNr0HOFj+GWi6YyEBPD+hT/hbGOUvHZFI8N43LXFl+Qvrm46b3omi31PvJxiFoU9N2D12CdBNctFqyYf+tBOSBwSIXRCjwpjgCEBXxlWXBVvq+WcESDfn1vskNCivU05Yt84j9H9ptfUw5nhp8t9cdE01u4t9s0K81NlOemQRbmOL/r0n5ckQzq3kXvvb337l8f+ibbCAA== X-MS-TrafficTypeDiagnostic: SN6PR07MB4301: X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4301; 31:1mUAS+/DlKUwZCXYs242fWz4kUUSeLKbKkTlbuj/99h7uutnzrJgBEVg2Oq/BCrkYqALL2sphrc0tHkUE4iD/zC/z+EE4/JegZmZJzdvZt2Nkf9GZjG8Pxi+v6Y+3K5ReDceQjN1R5X5gDdK2XfQvXG1V47FC9TC4UZ69EN8avbjL2f1KOB4SkmHrA3tyemL+k7FM59a3JkpF1viVCeARZBrPkFLWHvf+fZgbvgVVXg=; 20:qSCPC5NRD5ECrQk8l/0/hPgBMCJEK+eAR5ARBytRzNjsMXJvW8edA9RCZmynV4wN1JkPnpig3+kbs8lvik22ICl0bcTUr3WSUbFu7TnJ8CTTqJiyQBx94rA2f27igR1m6fNejF7vfZoaI3Uu9jrGUPW/SqpxKPPhZmhlqE8W1JQ/Q6iducnO7GcUB5H+oxPREGg7Sr8sztqe4dlq0csBsGBeI6HZYGZaFtXARMhuZkj3XPZo6T53KW76eIiUSW6d3upbgnSg/b/LDuKgfpH/Tz6Q702ByAbxaZkaDH6Fe237FNUO8Q4rbzNsoeUiRQN2VxbhaIqO9x7PXBGJHxQ3w38wHa7xBXWDCndsVJXj8/OGf7ywhZCbQjyTu40HspVmTEHHIgrsb4Ks2Uuk016ikGAVANIElPNhaneHZ8ic2DpmLlJR5r0+LyDr5h7hk/443rPZWEaUz0NqQbZ7ctC/8Oh69ticQuwGmLV179cGDkVgWThJeJwqzNT1pclDcHI8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501244)(52105095)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:SN6PR07MB4301; BCL:0; PCL:0; RULEID:; SRVR:SN6PR07MB4301; X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4301; 4:CLVLPBrKw1dv0t5fKGZM+kaCDuy+Swje2HIrywHLxaOF7iALEWxyeRY4gEG1zAMg63he/YiFRRaX9e3YnH/Wc4uhPmgz3dZwVz5XNNSMRAzflxMt6yx7Z5moa+qnmHaDB3RNbBY/Y8suCdpxEydIiTcDMCpeJTCBCRF5tDlfeDLTF9w077guw0PhCo2+bMPhurd7Wq06NLYsGzXglJIhvxchEgHvzqBrn9PvAYXusyJssuDudvd8A1oLhbhX76QeSAZdLnBGrk1jElb0gS0hDA== X-Forefront-PRVS: 06098A2863 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR07MB4301; 23:rJ5dWJI3dYOMsnxQ8EyLOd2u1GovLW62qGA88pYDo?= =?us-ascii?Q?ebPu26Irvt2hZooQx49uangPG3EbHrALR+3Oot/+AAkTNAMEp/oYyERUj0Iq?= =?us-ascii?Q?y+ugW4nwYmEsDo8CJUSv/Fz1KZG4Ve2cvFhg3cIiCHoFMyXJHplv5i4yLOfl?= =?us-ascii?Q?tzlavgJvUeGDNT7YmFjqocDyC4Dnhd3DiEFPyGmOnNXpkJY+k9qehXJ+3E3Y?= =?us-ascii?Q?R0YuIM1gf48L8rCTWpIkEPOxyfRkeqogx3swcsk9Sn+KdyPC/a1RUtLwNDb4?= =?us-ascii?Q?BO/BVOqaTBhca6HZvf9TBvuon/dWBziMx1c6799fTgZjjV86SxjAvuhMw2D7?= =?us-ascii?Q?VupnGQ2a+i+FqIYAsXpL4m/fMd2JKeDVqiUGUkapCNRdP8zbEGd3OnER4trx?= =?us-ascii?Q?zcaCEpOsTKQQzBLdu+PQO1hOCxIzx1gWOoY1qjBsZ7TfFTgFzoRL1EkuMNDr?= =?us-ascii?Q?6SwEwWsw3S1VHCuwj9+RIpgn/U6T+iyHc44ul2d50fGkjJ7rFwAzDQgVOtqe?= =?us-ascii?Q?UBM53LxRZaGTJLNJH+pldV4gU6muJOrmzFzLOuU0tyWZ74SIekcEosIPUjqW?= =?us-ascii?Q?21XD/Pxt9fTogoy9lvM2ibUHw+fMm/tkwyOzt+25QDBmtOpud3BLtJ0Ef6HF?= =?us-ascii?Q?RkhdDiq9N5Fh0Ytook8Btahyaz760I8sBfXEFz1yeytMfedcsp2QwAFcdOaL?= =?us-ascii?Q?6g8DJJNINrkjWPvA4pOt/raQHBENTR56MBWH5E+pQfTN3iYWREIe/LpuIm4e?= =?us-ascii?Q?uecLmixNIGT3T4JDUGz3L2aayHEXGO+YuyVn7gn6xRRSGDKU0xUCUXQ8EaBY?= =?us-ascii?Q?jDZwQNE4wQF9hwrekI3HrJX7aNZh9UQ5sIYaIE1zxDrQqyQQ2bN9bveAo44j?= =?us-ascii?Q?6eRc75/SsnhvQZTjvQSZ1gKGA4mB1YpnaGD7s5pJqEGOsjEUbDVdrPbrQtwg?= =?us-ascii?Q?kbSOi7O/3c3yeRx3anl2E8r/RMks1MEHrrDSyGmXy3wsl8MMvTLbdBrWcYLG?= =?us-ascii?Q?eCb5vB1X/UH6u8xafT/KolA5WK500K7DcUEB/8NG4jkl2DV16i+vF3B7hen3?= =?us-ascii?Q?GvMMOZYYiNDvGHnqfCH3FvaEW4+5IXwxZqnrQWqSNS5ixGrDYpgCVUhL4Lk0?= =?us-ascii?Q?1mdLw0bNUUqidAAE8tAxwZYyNV+t/a0?= X-Microsoft-Antispam-Message-Info: DPMirxXOv3i68YTS2ZpMw+ji98RqNWec/QS9i83lmauyM0km4/gX9sYFoSmvbQA5IbkFh7wdM/BnfLAORyyOXluB1Rp6vZPI6QcgHBMXvSbUAEKkk/fDii4Sf7c0kHAilDXFmuFnrbTF3pJmkGPAz4j21nDkkM6hyFJr9wAIKoUESkImE2KH40bRjnyYO53N X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4301; 6:2P++v5KN32omMCfkSBi3s6OYWyxBkKNXW1sS1cVtzFEOjTfHx/qu5eyPQXyWsrJ+NicOThN5ZVPkaBt9xvNdQReXxoBGumyCKTpXfB0IrlhyjLH4pB+zMMGt7sYzQCxx6yx4aFs0qiWZBdZfrzWyqdKvimxHxJBg0wZpBZfFTSzkwgihrjaCg3/g/O3cbRz39dAkvdD9EGwQTUNmCHQHR2x4acPClr6w/TPSNIXXq+zwut4Nc/VTbALydGlsWRQkndxsmSymh9z6LJhziBTTVPZvHyz0ilFUqrh918gkqzYd50n8Qxc74Z7c7fexlwHWZVt6OPqMbzgxLeMVt8AFIxoRGWjCdTudLZj3S6EoAfw=; 5:1rlrdPmRVaqx5w0oaNGXdVEIhhAB4J2P4lCgh+tO4srdAGhLfhw9pAOk5gNC5CpJk3BBdyahjB7RTOEGKI9f47Hq7vdyFGLluuMXVT7oqOGSnRHbdHupVBeXnXo9umN4MkefTZ5fOW6NwKbeD8D8juXz7kIdSmZ3v/kyMdxxKgY=; 24:Bluze1qjYNUmq/bCvwmDXXxilXdEs0AtRujcqodcAKHSYgIfsIWZlA3yeBtp+18AgyDeDEUjc+qkQLiZALCuDeRGyfN4jHU/Z0VqpK7MwgU=; 7:HYEE4gXkxkg6YZkeb4mcK8uvcuxyM2QMdTJm8C4N578XOHwSP5/gS+y+xb6U2dHseQ3eSTpDDtGkpZyvKF4ConZo9/j9CneWBYXeLln55MV7eZ1UckubBF/8ng1KL6kWGWUWkG2Zn1Zhab6J0kPoY3sVMzlU1YF0H4AjVJO8sl+JDW8gci9q/FdNt9cOb3n/U0dWXicgjaJa8e+jh17BVUpxBAy7wdNzGYUZ5w1o7OFuTH6R01GXZrn676HRZNrr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2018 18:17:13.5985 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed06fc40-3d64-4fc9-adba-08d588457af1 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: SN6PR07MB4301 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: Hannes Reinecke --- 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 944626cc84d9..576b72bef01d 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -3465,7 +3465,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 dec3e2cdaffa..0805483645d7 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -8408,7 +8408,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 5c5dcca4d1da..69b46c8b9dd2 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());