From patchwork Sat Dec 24 04:23:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9487875 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 160F2604DE for ; Sat, 24 Dec 2016 04:24:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0472425F3E for ; Sat, 24 Dec 2016 04:24:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED1AD27829; Sat, 24 Dec 2016 04:24:17 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 E32DD25F3E for ; Sat, 24 Dec 2016 04:24:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941633AbcLXEYO (ORCPT ); Fri, 23 Dec 2016 23:24:14 -0500 Received: from mail-sn1nam01on0064.outbound.protection.outlook.com ([104.47.32.64]:35776 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933608AbcLXEX7 (ORCPT ); Fri, 23 Dec 2016 23:23:59 -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=NdHd71vSsOTxRpPDaHoa3zNM5fPnrVqXmYVB46u98i8=; b=ZixOM8TJRcMg/IMvfvYxy2Y2sGWD4xnzozaNedt4m5u4ny41uWPTH9ACdVUkwuDOAMSB8oyGw6gTUbQNE9TOeO7u8cbNHx4+MCvUQJ6U29ogHM7sqVpE0BOX7jp4GMuqG8LzuZN3JXmxpXXZtmfg7NptDN1skvqvlAS47hlD0ho= Received: from BN6PR07CA0040.namprd07.prod.outlook.com (10.172.104.26) by BY2PR07MB026.namprd07.prod.outlook.com (10.255.241.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14; Sat, 24 Dec 2016 04:23:55 +0000 Received: from BL2FFO11FD012.protection.gbl (2a01:111:f400:7c09::103) by BN6PR07CA0040.outlook.office365.com (2603:10b6:404:a3::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11 via Frontend Transport; Sat, 24 Dec 2016 04:23:53 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; linux-iscsi.org; dkim=none (message not signed) header.d=none; linux-iscsi.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD012.mail.protection.outlook.com (10.173.161.18) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.789.10 via Frontend Transport; Sat, 24 Dec 2016 04:23:53 +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.309.2; Fri, 23 Dec 2016 20:23:41 -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 uBO4NfkH004170; Fri, 23 Dec 2016 20:23:41 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id uBO4NfaJ004169; Fri, 23 Dec 2016 20:23:41 -0800 From: Himanshu Madhani To: , , , CC: , , Subject: [PATCH 06/11] qla2xxx: Use d_id instead of s_id for more clarity. Date: Fri, 23 Dec 2016 20:23:34 -0800 Message-ID: <1482553419-4117-7-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1482553419-4117-1-git-send-email-himanshu.madhani@cavium.com> References: <1482553419-4117-1-git-send-email-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)(6009001)(7916002)(39450400003)(2980300002)(428002)(189002)(199003)(81166006)(305945005)(81156014)(101416001)(8676002)(76176999)(92566002)(50986999)(39060400001)(38730400001)(4001430100002)(69596002)(80596001)(8936002)(86362001)(2201001)(356003)(2906002)(4326007)(50226002)(105586002)(36756003)(106466001)(5660300001)(5003940100001)(42186005)(4720700003)(6666003)(2950100002)(50466002)(5001770100001)(107886002)(48376002)(189998001)(33646002)(626004)(47776003)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB026; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD012; 1:9xqfbfi5lsWWjzFgArQwL9PagtotmPeVSWrUWo6BPOnZfdon4xTegW4NGXinR1rOKEcSBT4OdViAaNN262u32sLRGcESYMurTGsnjEVdOriHmQHKl/NZRiUgz94jButkAIuULUG6TVIgZ/zYJVw/KT4Zv0EGMo71vZRnuT0FS2/OprZ9JQYyeRzK9XmmElvlXHYuBp9VxZBJgoOFYhu8QfdrBOHKwggW5J4TSwvvMG+bd1/jMgABjrmjN2EJtg621GVhf9IFCm+uRJFR5+QTH6BYIOWNeH2PyLfcd3HchwfJckAoGpc7zo6nDz5O7a5vsZA/cPftL8fiJ+DxtMuJS2tpE3nZks1YfhByh1i6uyTx1UirhaVA84ziCjcRxcxUNEY2rlRRDoGw06JBDAlSm4+vm5EF3K3f3FryNS9W72qrVjKMtITXNwBadApgZmKxUTXLcpu71SrZqKrvebGy2WdUSA8P2tac8U2drQPVqrv3jquRGJaKaLJ+rqJ1Vm2oTnrPxy5OCK2b6E4FmHc/kPVJ9hUSCO7/yfzFehL3gqEIAjspi6HG4GIh1SsiTlC/ X-MS-Office365-Filtering-Correlation-Id: 82476df8-4aea-4e01-c473-08d42bb4ab4a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR07MB026; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB026; 3:MIVlGVaLEnY19pkiHMNOyGFpoc5+UGn601zbQCScrSSkp/ZERzmkMteg1QEvuEuyJH66v39lxO686RWpD1/7emzgG/ir5e9240y9sfEgn03KiaXqWD5AEwd1BMQRIBSu/11X1U0NLc1GxvyCWJqia5LOwIrckz7W8un1gT8HFNwYstjnyHM6Hnw4bQ7OUZOwb8Rdtb62ptpRdcuiUl2xmKkpjF716MiltiREcKy6hOJ73MTnLQq/DeZcljCRuGQYqsRfd2OTf5oR6p6FLyDFFKzq5jV4jyxBnsK5yx8CARNoOsxtCqiYOkdkDcFadmlhiudV3N/hF/YqSF/ZVoYr7ZoU/6v4toZ3Ae99TdWKSsU=; 25:AXfXjXxMy6PeWpdm3DSvArCOrzr1WUC9IiK8pi56FyeoOeFyXQbHjJIlGz6aLrnWtnDZTxTEvhXLgGnrM88AxLebxwm9tNk5wW5VVST0h3q2v3RtpJHO+0xE62Nt1E1hEcur+xjMC47TOSLeOXmlG4Ic3HTsSRvBmYXdpgNZGvdM9VpBw3IiE7nt1XQMjdJUdlIG+a1bM1LApPckYNIEJKbMz6xVx9Hmo5eoN6aLLhstetZtocmRV9iJp31ZBUi1i34/tq7tszCq3y/8Ydxurmb19XbONJSWbelKUxiREVCKObo10m7UEbfo6wvRmRwCF7tZFhC3Cqt2arzyd31nFN+O3BYhCNyqL8rXna9kDejszUqSXcHRFFGrj5wF0ZXRXZA+TwAuvilSvZgMM2aC54KzxVEXFZB+DMXOghWWRzIN6rN6O7u4s7jM9t3/2mNoJ1WiQ8ZUqGd4JLHtdcVHSg== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB026; 31:IdW0C+7KfFZKS/hRdPof6mARYtypfWYcy+ULBVWo8F/M0clY30fli49E7JrXM1acXmnDOMum0UVPzfpQO79wVQB3uZL04h5a/DRS50qjF5yGR6G4yjtusfrQVXjlF7F6RpXprfdl+lNAlMtkaVy1f+WdruR7Kib667n+I2pvHD+B7igMlT9gksFAEskUL0V2vNErlgSTmaOxeQ4EGslGUhiKwVO0lWcpMT9DTgfFQMxBvL1Qo90/Neme4GfkLT6Yn/ZaHgacBiS15aM26cqf8vJwxDZOr1oWSQ1EWjUP57k=; 20:je+MWbPYr0rpPl4FMcWY0VIonrzCi72CmH2d+qC91rxKb971F0twFI5EDndJlF3ZmLBjk/cwnaeuJwGFiH6L4xVLWtuYr27ikKnsw0LJDGG/deLS0rfWVf+PaxHBLrovM5VHrEkJRjQNJZ7+Q1Lrhg2l3jrcXUKZg4uKJnl1jHWXQFsYpga7YdbCFocdOwOFra+CicAy7urYxEU11xeY2TNGTnv5RQRZY/rG9qDuSlE5qGghAqFt8L+nvNzg0I54kpuVF18UGtZAT/sJxooorWFsX4HORwSZ34rijvxQECEmC2lOXDoE7QAJ2OSk0lRW4y3d7a/eWoI3Wqpleg9A/sa/raPQF0EIpp9HIB7YpN1RnZ/c8cHDGXMcB3zd5+QMI7i3QS9+iHCcCdGdHm0AiKGwDh7VvJvzN7SlYRhbP676+1WE4R52XKHthT0dzS8T0pfienY41M4oyUQOsRB0ae5CJmMjJQLzVxmkOcDIKochx74tFAn/w23j97K6Foie X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13017025)(13024025)(13023025)(13015025)(8121501046)(5005006)(13018025)(10201501046)(3002001)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148); SRVR:BY2PR07MB026; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB026; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB026; 4:Vhif96d6pzpCLcrchw6sRaxW0CVGt1yC4wjfA+uf13ardauVK5WzG2XdAcXryR+yFOJ3RWrNLqLU8vfvM8CVTZMU0UT6WlYLWRjffN1NqHVopjx8a2/CvhuYmE8jvdD3ay+g9cgriCxc1tEI9GbVRWZJtWvsZK0AAcUpMNiHhY4nmPCY1qEOgA4FBts0sab75CFOIxi4bKpfJF5BB8yWJtTv2fETX/CUY0mjWKw63VkW1vvN8VibScmzUcF3SvE865kreiwtmRk4tsUssnJN9E+ElDtA0kqqwBBCcrPL+zDDNFrvCsNuEmr7s2Fo5u4w9rBK1C2Nnkbi9g1pDkG+BjmhY9siElgdNLwS/Y930ssZLckeE+qhtBHMPX7oPCmN6ZbnkU4n7frZF5zIOVmiyQCt4PnxU+sM0daYQAArdkXrz1EiGoQNLsj/VabLpL+7c34RDXgFoWBtBlDznHN+fF33Scw55yLZBOCP4mag34furdKOtj3Wvq7kd8DuZfy8X3ZR0VGhhSnsGindvKVzd/GjHu4HvSrcCDipckuyvJV/t7xqlhAelA6E2s/BAPjlyeLaehwEXRsJgyD6gq6sl77aMtFu3L6wwMlLGnLrfVZF6OcEfRltWCex4zaek/UKxnJGjgoANDWItCaeC07LLNoUOgZKah65yCzPJl/3Xl0= X-Forefront-PRVS: 0166B75B74 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB026; 23:46KXCanpK0Sy5R8hgu9Lq2Y6xrHvfPruo2AXkUPI99?= =?us-ascii?Q?BNrw9Jv+yv5QAIjTZJWplKx83RIFEEJi+8EscM/YJwgYcdjhnSEmCoBbd37P?= =?us-ascii?Q?R8SlAA33IE/GVZf3oyQp9TR2+1y8GNBKud8M2KAhxfkZkNcMbhfB0iH6kYty?= =?us-ascii?Q?T7JRBLdDNw3zNGWqkCjODMMmLmsl9ar2mhukmd8tchF3cd0jFP2CWfPG7h8Y?= =?us-ascii?Q?fxez77HubRMF1n5INjivj8tGtSSKRQh/8K9z93abrR4TCp52bI3kkcBjJEoW?= =?us-ascii?Q?SnVoNftXokkKZGXXUfkjCPAADsw+MZmShg6FsMokkKiYPRpAdbKehhzX08D0?= =?us-ascii?Q?V5gMAFJhk8/svkMSaOlSqVryiLlwI2Wsd5rfAEPIQ5q2VZmXNKpqspii8ukC?= =?us-ascii?Q?gjbgO7QoIrTAZ/sI0jg3IDTTRPZq/lEUar0spF7a38PWK+gepx46WqbtiTNl?= =?us-ascii?Q?mLYgOEvzhOU4kvqK7tVKxkXQiFZZ48hkVYS53ffmfk1UK5owWVXFki4F3HrP?= =?us-ascii?Q?DZDTRu9ohtXl+GNdIh7mr0EbOANuUJLIaghIZRtBD448XEDC+EpeX8WwKjR1?= =?us-ascii?Q?vmwFZit02VsBmRJFv3fh+NdlvROCLodiyEeZfHPY68c6o/G4OP4JXaKg8kNu?= =?us-ascii?Q?oHSueQUp6IMfjmatIXIzPl7mExEJkNk15Mwav93PTHEDP3bSCAIo2wLc/mFD?= =?us-ascii?Q?CFH6ft3uLJej1lZf+MVHCdIW1QQrs4RlQz4o32dzL5fjvHOYKBQwum20bgKG?= =?us-ascii?Q?jjNIpQUpYUKLS0vpRO0khUto2GUcmDA08mCE3SYVHZiLftVGO3Re6C7Qz/+B?= =?us-ascii?Q?DcDEDhkbpmS1MV1xoBXfbBt0JSR1ZkMriENZiZGBj6JVWGJ+ux1bVE1EzmOX?= =?us-ascii?Q?5Y4NgU4Vne3hAVHp4jSfJpYBJRnbxA+5LeWgeQc1eSBFgyreZT6VVkDiiJD3?= =?us-ascii?Q?PLPXy3xqsu6pqKlmphw16l9FKvHV4LHUYrV4envycAihAMSmy/78+HF/BhHZ?= =?us-ascii?Q?P5IpYLHJIWD7WNyUTjbgSwWpHN7OkTRr6MmeiSFTyhf2K49siZDlhPydJf/g?= =?us-ascii?Q?sepOgnhwlHTw4D9XYUaYvmgQcPsSsobUMgjOqJEt3TQUUoIvalaHQrFJDpxk?= =?us-ascii?Q?qiEaau6Gc=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB026; 6:a9xu92kCC8b006xqM2CaB56MR0ucHTuryULI/Pyg/zhdmDZ54enud7ZNSIdmUvrRdrwrMh1Few/peSAG9Y2dwu/iyBLVVEvPNsK8HvV5Wh06gsZY29u8z/EWaeweepIp6uqeIwdsbezVAC6fxS4JUzJ0hBhGToQKaxO58eB3hbGkQbizkayOIX6lSOfX6aXl4thSPpMvqzKxdpOk4jb6WxlvjrN0zxbz5F6sb7VhfkoxeSESfTvRBKnSzHZBIf6wCVzo7U+PTroNsSxfj1Ha/Zj9vsoq8ngkPWUAfE6Wddl47G2WRVDIxcSA1rr4lZRZ461wStfr3LzKWvSl48/qDQnAzJu8WQTTQMkj5Zh4wfjiHOEwnDn0kTXlAs6OhTQrNcoMv+mPsp9notQ4xqkOc2SCdIYBE2+OvNkGfrwb2yY=; 5:9R0Q2dmF3oSOQWyqVkQ6GBgj/Tj2kRUNqRklMF4/4xOg3N8jrl8tIEtRzCD9498PMRcL4J/F4774toeZQ1YXcfdaEgAwM4K9Arlf1iFt6KY4HSCt/H+Ly4Ivoy139wYZBIOKvXOJrvgwQkeQpSMhew==; 24:Pfu+m7eGss1XCPec+Uj8OmG5xQKpkb9JRmP69eU5faZzvLnhQE7obBWvkEqfGkziP/IvkFIl8kVUxsVlbxAOagciI52YcMlRmC4CP5IoAps= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB026; 7:l8pzZUyjfrHCVxxKSQoNWsQ1kuvXS4hD5yHaFe29EWCXZ5I1fFxwZh3xklcVUmfiyoUEP+Eayn8roXLXzTUjA8aS3yLojiRgBCGpsgTtY5OEgmPDQLL0U4qKSsZePs6M1N06hlq2emYYWqfWiKfo2gYy2aI7su2FuXb7j4MALTbt9p6WbwurZoPrRGCMDP5kkK9EjT+2ptAqpPwbyh4g/KTIt4ncCLkCF9KK/Lbq4TOkZKbjGCzZFVmVwgqJAWmArwy3TBgoC+TaET3LNEM6Ts9J6CzmjRA1TjKkApyZpKZzjYPdpehDMbOYqyOEeCakMJpIqb47RzXkzYr5mORepwEN9jRVKOIyvKFK9rPhi/YUYnr6RP/r8p2LU8Ekc0i6LU5m4IJFn0xrqBK6bE1jLDqoe0sQRVB9mfHS73msf9h+e6TmCjwnvgYP41GnFmWJnN9GpHSeKbipEVHKFcptGA== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2016 04:23:53.0406 (UTC) 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: BY2PR07MB026 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 Updated code with d_id from s_id for better readabilty and clarity. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani Reviewed-by: Christoph Hellwig --- drivers/scsi/qla2xxx/qla_dfs.c | 6 +++--- drivers/scsi/qla2xxx/qla_target.c | 24 ++++++++++++------------ drivers/scsi/qla2xxx/qla_target.h | 2 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 32 ++++++++++++++++---------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c index 34272fd..46697de 100644 --- a/drivers/scsi/qla2xxx/qla_dfs.c +++ b/drivers/scsi/qla2xxx/qla_dfs.c @@ -28,9 +28,9 @@ spin_lock_irqsave(&ha->tgt.sess_lock, flags); list_for_each_entry(sess, &tgt->sess_list, sess_list_entry) { seq_printf(s, "%02x:%02x:%02x %8phC %d\n", - sess->s_id.b.domain,sess->s_id.b.area, - sess->s_id.b.al_pa, sess->port_name, - sess->loop_id); + sess->d_id.b.domain,sess->d_id.b.area, + sess->d_id.b.al_pa,sess->port_name, + sess->loop_id); } spin_unlock_irqrestore(&ha->tgt.sess_lock, flags); } diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 8a10f93..890c53b 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -530,7 +530,7 @@ static void qlt_free_session_done(struct work_struct *work) "%s: se_sess %p / sess %p from port %8phC loop_id %#04x" " s_id %02x:%02x:%02x logout %d keep %d els_logo %d\n", __func__, sess->se_sess, sess, sess->port_name, sess->loop_id, - sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa, + sess->d_id.b.domain, sess->d_id.b.area, sess->d_id.b.al_pa, sess->logout_on_delete, sess->keep_nport_handle, sess->send_els_logo); @@ -538,7 +538,7 @@ static void qlt_free_session_done(struct work_struct *work) if (sess->send_els_logo) { qlt_port_logo_t logo; - logo.id = sess->s_id; + logo.id = sess->d_id; logo.cmd_count = 0; qlt_send_first_logo(vha, &logo); } @@ -548,7 +548,7 @@ static void qlt_free_session_done(struct work_struct *work) memset(&fcport, 0, sizeof(fcport)); fcport.loop_id = sess->loop_id; - fcport.d_id = sess->s_id; + fcport.d_id = sess->d_id; memcpy(fcport.port_name, sess->port_name, WWN_SIZE); fcport.vha = vha; fcport.tgt_session = sess; @@ -757,7 +757,7 @@ static void qlt_schedule_sess_for_deletion(struct qla_tgt_sess *sess, "qla_target(%d): session for port %8phC (loop ID %d s_id %02x:%02x:%02x)" " scheduled for deletion in %u secs (expires: %lu) immed: %d, logout: %d, gen: %#x\n", sess->vha->vp_idx, sess->port_name, sess->loop_id, - sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa, + sess->d_id.b.domain, sess->d_id.b.area, sess->d_id.b.al_pa, dev_loss_tmo, sess->expires, immediate, sess->logout_on_delete, sess->generation); @@ -892,8 +892,8 @@ static struct qla_tgt_sess *qlt_create_sess( ql_dbg(ql_dbg_tgt_mgt, vha, 0xf005, "Double sess %p found (s_id %x:%x:%x, " "loop_id %d), updating to d_id %x:%x:%x, " - "loop_id %d", sess, sess->s_id.b.domain, - sess->s_id.b.al_pa, sess->s_id.b.area, + "loop_id %d", sess, sess->d_id.b.domain, + sess->d_id.b.al_pa, sess->d_id.b.area, sess->loop_id, fcport->d_id.b.domain, fcport->d_id.b.al_pa, fcport->d_id.b.area, fcport->loop_id); @@ -943,7 +943,7 @@ static struct qla_tgt_sess *qlt_create_sess( } sess->tgt = vha->vha_tgt.qla_tgt; sess->vha = vha; - sess->s_id = fcport->d_id; + sess->d_id = fcport->d_id; sess->loop_id = fcport->loop_id; sess->local = local; kref_init(&sess->sess_kref); @@ -974,8 +974,8 @@ static struct qla_tgt_sess *qlt_create_sess( "qla_target(%d): %ssession for wwn %8phC (loop_id %d, " "s_id %x:%x:%x, confirmed completion %ssupported) added\n", vha->vp_idx, local ? "local " : "", fcport->port_name, - fcport->loop_id, sess->s_id.b.domain, sess->s_id.b.area, - sess->s_id.b.al_pa, sess->conf_compl_supported ? "" : "not "); + fcport->loop_id, sess->d_id.b.domain, sess->d_id.b.area, + sess->d_id.b.al_pa, sess->conf_compl_supported ? "" : "not "); /* * Determine if this fc_port->port_name is allowed to access @@ -4051,7 +4051,7 @@ void qlt_logo_completion_handler(fc_port_t *fcport, int rc) } /* find other sess with nport_id collision */ - if (port_id.b24 == other_sess->s_id.b24) { + if (port_id.b24 == other_sess->d_id.b24) { if (loop_id != other_sess->loop_id) { ql_dbg(ql_dbg_tgt_tmr, tgt->vha, 0x1000c, "Invalidating sess %p loop_id %d wwn %llx.\n", @@ -4212,7 +4212,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, * PLOGI and situation will correct itself. */ sess->keep_nport_handle = ((sess->loop_id == loop_id) && - (sess->s_id.b24 == port_id.b24)); + (sess->d_id.b24 == port_id.b24)); qlt_schedule_sess_for_deletion(sess, true); break; @@ -4260,7 +4260,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, sess->local = 0; sess->loop_id = loop_id; - sess->s_id = port_id; + sess->d_id = port_id; if (wd3_lo & BIT_7) sess->conf_compl_supported = 1; diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 2f311b7..64e12fe 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -928,7 +928,7 @@ enum qla_sess_deletion { */ struct qla_tgt_sess { uint16_t loop_id; - port_id_t s_id; + port_id_t d_id; unsigned int conf_compl_supported:1; unsigned int deleted:2; diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index 5f6223b3..d9720a9 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c @@ -1391,9 +1391,9 @@ static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *lport, struct se_session *se_sess = sess->se_sess; unsigned char be_sid[3]; - be_sid[0] = sess->s_id.b.domain; - be_sid[1] = sess->s_id.b.area; - be_sid[2] = sess->s_id.b.al_pa; + be_sid[0] = sess->d_id.b.domain; + be_sid[1] = sess->d_id.b.area; + be_sid[2] = sess->d_id.b.al_pa; tcm_qla2xxx_set_sess_by_s_id(lport, NULL, nacl, se_sess, sess, be_sid); @@ -1445,9 +1445,9 @@ static int tcm_qla2xxx_session_cb(struct se_portal_group *se_tpg, unsigned long flags; unsigned char be_sid[3]; - be_sid[0] = qlat_sess->s_id.b.domain; - be_sid[1] = qlat_sess->s_id.b.area; - be_sid[2] = qlat_sess->s_id.b.al_pa; + be_sid[0] = qlat_sess->d_id.b.domain; + be_sid[1] = qlat_sess->d_id.b.area; + be_sid[2] = qlat_sess->d_id.b.al_pa; /* * And now setup se_nacl and session pointers into HW lport internal @@ -1527,11 +1527,11 @@ static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id, u32 key; - if (sess->loop_id != loop_id || sess->s_id.b24 != s_id.b24) + if (sess->loop_id != loop_id || sess->d_id.b24 != s_id.b24) pr_info("Updating session %p from port %8phC loop_id %d -> %d s_id %x:%x:%x -> %x:%x:%x\n", sess, sess->port_name, - sess->loop_id, loop_id, sess->s_id.b.domain, - sess->s_id.b.area, sess->s_id.b.al_pa, s_id.b.domain, + sess->loop_id, loop_id, sess->d_id.b.domain, + sess->d_id.b.area, sess->d_id.b.al_pa, s_id.b.domain, s_id.b.area, s_id.b.al_pa); if (sess->loop_id != loop_id) { @@ -1551,18 +1551,18 @@ static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id, sess->loop_id = loop_id; } - if (sess->s_id.b24 != s_id.b24) { - key = (((u32) sess->s_id.b.domain << 16) | - ((u32) sess->s_id.b.area << 8) | - ((u32) sess->s_id.b.al_pa)); + if (sess->d_id.b24 != s_id.b24) { + key = (((u32) sess->d_id.b.domain << 16) | + ((u32) sess->d_id.b.area << 8) | + ((u32) sess->d_id.b.al_pa)); if (btree_lookup32(&lport->lport_fcport_map, key)) WARN(btree_remove32(&lport->lport_fcport_map, key) != se_nacl, "Found wrong se_nacl when updating s_id %x:%x:%x\n", - sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa); + sess->d_id.b.domain, sess->d_id.b.area, sess->d_id.b.al_pa); else WARN(1, "No lport_fcport_map entry for s_id %x:%x:%x\n", - sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa); + sess->d_id.b.domain, sess->d_id.b.area, sess->d_id.b.al_pa); key = (((u32) s_id.b.domain << 16) | ((u32) s_id.b.area << 8) | @@ -1576,7 +1576,7 @@ static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id, btree_insert32(&lport->lport_fcport_map, key, se_nacl, GFP_ATOMIC); } - sess->s_id = s_id; + sess->d_id = s_id; nacl->nport_id = key; }