From patchwork Mon Jan 16 20:35:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9519409 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 2249B60209 for ; Mon, 16 Jan 2017 20:36:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 123A1281F9 for ; Mon, 16 Jan 2017 20:36:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0416928335; Mon, 16 Jan 2017 20:36:40 +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 E7350281F9 for ; Mon, 16 Jan 2017 20:36:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751423AbdAPUgi (ORCPT ); Mon, 16 Jan 2017 15:36:38 -0500 Received: from mail-by2nam03on0069.outbound.protection.outlook.com ([104.47.42.69]:30560 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751144AbdAPUgb (ORCPT ); Mon, 16 Jan 2017 15:36:31 -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=us/B1o0UnuRRwkVfRvB2syUwhR9AYTljDxR+DlVebT8=; b=LzUzCbosOaxO/k3MZvQKLZ5fAZaX8Wm11WDh9Lj98vp/vCooiDW67cB+Kb2Nl6Kty5TV0Ujrx7TMKpB4Mvzotg7lEt9FjSO9Zw1TfrUJdKHKmFpml8+LuplQEUV0/CCUJHq2xYrurS0BWtXuYO0H8a+pfFfTARMj6fX0VGRPjqg= Received: from CO2PR07CA0036.namprd07.prod.outlook.com (10.141.194.174) by BN1PR07MB200.namprd07.prod.outlook.com (10.242.216.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Mon, 16 Jan 2017 20:36:18 +0000 Received: from BL2FFO11FD041.protection.gbl (2a01:111:f400:7c09::158) by CO2PR07CA0036.outlook.office365.com (2a01:111:e400:1414::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12 via Frontend Transport; Mon, 16 Jan 2017 20:36:18 +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 BL2FFO11FD041.mail.protection.outlook.com (10.173.161.137) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.803.8 via Frontend Transport; Mon, 16 Jan 2017 20:36:17 +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; Mon, 16 Jan 2017 12:35:54 -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 v0GKZeYv029119; Mon, 16 Jan 2017 12:35:40 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v0GKZe5m029118; Mon, 16 Jan 2017 12:35:40 -0800 From: Himanshu Madhani To: , , , CC: , , Subject: [PATCH v2 06/12] qla2xxx: Use d_id instead of s_id for more clarity. Date: Mon, 16 Jan 2017 12:35:18 -0800 Message-ID: <1484598924-29066-7-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1484598924-29066-1-git-send-email-himanshu.madhani@cavium.com> References: <1484598924-29066-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)(199003)(189002)(36756003)(5660300001)(106466001)(626004)(47776003)(50986999)(76176999)(4001430100002)(48376002)(42186005)(20001)(105586002)(2950100002)(6666003)(4720700003)(101416001)(50466002)(54906002)(33646002)(2201001)(38730400001)(86362001)(92566002)(39060400001)(69596002)(81156014)(80596001)(8676002)(81166006)(4326007)(2906002)(8936002)(189998001)(356003)(305945005)(107886002)(5001770100001)(5003940100001)(50226002)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR07MB200; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD041; 1:SVK7eJyhXZ4WB5LwrtEZ0kjx4fDUtQ3hEIqyRIniPBsiaVtf+o60s4ll09etCVBotCEaBUlwmeBpMp5eMSTsztTo6l3H4yjQOM85PlD3zltpTJYju3obc86cvhUS3PXAiTKyMhUDghfRuUxEOZv+FCSFYjTyVoke6foYDviFJj1UZIOxsFYT0etIcBj21AOPunKFWUSaKNeTLYJ3jGCXxNfZ2sXor/JyZRhdC27t1+6cO35COfwjiKLrmMpR/NOjxACnKC87Rf4rZKiUTdJtB0I+250FVGazZP7iOzCFjQfEx8/mT0DWgPD1hrm4beiT0LKsb91LcQUGlbobF8GCLpTnsRG2CvbiO6sM0BoAxSXHa+vq24A0zPPFj/tuMfd32T+/rvnscPf53lDqIrwDgIRPrY49PX2B3US/9EG9ekyHwClvNfECHqXr97MP2G2mU2/f8bJkxRkc0MQJpvdVDnby7faUfRB+9o3op/jteR0m1S/4BDm6rH1B4mDm+Uz6ifx1aSMmc6wMLzRCAdlXPQ== X-MS-Office365-Filtering-Correlation-Id: 8322152b-1cfe-4e24-7a15-08d43e4f530e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR07MB200; X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB200; 3:rRW/ZJjtrWsxtUR+9kh6ogKQk7XBVGATrsfgJx17RkX4zimtMRlJEETUTHDWfPbV1T57n11KUYCBwvwux8PqpQB9H9njNUmHYtWd0dasgMu+c6ZPj7eBqVlDTJz5mT9jj3eRIltCK74pnJzdAFBsis2C1B4M4lyQR5BIOO8DdmQZ0DzgsYzFfZqjYRLZ+mWMGb9EX0Btekj+Shyddnjvnn6R+5FIegmRepr0jf9GFnUYUcchbmo8XNVHfSqH/0MGMmVLoTio7J+V1mR94CwENbB+B8vtIfflQbXQnAh++B+4i5FcpHzdZY7E3qwfnIvRffBjfXkWgIST5iy1rI5hUQcwLTL8szoiEG9syb1xo2uTvFNApVs7EdQgYJN8RhQn X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB200; 25:FZ77OARR4RkAdT3H7P3ARrlWSma8jH2aD5w/k1NLGIy3E+kNAUhv4GZ9I1EaqZ8KFlyMGXlp+uYy4p0dZubLTQVJeqTumZjfBtrPihn4PNPUOSL8oLTEYszDJfED++SGWJaAn4ivFYnHJZssDUiobbIZI8rR2LTz28NUOarW/7HMcLZwPHHUOoVs47M/cTuv/1M7uPUtdBOR1PxsWNt3ldCHA4lTb0s215EFHocCciCmL6brGHHd4i7EhJDobPEt6fiHXGd3hlO3Uo/jWpJHkEzoLxuC0J6o2kV6dT0lL3j4/oU9s10NjrzCod/pS/qS9tB8GHDjaCYYxhq+6ORXYUS/jMDHL5IF+utxpU6aAhyuMUEAH/Pnt0EfVZwact9aei4TZQKEEQ48I/jlv+LOCmCqduHxhT9KrOIIPzGG3WAFPb0iWk0n9qXXnA2J5N/oc7y3ESM//oDdGHZ2q9FBB5OPGLEKnbZNJdn6S02hXnyPO99q9wAXvxVQZQ9jmCICUoUyW4sw9yt9jK2Ded84K18kh71xdTj1aamenrISiem715bPRyJ7GtRKNQIfNPuNOtXqA066t4cmWY24snaYN+JDfhGvD7JeEFHGVlq+rwk6OnWMsZmdmhpOuXxZA5XIE4CgAO4f4PqR7cXUmEkZ6OzblsYAbuC9c6Dy03k6B1yEcDiwmMcdyQdP07TsGQqc9CqVhF1dEc7qUhHfwkPZLbYS9W7Pp65xKfhK06y5A0soEtKqwa37hLOgDYftI4ATnoU0+HYR2gPdzANb7riovMv2Vfvd3ybmyvdXxjOwIMGDg0q3sIqcKil7YRGthGJ8HfjWtT+Yb2CcW1eCpaQqyIftxYOCn1XKnD+HkAzKFdY= X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB200; 31:+vtnk1NT8+eTZCCu6HvKS4wFf/5yWNoQv2Tbd0mJUuW/N2xzxJ5f/Vznk3Ok2nXySv84ftwlbWvCas31JbLnIXeVqIJOdQ1DudHlpyBc+niejgZ10UUU/bDkbwjDhfjwfcV8XnYXyxsNAWkllaBw1VI4UEpjWA7gmqAU59FMWXqIxUtRrCROpQO0Pu00HtKfL327mtVwzA9UyzOx2OCYao3KX7Y/dV99m8xwSysstZY/AfwK9CVlJWaJWxoOMUsDKf4IT1F0lviJBLjbmBIL9w==; 20:TaibKUeCGR9ADWh7fiT/BFBBdcPB9/fafCAb4TL+yOVJdSgElHFxhZ/Jq2am95KyiQFCfzrUC91gX28V9RLO7YjtJ1QGnbW8/9RGnAbBLzNlMl0II1EIHIsvFuQNtPA4RcGxb0xVObhFeFMdiGc+2GqOjpQcUR1EmUvc+ZuIqxBWbRfHyn4IFvgHxAeHxg0n+YyBIMYAxh2Ab0aa8jvqnXVDzw3giftmJ1mnvMM0SCconbaY3d7RTgQR4HlAV75f18lt4ulOm9zqVqB2x2BUXyiMoUdahs5mVjFuCE/JeKld3G0D/pgMM6YmeIgNNU2AaO2U5PZUOsQMsZBCp5Vf0+sf0TdEjISq6thVjW6zuYnjz4+a1/cfLcfuWRWIo1xsiXxkbpbBtof6hkRFgZq2PCSNsMpjLA4LyBsd9ot3FAMzqkgtQXL3k3adMyQ8ng86FY+rLIQh4AZijykMa6ZNNzXOLFFkpHVLC2gNL6yWFNEDdr1/z5TgWXzhHzneTUAR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123560025)(20161123558021)(20161123555025)(20161123562025)(20161123564025)(6072148); SRVR:BN1PR07MB200; BCL:0; PCL:0; RULEID:; SRVR:BN1PR07MB200; X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB200; 4:TJRVMvMjaPX9+tsph1Op1xZruHyDl5tpUStuUPP0sj7PZW8PBPIpl97s0tpQCTZohp+hH+cfbb3phGlYAYjbEc7tvJ2XWUEBlLFQyvPxwE32WXXPvx9Jj3ReQisoO6h8Kxp4dd6nKZuq/4wnL3J4Hwz8IvcsQXNK8zCFTx910lCaIDFd7ZGvZZZlCLPfWKMEFlFbYjkQpOoc5eAX2WSy/5QcCbXpsD2V64qs7nFq858Is12hK0f1D+xkFMBMe3rS8BS4jFPcbxI/8ijzqAkGwDxCFy4YaTqwXONqmoKIGVJRDPPYvN2wZEANnk5vuv2QqUFFoWXfKR1OtyhIIaKaEjNKRKo9UgpjVJ7U1KPTMouq6k8BEWsy8tCHGE1CWeHb/wTBGu/3ET09K7aQ9vuusfGSYIW4k/gr2Ym2ucYhS6izP7Dbm7a80eiFnMt6jKn6eoh7DwF46tuZav1LCFDFvASF2ijmbpWEhAyzE9MkblxwOgcftOn8p3z3sFx+i4NZEzS+aMJ18+CVClnpYDHLZme0mD6PdOxTADAiA+GpO2nxAacZvZr53W0MfCQEmaZU6reB8qB7eQQgvAhDcQoNlaLZKgp/No3uB9W3ewTThyEJWpKXifq0aYVXyUeYxMaPTt3oh4Fl7kgrXMu5gALfYwUExzaMBgWfmwWg+Q36Q0tK+T6KIzgsndn5UqdqzptYAgBpnNGLrWG+EuWbxP/EVg== X-Forefront-PRVS: 01894AD3B8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR07MB200; 23:A9rEWwsEvst815qj3cFv9TKPqo0O26/rRpe1u3Lxpz?= =?us-ascii?Q?WkW2wF0VbUOIE9Az0C2I+B203IoFzUu5oG4EeLNecj7ypHcQaIhaixl5Dyxh?= =?us-ascii?Q?zkjss2LLwldk7Wn2LA4j4PyOLu29JlUOZcv8Yw/Icgo28nXc2Y3LkqrUSOXx?= =?us-ascii?Q?gI6UPO1+kod29BWceh5YQTnvVqPS7kpHXby+xcAASOabu5e/AY5CchSZ44sl?= =?us-ascii?Q?XYamSmhD2gZRrM+6T/hGhf0g0gICOyrplLRhnp5gu/qYPZaOF9+JxJqUbO/Q?= =?us-ascii?Q?njhe5g8F9lB0XThfP07FpYRo2IUxZdc7CXHutDX58Rse6fiuzfciFEFuHMbs?= =?us-ascii?Q?V1pNuB02SrHXTfHg1wb6tmvuyWHFswcGCzNw3OfpfFpgUZKMvrYvaFFvNkDr?= =?us-ascii?Q?8IlhGTxZOO5etkfKgvwYk4DJCr58w6t1Z2vT9eAhVyIsXsM4X3Y0/didZsrf?= =?us-ascii?Q?4BbcOGAhmOcE9ZEt6zmMkoYv/Z5AwhZ7lon456W3HnqIwBcSw8B85rOvGG1U?= =?us-ascii?Q?9D2UF750V17MFPulZuf+sQBIY6CFG0Wo1F/1WH2ApTTN0g+gvtHqaOUuRjR4?= =?us-ascii?Q?/g2cUJOuTDpWsOvRSqCFRmFa51DlWVZqUH8qPuo8QXLkTFXfuvtKLK/WGBfg?= =?us-ascii?Q?9O3mpclCAdtgke2b/AFLgicNzENhDxRv++mxc4+fbIHqNDL1iqYccI6hxgGr?= =?us-ascii?Q?Gfp9vwZieKcf+PFeHRZaTzilmaA5a/0jWnYhMNxGtyj0RDZIf8Z1CW564cOG?= =?us-ascii?Q?/IoXCBBb9RkcLAndp3ZTNdXZHMr/nCUbS1vKepwemAmHBVmI7lgmFcO/i3iB?= =?us-ascii?Q?iYKhfbulMU5AJ1VWjcrnU4+GpfBKdAv4d7EMrVmcIuzzCBttLhsbbi/oNjuN?= =?us-ascii?Q?JNuDFKItlfUXyqJ5OkmQb06fLXFHQS/tFBCw72fhLgMfUIYrnd4H1nHShIz+?= =?us-ascii?Q?unNF2BDzmujmlljFF+26x3OhlDNjVs9jQRh9g+JPDi+u3TqCWdaEqMhezvph?= =?us-ascii?Q?Kb2ZQIKVdqmhRP8tSJ125HBAPIyF11nwFSyaCNvNDBui1TPxDkDBGtLLxRw+?= =?us-ascii?Q?o+o2EqLydAgkesGybX7FAQzkzOcYRrUen6yzPpz3MvUl7cThrgqAYrnlTl8m?= =?us-ascii?Q?FX0ovWbv8lPq/wmIAx2CrW/4v/dAaV/Y+6nOQBP9uxMCUr7qAE/g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB200; 6:2g0tVcxrRSxR/OWrug9IVjdeLQPXOQVxtTF4P+n3nYEsTtPXE6v/TdlC3t7zNttSmAauDIk0dOcL5v6AWOq+k0V14o6M+qZNauuelhdrqrxIviHfTUZ9Kpfl+rdqBYFZnCxbLyN/e/rVvcZmWjczmzjaQlPRHnBJMW5q0lPvJvQ5XpamM0z5uquNHo8mmOygsEGEObIdKZzcAg6OM+z8XFGMbpvSrt2rymYlMTRSS2RZZbSpClDIYiU2Ipeq1ghHyknhed+l3wLxapM5J4Q7WlV5mzGnCTwXh3gau/ReaC9EtleqFuz27dhTKKbgGhXHF6huSdd+aG9jc8FFk2zB5EDZx3eWaLSIPGXGmC/OB2Nw0xhpwZmjqO0h56pgXd75KGY6uJyzZ1k/FWyL0Kaa/w8ehokXmm4YfjP559L65HE=; 5:cFMMSXPWILr0JvQOYrkG7GC5CegGnmR4tzcvp+gML4B8CQKl0OB9fZ2YEst6Xn1zqRShrbrmYaa0WnQ0l30RPr6JGMkeql7+W5mHSCigsJ05jWsCODi8Lx9mxk6HJcA24cKy69hrg/tMMWsLaIRsaUKP2nORodpg6JbeayuyNg4=; 24:MuF6R9cW+FqrLxeMypvZL/p0FGvSRpzU9egHCjk8xsCGib1r9biHTmOZPk2qpkt9RfbQfbsWMeG+lAYJ4tQhvXrfLEwuWD14E577mLR12gQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB200; 7:80A1v4SRZn/vKtPympD+w+7ZWqlf6uwRvorkAZaAXfi5fj6xmzSRxk7xpxcC3UXYEeWtTQ+xCgtUJrUrPDyvwT+n39dbkQ2fAWoMJo/Nb9toVvIRJBU8QV6uoJRbFE8kesD1v34iIgaM0Xm+vsW1Kv9fcyIVL55E8lx6jx/sUdO8fe1FEgSRiTGby68Krl3v9AwZUtF/2O7NeLig4ISI4t67GxVvJK8wWMAHEBzw2zMLL7+K6avI9C+6CPFSG0AMiVm2SxTYnpZvOR9dTlbdb8m9tq5b0AJodssJqUHtG/52khJXIRd0g+bjoFKO5fDiAoSMLxFh791ioXrIBgEmYOQdJBPaBXcECYJsgOGtGXe7rVJjFhqApbk6L0B91HeasWot43UlZWM3V/kkQ9VvBE+/ZiVQHwG+Dfp63uSDbSd5J7fcOzskmqp9Vu/Mb476H94FhwqlxQZopMu4J2uijQ== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2017 20:36:17.9290 (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: BN1PR07MB200 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. Reviewed-by: Christoph Hellwig Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_dfs.c | 9 ++++----- drivers/scsi/qla2xxx/qla_target.c | 24 +++++++++++----------- drivers/scsi/qla2xxx/qla_target.h | 2 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 41 ++++++++++++++++++++------------------ 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c index 34272fd..98550c9 100644 --- a/drivers/scsi/qla2xxx/qla_dfs.c +++ b/drivers/scsi/qla2xxx/qla_dfs.c @@ -26,12 +26,11 @@ seq_printf(s, "Port ID Port Name Handle\n"); spin_lock_irqsave(&ha->tgt.sess_lock, flags); - list_for_each_entry(sess, &tgt->sess_list, sess_list_entry) { + 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 74709d3..c977337 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 @@ -4052,7 +4052,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", @@ -4213,7 +4213,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; @@ -4261,7 +4261,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 f72bd07..07ccf81 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 af4a198..c96de1c 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c @@ -1388,9 +1388,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); @@ -1442,9 +1442,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 @@ -1524,11 +1524,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) { @@ -1548,18 +1548,20 @@ 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); + WARN(btree_remove32(&lport->lport_fcport_map, key) != + se_nacl, "Found wrong se_nacl when updating s_id %x:%x:%x\n", + 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) | @@ -1570,10 +1572,11 @@ static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id, s_id.b.domain, s_id.b.area, s_id.b.al_pa); btree_update32(&lport->lport_fcport_map, key, se_nacl); } else { - btree_insert32(&lport->lport_fcport_map, key, se_nacl, GFP_ATOMIC); + 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; }