From patchwork Thu Dec 28 20:33:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10135907 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 C80AC60318 for ; Thu, 28 Dec 2017 20:35:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8A7A2B3EB for ; Thu, 28 Dec 2017 20:35:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB2442B88E; Thu, 28 Dec 2017 20:35:00 +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 047C42B3EB for ; Thu, 28 Dec 2017 20:35:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755355AbdL1Ue5 (ORCPT ); Thu, 28 Dec 2017 15:34:57 -0500 Received: from mail-dm3nam03on0087.outbound.protection.outlook.com ([104.47.41.87]:57775 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754134AbdL1Uei (ORCPT ); Thu, 28 Dec 2017 15:34:38 -0500 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=l/vK0HggWUGJOcznZ3kFNCrutfPK71RXjmDyahiI6bY=; b=G37/2qguP3bWrjgRkGYvlNqp5JCNeGwza3dmrXm5Dip+9pPCr91MGGaDg5LP3k2hrq7M2kvLgYv196r/E5i0q4YFIBWA9A7uB/2yumGIoZ3kO/LhCvlq3Shf1MlFhHrA+/iwWSgZhdz4lbehNldIVRhSpbC81CC0gciRN3sEKqs= Received: from BY2PR07CA0097.namprd07.prod.outlook.com (2a01:111:e400:7bff::50) by CY4PR0701MB3812.namprd07.prod.outlook.com (2603:10b6:910:94::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.345.14; Thu, 28 Dec 2017 20:34:36 +0000 Received: from BN1BFFO11FD044.protection.gbl (2a01:111:f400:7c10::1:156) by BY2PR07CA0097.outlook.office365.com (2a01:111:e400:7bff::50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.366.8 via Frontend Transport; Thu, 28 Dec 2017 20:34:36 +0000 Authentication-Results: spf=permerror (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: PermError (protection.outlook.com: domain of cavium.com used an invalid SPF mechanism) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BN1BFFO11FD044.mail.protection.outlook.com (10.58.144.107) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.345.12 via Frontend Transport; Thu, 28 Dec 2017 20:34:15 +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; Thu, 28 Dec 2017 12:33:52 -0800 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 vBSKXqh0002962; Thu, 28 Dec 2017 12:33:52 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id vBSKXqdU002961; Thu, 28 Dec 2017 12:33:52 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 34/37] qla2xxx: Remove unused argument from qlt_schedule_sess_for_deletion() Date: Thu, 28 Dec 2017 12:33:42 -0800 Message-ID: <20171228203345.2702-35-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20171228203345.2702-1-himanshu.madhani@cavium.com> References: <20171228203345.2702-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)(396003)(39860400002)(39380400002)(346002)(376002)(2980300002)(448002)(199004)(189003)(50226002)(59450400001)(356003)(1076002)(85326001)(2906002)(8676002)(81156014)(8936002)(81166006)(54906003)(86362001)(42186006)(51416003)(110136005)(16586007)(316002)(47776003)(50466002)(36756003)(48376002)(305945005)(69596002)(106466001)(5660300001)(72206003)(87636003)(2950100002)(76176011)(4326008)(6666003)(478600001)(80596001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR0701MB3812; H:CAEXCH02.caveonetworks.com; FPR:; SPF:PermError; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD044; 1:HvkysqU+lnBwe3qDb65GDzfH3ynGWpVybA2mDO3GHdwtbF7PTh3cZ7M4NIK98pAmiQjtZPakBqDvh0ldu6GeR1NuYfCnooTylMpnduU1tj+ABXjFhJBYYugB4vyDekIW X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 663aaa48-22a6-48fe-093d-08d54e325d08 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060); SRVR:CY4PR0701MB3812; X-Microsoft-Exchange-Diagnostics: 1; CY4PR0701MB3812; 3:nKKYFbTttYXn/aiUzAg6XKIL1b6UHf+PJixOentbYlW0oBEwsco+kX5lT4BIAXXOM1aWgr7zto+HmWhPa/q7mGK7oFsQWcDhtmpaQVEXLUCWTKl8XRFNAxlxAXO2dWLWjn7BUsa7fXg6ftqeaSkuVk1jxHz5IA9cVzqx0bdG9p4WKpem9XZvQpYf3LZM3FgAUwr/sDdwIAtBcEiFDARwOlPti/mGD/MKc4vuPB6lAM2J5ep8hmuG5C6Q/gHpghyk0bHUuz6TUX95Js0M35ydXFCld7GkJ8OSDfTFl3KIoGoZHyHV8l0SCHCcG6HAHjAyYmCzWeYTpYtzR27MghwtGA==; 25:Ok9i+Syt/N0YevhW5AWFEl+VAGcOFsc3Q7Stu/GufUMTErHoPuTMtIHjgCYqGfUD/b6m6BFY0Y+KFI1mcps/AH8pI02bGVtfMFIcYRrYR23Is30BVOzl1Lo0egSh1c+wKOqiiptfuZ9DTtkqXQ/fIpYvho3zZHQucyNOvPPLLPDUbbJ7BkOcdmYZtXO0omaKJmwpmf0nCerYCPaylx1nUoP6/3QLyR1S3frrtVKQGJsEY3oFrKSgDak7BC7xQg8vgxI5kanK5RAvSZjk67QkSmAmm3PamP0/+tDxeInQuUz73GOvn/dpwZKzMprppsMdkAPJWhLEhs/cGhis7a/jsw==; 31:5MwO2l6RJG2GF7HUo8OzGuz2YhZdzMXNDivS6WfjXF8Q8ephXsOygKxYhN0EJAWz9luGwq7sU2q/AY0xq+e8s7aLU29IXVXpDvGmeM1OC84B4H3FXikx9qxlMSSrFzm64EpMHGkMKbb4Kd2es9PfP0fI13teN1+HHXWrN6artGj77LfMjLPLeSUwa0p9dMoBsyPyB9/VnNuECU7u02lqr7qbTp1mxvYdN65tbjSyMTA= X-MS-TrafficTypeDiagnostic: CY4PR0701MB3812: X-Microsoft-Exchange-Diagnostics: 1; CY4PR0701MB3812; 20:uRyoRQ+JNeuRQlC50znm6Tac8nI5eXwL0P/mgKgd2hI9EaRQ/HmyB8fdpWF5+P7lBOyKGlQa02uJbkNfmzquYE+NwyioRUldOzPbSNEVcuWh49A7u7+Ob/ZTnG21ox5l8e7RJq3AXmU0V5FLOpo6KCW8/UBXrDoFlsUmJDPeBP6kZezWctWSbSCsidrhNgw9tNrlpEv9x84qoBB6OjI5L3gcvxjsx29juafxJ//6TWIUNivokaBif8h0br7ElnEpJfbopKEY6G+j0542LpfQHh/jSXWwHlyNiF5yFGfpUPHrC4VVRG80PYm2wfrRGo1Ptf6ioRMD3iiDxMlIqE5V+UvhHP0krny/9D8TzEFITxd6HK7l+M2tAq3LkGW3gO5ytIzXFtFhjfNwEd0DyTUeSBZ4i9J6JRvca89FgGCpfagj7MLz2dzgxFGKgLycivnEduTJJWHBOeS/2y6tzk5d8eNty3Tv5bczC0kgX5hNhsRfAyODQSJKdL2KIwYoK4BE; 4:vsRZC4GvbAgUpBbPbiGvsEa3Xdh/x6pPqiB+hvDOrZINnw+OrK+Ic9xYcKvIGmlQXB442nUhLeg2tPomop5VDVV6VXRstfjjhj8QcqnN9kM+0cm3Fr9ZSlnFHc34yAAVdcuSCUc1AorkCMakYzUsJvHhXo42wzJpXGkaAqPRlSB0jHHFbcZpz85T3JMfCNMkq4E3ZQNKp9KOTfzxd0eqktFKXmuTMqVRo0eswaWWqroWj+R474SIsj4jfKP9T9kbc1JxkOBi5gqYNuCsT1SScQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231023)(944501075)(10201501046)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:CY4PR0701MB3812; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY4PR0701MB3812; X-Forefront-PRVS: 05352A48BE X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR0701MB3812; 23:MEDz6+BqFDNIibWtmj1H60hgPwWabkizb3Jw4nP?= =?us-ascii?Q?vH5yR2O9thMcbvT4m571aCE/nkEMdALpuSK0VWMlnPuFp/zq80KUFmQ6PrqS?= =?us-ascii?Q?nn28wHrMlFmvdVkWx7Ywnfls+35y3EeYYfuOeeBWZUppsycYovvCcDzMrZQU?= =?us-ascii?Q?AYCa1qm4iFug5mgQ0u9nTPUh+IUVpgRxFAEiOXzIq/8S2kzv4sfK7owrtI7G?= =?us-ascii?Q?duXa1OLvuoY9pERnuMyBNaUkTPQ2TbiaUaoFvFjz2J7SFlGtAO17nNvSm1Eh?= =?us-ascii?Q?tozi1EPDBm2PPCGhlGwkm0X0+Ppd0yUVO1Hz15PGTgGc8pJSAJP9tK5x5IfI?= =?us-ascii?Q?lUcHkudUhzZqpkvBS3Z704okoDvssYBun2r36dfLJXBu9GUZg7vsNLA7bNeM?= =?us-ascii?Q?EOhMgnVpW5U7u0G2uan5yMt4WZ8J1WSaY9+GLy8kCAgdo99D7yr37m6uK7A4?= =?us-ascii?Q?BiTaeZWE2JqzSU17ibrZlwZDAvUhHAF+VERCb5rTeOJTykZdw5kJn0VAeg8S?= =?us-ascii?Q?hW2LgXE3cnXnB/vFV+nGtikGZktemrBtvFEM6nwZ7sULMLW6TjWmYEtVBOje?= =?us-ascii?Q?89CiskAvZtaAAz0CiQ7rfHjpwoYka0kQ1o9CgYs0/vFs7d4/CAIy0RkUOboz?= =?us-ascii?Q?c1VHPXPqr9eGqkpt8AI1jtAvAijJCmf13PDCHdp2OOWHw2ACLmR1OzxUUkPY?= =?us-ascii?Q?JD3KSRqzqX2gtgACsz5C4WpDMl4CfzppxnyCTWSTNOnvkkjY2qyKF0gUnaMm?= =?us-ascii?Q?9geYmW77ejen97QfCFlfLzpOWe3nmceKF47b51GGfL4WDORi2QSbRmQCKB6a?= =?us-ascii?Q?7s/39yW/fpuO+GdLP0nleZ+dRtkYlG5j3tqoBRWZ++2U6QwEcAq1BIYGhXcw?= =?us-ascii?Q?LpxSE2rXPgQ3N1+9GOzGMFdxcC7QaQOZykSXGNeB/xKa8fx+0TXnngTPI3mX?= =?us-ascii?Q?jAtTEBYqqYfP8PD5lCLks3Ni6nHP3am2vyXjm2ql6eCXtYX5ZKX9J615Ff12?= =?us-ascii?Q?+RzQrrqQwSEsXkt3k25F1PzAt?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR0701MB3812; 6:8OCcMdaLhdcxaaL0h0zZfgfnh1NX99sZ/gbq4jJx67zA6Rd0QoLZ1Sa9IXqtBPWFZ+mEvgE6zovWCMZFaqPbriUcydhAv2MY6L40NAE9q1SaFfLSLDzZ5B7LDeSQ5pMROa1MvnE/UQzPcfzPdkCNndAQrLug5fEQBxYCe1lY8Z+X3dyy0TbJdDaWxcOQ21Ifi0zLBt66PeD/GufP8eY5GhqERVQx/LHaEkEQ1NFD8uO7+MAh6s0LCAiitO/C47KA30OPBEdR0myoEXEeySIAcgQWlvHsKwH/PCqfDx7NkSEabTuYUhpDFzhOM1UdyoM4ndXCKfUts9ocW195bw/0Gr2uWH4ZDNxUqU8/yW8i1y8=; 5:1JkB3ejbsdHnS3GGmrxlKu95bq/DUGtqO65vjW4DJ+GWKzThW8wvawHdPZ7puS6NVBZvGW30ya1873CeJcNV2GkUvML8R1TLRnSqZF5eKXXhIK7kFjDZjNinFCK81Wn7BvXyIf7Y0V8xP2f53+++ihoWmV9FHJ1xsUISRBFIeWM=; 24:xEvV+GZZMTo0f2FccbwJmLsfsqVvNW4MeU/8/b5h9ltHL/0/vAugXt8Wk+p7dD2zvsTu+Pq8KPOL6Rr7FmO6B9wIC3cAhP9Ukh7jmwu4+FM=; 7:ex9d1Q4ErxeW7qShwOAjwOEum5D9TYjhxkqGarF1u8RM9T2Kkc3fgXpgEUje2UKwML92ZED2wxrZQ8jP6fq73l83mnES8Qpqw2rdsZnGfpzfr1GBcg73+QEvB9qSJB26Byt8IS0ZpsqfSLoxJkSZxpSjHSPxQDXZPs6iGGihxObD4rM8yQfbm9YpWHgLGW43uOjZOUFYwwVljdLYYvmf0ObFE2ZqA9QV5mYv4D+h7cJNZ2t686OBa7S20doVCnwz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2017 20:34:15.5500 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 663aaa48-22a6-48fe-093d-08d54e325d08 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: CY4PR0701MB3812 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: Quinn Tran Immeadiate flag is not used for scheduling session deletion. Remove it to simplfy session deletion code path. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_gbl.h | 2 +- drivers/scsi/qla2xxx/qla_init.c | 10 +++++----- drivers/scsi/qla2xxx/qla_target.c | 16 +++++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 3f3863c09de2..47bff9ab1176 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -887,7 +887,7 @@ void qla24xx_do_nack_work(struct scsi_qla_host *, struct qla_work_evt *); void qlt_plogi_ack_link(struct scsi_qla_host *, struct qlt_plogi_ack_t *, struct fc_port *, enum qlt_plogi_link_t); void qlt_plogi_ack_unref(struct scsi_qla_host *, struct qlt_plogi_ack_t *); -extern void qlt_schedule_sess_for_deletion(struct fc_port *, bool); +extern void qlt_schedule_sess_for_deletion(struct fc_port *); extern void qlt_schedule_sess_for_deletion_lock(struct fc_port *); extern struct fc_port *qlt_find_sess_invalidate_other(scsi_qla_host_t *, uint64_t wwn, port_id_t port_id, uint16_t loop_id, struct fc_port **); diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 956f51e78e5c..aaa8c07b2d8d 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -353,7 +353,7 @@ void qla24xx_handle_adisc_event(scsi_qla_host_t *vha, struct event_arg *ea) ql_dbg(ql_dbg_disc, vha, 0x2066, "%s %8phC: adisc fail: post delete\n", __func__, ea->fcport->port_name); - qlt_schedule_sess_for_deletion(ea->fcport, 1); + qlt_schedule_sess_for_deletion(ea->fcport); return; } @@ -527,7 +527,7 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, ql_dbg(ql_dbg_disc, vha, 0x20e3, "%s %d %8phC post del sess\n", __func__, __LINE__, fcport->port_name); - qlt_schedule_sess_for_deletion(fcport, 1); + qlt_schedule_sess_for_deletion(fcport); return; } @@ -599,7 +599,7 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, __func__, __LINE__, conflict_fcport->port_name); qlt_schedule_sess_for_deletion - (conflict_fcport, 1); + (conflict_fcport); } /* FW already picked this loop id for another fcport */ @@ -1134,7 +1134,7 @@ static void qla_chk_n2n_b4_login(struct scsi_qla_host *vha, fc_port_t *fcport) "%s %d %8phC post del sess - out of loopid\n", __func__, __LINE__, fcport->port_name); fcport->scan_state = 0; - qlt_schedule_sess_for_deletion(fcport, true); + qlt_schedule_sess_for_deletion(fcport); return; } } @@ -1780,7 +1780,7 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) set_bit(lid, vha->hw->loop_id_map); ea->fcport->loop_id = lid; ea->fcport->keep_nport_handle = 0; - qlt_schedule_sess_for_deletion(ea->fcport, false); + qlt_schedule_sess_for_deletion(ea->fcport); } break; } diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 786efdb5788a..867d089c3ebe 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1211,8 +1211,7 @@ static void qla24xx_chk_fcp_state(struct fc_port *sess) } /* ha->tgt.sess_lock supposed to be held on entry */ -void qlt_schedule_sess_for_deletion(struct fc_port *sess, - bool immediate) +void qlt_schedule_sess_for_deletion(struct fc_port *sess) { struct qla_tgt *tgt = sess->tgt; @@ -1252,7 +1251,7 @@ void qlt_schedule_sess_for_deletion_lock(struct fc_port *sess) unsigned long flags; struct qla_hw_data *ha = sess->vha->hw; spin_lock_irqsave(&ha->tgt.sess_lock, flags); - qlt_schedule_sess_for_deletion(sess, 1); + qlt_schedule_sess_for_deletion(sess); spin_unlock_irqrestore(&ha->tgt.sess_lock, flags); } @@ -1264,7 +1263,7 @@ static void qlt_clear_tgt_db(struct qla_tgt *tgt) list_for_each_entry(sess, &vha->vp_fcports, list) { if (sess->se_sess) - qlt_schedule_sess_for_deletion(sess, 1); + qlt_schedule_sess_for_deletion(sess); } /* At this point tgt could be already dead */ @@ -1439,7 +1438,7 @@ qlt_fc_port_deleted(struct scsi_qla_host *vha, fc_port_t *fcport, int max_gen) ql_dbg(ql_dbg_tgt_mgt, vha, 0xf008, "qla_tgt_fc_port_deleted %p", sess); sess->local = 1; - qlt_schedule_sess_for_deletion(sess, false); + qlt_schedule_sess_for_deletion(sess); spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags); } @@ -4522,7 +4521,7 @@ qlt_find_sess_invalidate_other(scsi_qla_host_t *vha, uint64_t wwn, * might have cleared it when requested this session * deletion, so don't touch it */ - qlt_schedule_sess_for_deletion(other_sess, true); + qlt_schedule_sess_for_deletion(other_sess); } else { /* * Another wwn used to have our s_id/loop_id @@ -4535,8 +4534,7 @@ qlt_find_sess_invalidate_other(scsi_qla_host_t *vha, uint64_t wwn, other_sess->keep_nport_handle = 1; if (other_sess->disc_state != DSC_DELETED) *conflict_sess = other_sess; - qlt_schedule_sess_for_deletion(other_sess, - true); + qlt_schedule_sess_for_deletion(other_sess); } continue; } @@ -4550,7 +4548,7 @@ qlt_find_sess_invalidate_other(scsi_qla_host_t *vha, uint64_t wwn, /* Same loop_id but different s_id * Ok to kill and logout */ - qlt_schedule_sess_for_deletion(other_sess, true); + qlt_schedule_sess_for_deletion(other_sess); } }