From patchwork Fri Jan 20 06:27:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9527485 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 4C23F60113 for ; Fri, 20 Jan 2017 06:29:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C02A28616 for ; Fri, 20 Jan 2017 06:29:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30DF02867E; Fri, 20 Jan 2017 06:29:03 +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 6932C28616 for ; Fri, 20 Jan 2017 06:29:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751377AbdATG3B (ORCPT ); Fri, 20 Jan 2017 01:29:01 -0500 Received: from mail-sn1nam01on0081.outbound.protection.outlook.com ([104.47.32.81]:14656 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751322AbdATG2s (ORCPT ); Fri, 20 Jan 2017 01:28:48 -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=EtxH057vw1WNbQ4fWODi7arXU/2+JzlTxJyWaCRtNIgtL45LRLOd1HAW4nbsiw/SOjd1Kq7kwHfOttsOQbWEz4Gf75fW95/1eUZF/23ewpsMTTADCelTlgrERRdDt9t5UM7WIV6stcItP12UEJWb8buyWntHuDhyAmedUejmfLA= Received: from BN6PR07CA0047.namprd07.prod.outlook.com (10.172.104.33) by CY1PR0701MB2089.namprd07.prod.outlook.com (10.163.142.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Fri, 20 Jan 2017 06:28:22 +0000 Received: from BN1BFFO11FD032.protection.gbl (2a01:111:f400:7c10::1:120) by BN6PR07CA0047.outlook.office365.com (2603:10b6:404:a3::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13 via Frontend Transport; Fri, 20 Jan 2017 06:28:22 +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 BN1BFFO11FD032.mail.protection.outlook.com (10.58.144.95) 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; Fri, 20 Jan 2017 06:28:21 +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; Thu, 19 Jan 2017 22:28:10 -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 v0K6SAPN001309; Thu, 19 Jan 2017 22:28:10 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v0K6SAeT001308; Thu, 19 Jan 2017 22:28:10 -0800 From: Himanshu Madhani To: , , , CC: , , Subject: [PATCH v4 06/12] qla2xxx: Use d_id instead of s_id for more clarity. Date: Thu, 19 Jan 2017 22:27:58 -0800 Message-ID: <1484893684-1255-7-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1484893684-1255-1-git-send-email-himanshu.madhani@cavium.com> References: <1484893684-1255-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:CAL; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39450400003)(2980300002)(428002)(199003)(189002)(26826002)(38730400001)(39060400001)(356003)(305945005)(36756003)(5660300001)(107886002)(50226002)(50986999)(2201001)(48376002)(626004)(6666003)(76176999)(5001770100001)(4001430100002)(54906002)(86362001)(101416001)(81166006)(50466002)(47776003)(2950100002)(81156014)(189998001)(5003940100001)(105586002)(8936002)(42186005)(4326007)(106466001)(4720700003)(8676002)(80596001)(92566002)(69596002)(33646002)(2906002)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB2089; 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; BN1BFFO11FD032; 1:DJKF0bhtawKJVyPK21B6siRfSwIJp3r8phO+7UJrGtOo3Cu6XpKIgLI6oJVaIDJK7UqrL89s0h0B0z2N8zvd4lOQ027rEupIf2/NRV8uJpN4XunYiVEgQafhgXfYmfcUdXuL3dv4Iy3LlQA+JQ6HeXaJJ+6Eq+zHWdR5tNPtZKtiDJIRGSSJ32lCplwwCZI+wZay72CB6O1V8ToZfr0Av8D7+XCPWII+R62aEgE0cpZiKiaQ7xIHoYwKf9WMjPP4rLBFxQUtbzhtQAtdFVkvGYAYuGnc8Lv4IGwN6UnfAHCJ6ppI0p/fCo2eaCTglepTMCXYqC5LivDZgD5Jnau0uipmuyrPBx5LhgPfmwcHsvLw25VbhCA94NkziJ1bK+/Thf8eD9aGI9AK/8/SpsR/eRXdufW1Vzh4v0IECxk8CHkwnMPbl5CAT1845YcW3Xb9RFK7TVAgHXnzh0Vn3zA7v5c5wDyiboiM713k2AzD2Jgt7ZICiFgdqJbWAg5xnSXm X-MS-Office365-Filtering-Correlation-Id: 924ad481-f25d-4cd0-1adf-08d440fd87d8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0701MB2089; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2089; 3:1kRUDIges7av2ojjZzlymVtiA0RZviHNtLrp+le02+rnCJEJnQ1BKqztIDjtXXqF1ewiJ+NfkK99VxCwQrOjxRRrXGcMU5CgT/uwJsZDbP8ONY4/7bSWpADo+i6LzSPn6W443XN8ZwtavuCeXA1UfHc8tdpP7AMUQdaarWyaMx8Z8KDm7RJ8BBrMdKROFeazV306YWOSfKxU49fEuEm5lJqg/0yfOzW5kKHc5P/Eu1cNZExhBDc5DdNVNYYVJgU17nBZoCjWCN/AyoRkz+xp8QSstNHoW8SRo8xRAa5u8ACUTpd6pBQwbHfgEKvx111Pz4T1pzRt0B+DXnCP2lq+acVctQ8PB0lJZ0lhuIQFqEM= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2089; 25:8SaUDHArIgPvTJecxXvX+sVqiSzPFNPivYNdxCE6pMvt33pXIvn66GyvDO0v5bxqzka/o0nXr7Lys9ADtMRdPnWrrH0WrFntYOEWudSZnePN7eQZ8pdgC+nzSLGsbl0uCBOS+nQrv9OzcaJakrxMX0pXsXgu8kWSgLTE8WbucIx42ihDb6ZQ1iiIbR3LiDt5jdVfsKYm0YEITiC2idu0shBdE7mABFA9Svvxv/OtHU0KTmrKmJtUjAmrS1cMpOItiJQKtolWf9teLw//Gx12UyFgD4wrvWuljjuO/27kr+5WBvPy9AUGz2fPryVTLWobs/u2DN/JBGWVYVat86A0me7POe1nUv7vg91ZA+2FvL4WuI1rdENiao+JYv9IGawzkhwt0uB9iumNxEz7QFX2HneehN4tpigtRuh5YCAxxhpI9E20BWHM26OZdpnDBTHQa5vGskCn8Qm4RexNfXJ/g8Ddusg2nW7M6O/jyVkUzIGgPzFeGOWcIJkoHQYYjv5cHPMdvC6PcupAdavDgFIgcDXdhA3d3qK4lLHMTkiqJUd3qA3t+nC60kxngqBWQ1YwVtbSKCYqugXlxJgomDbogKoU6f7DEXETgZn3fGvhObzHjgIAhGs4vnF13ex+mc8M4mGfmm3GDbjMNz84ID5xInj/Fy3f2LTfXQ7RfMCRjo4A8Pkt5H0GmovrkH7YZSB5u+CKMTaQOdKGMqWGMr7WrP2uvwt12/SFSuXfu0Jo+rBTNptplgzbrVqlb8GhWK5Ma/JqXqykibxr5iwRuPHIndXhxTo45YG/8q9BJvxIz/zlTMMMGouJDPxmY82eJmEmD0zmQ+05qrqXuCikDtb5F/8hLSS5SFkjz7fwU+jSWYw= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2089; 31:gHN7elyH7zV3pjw/XAGtj4LD4V1osPsrEjuqxH6FbS5+jZgdFju7uxrCJajUquDf77B9zoRqtWUon/V4bCjYNfSHF6tXgjwwakgKNwwLGxKr5ZhTIXySN52Dyq12RxV9ILMGc0ptW+8lF1+/5wwXTZHSqB5iK3Ha+N49TgVRWpRuExJCNuilURdor8uD7glkW5HtUOqCLrgGyjtAGyrssVT3QuwbOxEBV6T+s0l4af3gS9fK39yO+VgnN1QZmYiy6oVwy5jLem0Hrqkj6rpkQA==; 20:8Qs0Tk9m9grl5ARyh2hBcPv6tdk4r7hV0xT3BkSP+NfKO1ZtfHnErDAm92fF/AKFN9tD9czvrQ4bUlLgUTfhjjOcHqrRQKXLtEh/huLRiC+ZfZ9pav65yQ/z4DL1Han2OUJC1aej0GB9rJO03okMGH8+X7j2Rwd/9McpXn44HDdrsAjOA6I8bGLDAl0/vWWMaR0KCbBD9WzxUvf9WzjNS5YE5/xaGVJ2/s92rGEyZlVNl54Td/hpXVQTHHHV2l9w8zf25nPQrlxCtS8oSvcTQIADAi9XAZH6zHcfaeFAsfh2pCr4jHb8qDEUjKxHrlmpHjruvP8EtUtGmGqo7jGxeCVUhNDJZaynjvEKoEgP2qtt+LJMywgnDvQkToNJeL65BsJbZZmRuGUHNJXI4C0h1AMSWNRBUfS1fYjYuy5FJR287Tp1YoG67zKmTnvgTU0cy1SfEFY6Zwu/vQMARqMthrDa7gmFneX8fUHoPMLsrHtL6GDPE/GX+PNa9K7kbEM2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13023025)(13013025)(13021025)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(6072148); SRVR:CY1PR0701MB2089; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB2089; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2089; 4:cuPMGmWtJgN+xkJZqSSyW8XINHtn/Vd+EVqw9mEAxez4LA+ezrOU0PIg0zZ8kcO0/EVf4qNaI4QG0tsvB7aqZdPzVYn2/pCAEK3t89QWLhuX5cDBvEdS4FykLBYd78t44XW82+x6qG7p1ttU8sS+9O4255DE6W8mbXNh5P9hRRTy8k/VQ6uQV1nojhod6k9DWz+DFIYNT6oRXVhcnLVAHWAk1j9GwuME+0Dflq96kNLHGgEBW0WMRIq/SivGUs6k2G++Zw7eSJzJ1BqDGEYmdczhbuppSpSQdsXj5k/ZubUb8SHy/eoJ2Uw0PiNNyhIji7een9uLWgzxBIfmPWNzuivWUxMpTM7ZNB5WhDgC5BVBQHiwldyBo3M6uP6ffevHbZqNGb/zN9HDrCQodJToLtAPLOYdaGaGhmeslPzJCMQLJH+WccZBEfaILZ3hMDZk5F+bPiy3JHErUdkQnmPIiiPMItcyvPW9KYQ8L2UGhbuirxjS9BKC0b7D438liScDW7qpK0cOAb+d6HvT7QziD8zHmDEZ256mbPcATQwyVXOIK4VNoiYAxZBwJwA3tW72a4eJtsCF4IjKXz65uVnfbsvddgAHTa7pgfbKMWDkdmXubcqSozZ0MxfDT6AY8tiV X-Forefront-PRVS: 01930B2BA8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0701MB2089; 23:awQAV9J7xMtUG4Dabwyz6lu7LulXYpaWEOA1rVn?= =?us-ascii?Q?hd2WLRYM6auNiyeM8TgZm384mNKyGdReOKsrGcHjXViZTud+XjdMvqD/8RDE?= =?us-ascii?Q?Dnn683XDiLeXfvwAbyJoY/s+OGTQKr2DlQ8OtX1R6hTlgxMPUPmr++wBl/Ng?= =?us-ascii?Q?KeMTLMQHWIxYZyTBxEoywQpWyr+FguAH3dczeRG/Af1wQd+smr8Hh36IIoIZ?= =?us-ascii?Q?1DPnb86fajqA/9VFJkIpa5HkDIQzmbKaURKIYEYmEwiw4Q4l20GqWzpfL0pE?= =?us-ascii?Q?tNsoupFMViSeSjqpsTgZShy884yKrLuShYWS0RpZIe/xslzXztGkwvhLm3ti?= =?us-ascii?Q?dtzkuqMb8DmCF9ejSIXNEPM/bkoKhxn8wPidkX3SvAjiu3b/8kzMpnvHJIQ2?= =?us-ascii?Q?0a+SvK8RyOWIxdiOVFL8rl1a7Jfo4IruF7ZlFyJBYcrB2ziwyFZgOGyMGMjC?= =?us-ascii?Q?yOokfnckpcX0Qx54XZVxD6DuMtjXFtfp4BktutoP+tZuGa7bPqvmC/5G8Azp?= =?us-ascii?Q?mWWIPU8hF3CbacxzIoRE568sMAqLGfrIhBt83BAMxoa/Ge0DIuv9oK8BDbXS?= =?us-ascii?Q?JCyyGpGLQocm9xZGlXZiyb7em9RXgqXmmeNlU1mQSyk5UeDKI5wjKlx97hLg?= =?us-ascii?Q?G/3BV8AcS3G3s2ETg86IpNkO35tDFgqsvgg+FLPAXRyZWgcdL2ouMvcWil1H?= =?us-ascii?Q?l64DL+cP7gz3E+7sWTg57ErnM7ymiLA+ds1DUz9NpO9pgxzB3xrSjp41uPgc?= =?us-ascii?Q?FHG16AYUKYp1p9xuI3y+2fCubM3HDbYBM7fFVbR+FZRo7EXnwrHvpDM+2EAw?= =?us-ascii?Q?a6WNe/dtjPdzJz+tQNnG2PMxNPEZw/mo8ACwzIfhB1jhAoSEFrUUJ5IQ1jG0?= =?us-ascii?Q?DI9gzYBChisSLqbIondU/r4w2SxKU1R68gKFukeJYxvuuynAC7V2SWFk6oLC?= =?us-ascii?Q?CYl/H7hxWpZvbjCwh+1L5aujBfR89Pi6q7xAsrutLVaBLwiZ7FTJ1qh9sBCR?= =?us-ascii?Q?WklGrMQQRWLb8lZpbdiEcxADAFLD6GSU7bomLbDsWW+s9bIiT+FMBmPWDNn4?= =?us-ascii?Q?QKKvtDQ0HihjMf4E/BiLH+Ie0uipUQ54TvL5qNdjq9gMylCxn3xBKmL9fHZM?= =?us-ascii?Q?hgLT1FA30FUru5FQVjTS1C+2CeLOw5OrhAAgeAvxGRavJ2hKnyV2JPQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2089; 6:U67V7EoL2LxQ5NsWui4hjyQ7yegGZ4LDkwsAMN8LMCHelooNM1kqq7eef1ygWHvUko0L7tDZt8YRT3oMBfA5/Jk9M4/K1nOx/tLX2Vp/dKhTCSwqrgtKq06tcv7YwwnRqj5JKM6giO2HyqrgCQo5aG7motuvqiIFcpHETv9s4BFjvuWKI5/lcxNFOKVrBRTwE4u8nBmXlHNjU4Iu3aZQk9o2YtMXopCfNw6pK1lzPFFo3+cmMfOKIPo/pjoFz9CNcgEL9mEREkeiVUwosKWUlFMBXFpOdXlqkvmZsg91fx5J+AwrW1RG8B8JxOK1L+E2bvF4Y9BRb8yWKeu/TNLr+UCdK3OP1mEVQbZWqRyIRV9n4ZBkBl4Y1jDBdfJUOvkpwNRUnQ+l/XPpC6k3wzqlBLkcm2EQsOq21EziOkz9e6k=; 5:ZUien8bpg/B3qUjJruA/uXCQEtH3LGofhZglb9Lcknk1htsyoIUy9YC++PVt4BzbI9tv9311HGsDeTYxkrx6armMOObFM5VHS3XO9pXJAPTEoqYSpmteN5FqIVbneJpxUhpAmJip0UIs75oeaH68dvkOiNpXNQ9z8cihWEAUDfs=; 24:TLO1AViRVtHp1rT5GguceHPLHl6DqxtieNYWF7KFbrVnlM9INN3gy4RY+go36PePuY8dtnCKGJ8eqOV7zhpaQEkljlsIfljjSSwxXXmJj7I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2089; 7:0RIFwrNJrlL9BuBd5e2nRC9KkKCwNakg4jWkrntziebO3gq3LgStrvH5kk7s6vAU5UeUeea+6u9b1rHwvHEVzvhZTsOnJIL/PBPfyIHoyh+3X4b9w8aOqXwUcU/jIn8eZxKrNIiCVk6eyBUl03rUqdByMXg0b+KrFdZ9z1pZU6rKW/dvRIocpBN9N6zb020RzcXd9vLnUxhTfraBo+fPdxJ89GNQVPDEtK50WTOHM2MfVatXa6Y0IGh1HsxPDIk/o+Jg3+j7b4biyIJ0xIXhjTzOIWVFv8rG1l5XltXt5E1eLZ51IWvnuMyVMtQTv76nCozGklFXOJ89jwlNN9b6Sop8DJ8amSLkLzGY8HAdrErIGjgkRA85WWdzRqwN6gKEFvEa4z/sq6EbG8EHiX6ZLxtWNtkg9AkSr8rtaiUbWwwwbVQLYwHXb63S0MaaSUZHlwd65s2OwTm3UuwLATMUfw== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2017 06:28:21.2484 (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: CY1PR0701MB2089 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; }