From patchwork Tue May 23 23:48:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9744473 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 347056037F for ; Tue, 23 May 2017 23:49:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 274CD28818 for ; Tue, 23 May 2017 23:49:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C2F528854; Tue, 23 May 2017 23:49:57 +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 799C328818 for ; Tue, 23 May 2017 23:49:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031849AbdEWXtz (ORCPT ); Tue, 23 May 2017 19:49:55 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:31817 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968842AbdEWXtd (ORCPT ); Tue, 23 May 2017 19:49:33 -0400 X-IronPort-AV: E=Sophos;i="5.38,383,1491235200"; d="scan'208";a="21096451" Received: from mail-sn1nam02lp0015.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.15]) by ob1.hgst.iphmx.com with ESMTP; 24 May 2017 07:49:09 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=FiPxvT0W9dUa4LrBkYkSffpH2fUPW/WyOz0W3oaqfY8=; b=HzF399sKQCVx9hVCFa8DLIFAFk1MzsF+FVOmcpQm+CfkSj8PTyu8mk4Wh4SvD61rHUACKODUTC7HjQmvsYRgi/W/Qnf37TgRjVCynI0ZllcsRCiyTcXN5c5c0PmpKsuQ5vObUswSBGKLCCUl+KDi0q1SvzhUXDa/spVZL7hmst4= Received: from CO2PR04CA0109.namprd04.prod.outlook.com (10.165.95.11) by MWHPR04MB0366.namprd04.prod.outlook.com (10.173.48.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Tue, 23 May 2017 23:49:06 +0000 Received: from BN3NAM04FT025.eop-NAM04.prod.protection.outlook.com (2a01:111:f400:7e4e::205) by CO2PR04CA0109.outlook.office365.com (2603:10b6:104:7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9 via Frontend Transport; Tue, 23 May 2017 23:49:06 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.225) smtp.mailfrom=sandisk.com; linux-iscsi.org; dkim=none (message not signed) header.d=none;linux-iscsi.org; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.225 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.225; helo=milsmgep14.sandisk.com; Received: from milsmgep14.sandisk.com (63.163.107.225) by BN3NAM04FT025.mail.protection.outlook.com (10.152.92.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1075.5 via Frontend Transport; Tue, 23 May 2017 23:49:05 +0000 Received: from MILHUBIP03.sdcorp.global.sandisk.com (Unknown_Domain [10.201.67.162]) (using TLS with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by (Symantec Messaging Gateway) with SMTP id DF.64.19026.07AC4295; Tue, 23 May 2017 16:49:04 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.319.2; Tue, 23 May 2017 16:48:58 -0700 X-AuditID: 0ac94371-41ba798000004a52-10-5924ca701c50 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.9.6]) by (Symantec Messaging Gateway) with SMTP id 90.03.18148.A6AC4295; Tue, 23 May 2017 16:48:58 -0700 (PDT) From: Bart Van Assche To: Nicholas Bellinger CC: , Bart Van Assche , Christoph Hellwig , Andy Grover , David Disseldorp Subject: [PATCH 22/33] target/iscsi: Remove second argument of __iscsit_free_cmd() Date: Tue, 23 May 2017 16:48:43 -0700 Message-ID: <20170523234854.21452-23-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170523234854.21452-1-bart.vanassche@sandisk.com> References: <20170523234854.21452-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLLMWRmVeSWpSXmKPExsXCddJ5kW7BKZVIg+PLxS32z3rGZPH1/3QW i5WrjzJZtK0+w2jRuvQtkwOrx/3tR5g8dt9sYPN4v+8qm8fm09UenzfJBbBGcdmkpOZklqUW 6dslcGVcefWfvWCtRsXd7UoNjD8Uuxg5OSQETCR6Xp9m6WLk4hASWMoksbNrCyOEs4NR4l3v BvYuRg6wqsbjERDxjYwSq95uYATpZhMwkvj2fiYLiC0ioCMx6+4LdpAiZpDmiSt3s4MkhAWC JPbMuc0EMohFQFWi4a8nSJhXwEHi4cYlrBBXyEuc3bKTGcTmBIqv3LONGaRcSMBe4vJ3ZZCR EgLTWCVaLl1ghegVlDg58wnYXmYBCYmDL16A9QoJqEucXDKfaQKj0CwkZbOQlC1gZFrFKJab mVOcm55aYGiiV5yYl5JZnK2XnJ+7iRES6IU7GF/f9j7EKMDBqMTDm+CgEinEmlhWXJl7iFGC g1lJhHf5BqAQb0piZVVqUX58UWlOavEhRmkOFiVx3izZqRFCAumJJanZqakFqUUwWSYOTqkG xpOf2S/8V575QkKLPf78irwIwQPnDllP7d15/NyMORoNjOekd+XvTZ7y5U5t/zHB/veJgc6H q0VYdpuLylnx7vGZcGvThwVKs7gqbj79uGWfsWek5TXH+ftTrxSGfVlz4RD/t7/O6V+mKt8J PPTta/yVc/F21w9kMu13Ktu58Nw5h9V6lYE/l89VYinOSDTUYi4qTgQAWmHveXACAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDJMWRmVeSWpSXmKPExsXCtZGTTTfrlEqkwZo9Rhb7Zz1jsjj4s43R 4uv/6SwWK1cfZbJoW32G0aJ16VsmBzaP+9uPMHnsvtnA5vF+31U2j2lrzjN5bD5d7fF5k1wA WxSXTUpqTmZZapG+XQJXxpVX/9kL1mpU3N2u1MD4Q7GLkYNDQsBEovF4RBcjF4eQwHpGiU/T p7F0MXJysAkYSXx7PxPMFhHQkZh19wU7SBGzwC5GickTToAlhAWCJPbMuc0EMohFQFWi4a8n SJhXwEHizOEPbCC2hIC8xNktO5lBbE6g+Mo925hByoUE7CUuf1eewMi9gJFhFaNYbmZOcW56 ZoGhkV5xYl5KZnG2XnJ+7iZGSHhE7WC8PtH8ECMTB6dUA+NMt/kcfd6VH8/c+nBRtvN1QAXX trUGXEI/9aVL/m/80uWo9j447Y3tCtMXfpp2+jq/49Ua2NJlei9V3YvkvLO03Epxema2YNak hcvecHFEzbQ7otXx84gGxxG3SPv4X+1Xl62fFOw0b7n+vn3S15a2aMfOiCvd8LJjsuKlbcU/ l53wdU1++FyJpTgj0VCLuag4EQAddk46vwEAAA== MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:63.163.107.225; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39410400002)(39400400002)(39840400002)(39860400002)(39850400002)(39450400003)(2980300002)(438002)(199003)(189002)(9170700003)(305945005)(106466001)(76176999)(47776003)(6916009)(2950100002)(1076002)(50986999)(48376002)(575784001)(5660300001)(33646002)(53936002)(110136004)(189998001)(356003)(478600001)(4326008)(38730400002)(54906002)(72206003)(50466002)(50226002)(5003940100001)(81166006)(8936002)(77096006)(8676002)(86362001)(36756003)(2906002)(6666003); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0366; H:milsmgep14.sandisk.com; FPR:; SPF:Pass; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN3NAM04FT025; 1:FiMpxP32ZpHaGh12gn6W2gtCUrMr3ybBYzO5iYfKmjyhmaX541KSp7u+RrOTiT/4ABx8GBqKhQR/Q2J+BJuTfvtagGFSRBEat1wo1QOGM5PERaVtlSDkpnbrIj2/qxFG6rtXNLGTN2HbxTsAhcm6YWMHbnNgtG9Ch5IIu54Ft2R3OKCCWmu63MfzEUbKL1qFD5xR95OePo8t7RxwdMS7qxkCikql91HSO1QKNvyywnICBs3Kqqxc721JBioOWP2CtqzuRZEVShMopnFFScxpmMgNqKBcQO3W6F+hcqTdIZ78WGtkCQh8VRKVDRWJJGDVwngBmvwc/4pmmQZR5ghuvTm9XHL+mt+BXvbq1Pafj7BQqqNlGnHbRlG5dfpWTk/Ag4Mw8PktdYc681BBmUZx/YczQTyEHZal2+olJKSTcP5cGT69s2dUMN4wzJm2IxjGKKki770/UFF+I0ptmRU+Q9sIxnNTmGfNPh4TUq7xQPNPxNuEodV/gx8Tc2jY7L6O X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR04MB0366: X-MS-Office365-Filtering-Correlation-Id: cf14fb78-a1bb-461b-bc1f-08d4a2364c52 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:MWHPR04MB0366; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0366; 3:m0UZIAXaNNEiTsexIUPEF+RaVakT0iN07EcxfvygTAr44ycxhwbVgcK0fQt6jDCwkzO7Eu9EF72+tOESpDLPhfgQnsSKTNtQMm96kHJnHTnuIUXziICYVlL9YqFzogmPytSBQ/kx3QxKIu8Kac6ZVtUlTV+pjHGeBzBWcgofI9/LTUD1MrpsvyP7+uYJIQaSKJL425lv3tmse4jgEcaTuhdd64Dqlp/N5BRpnUg+zeQM2yi5ujpJfmLjqIWEtd+pl9UARJM7mZwj7TyXr/Yim635fDP3CBnRQSxkmypZ64eqOLinwRAnxN9ocOK1twgbI9SeVHmF+kQpII7lM9AZc7PwD6kR3BJP+MZOYlUepQgJwgHIVkFSqTknFdTIVVYZFZ2tJyMr7Y0kuHNb8l977KoCxfA/m2alQx6vI6GmfWeyGxHfGQ22l826AlXWdryjnRbcIXAMPKJyQIxdupy5UbJK8UcI4n+jpaTYTHlthd9Mszsx50z574Ms/J/RUVyO X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0366; 25:iKsxjka4cl++IVFcLFRYXLnl/i6gHOIWf4UB3gqOB2EEgfCkr9U/zerGZnt1Areg72WTEbjj3xZ2hxrm1uCH0NEtM9vT+9WCeBnJHmzzsAI8M0Q+/OurGdCT1kgbleetcBe06nDX/jK2ZPi5KpGFYwTapu7KXa3DxA9tTzRr82hjANx+PN+mhhoWKeqlUtt3hEklSMJlM9jJLtKLxFff+jrpAFNJohvx3B1VkM/mbeELc6KmFKqEdVRq2fIxdQvcYL/XucX4J0PZ/v7bDEHeSa8jOTymsfxQLw+fOr1I2ECp1+w8G7ruY/xuNJ9hweu0IaMFyV9AbUxI0nimAS1kZX4DN9I0QAGBq8b+n4SiWLTlgWvrajOOkO7naD6Gebk4JFB/nAWBe1gtPMJwr4msPsom78/SLFbNLefhFkg5qUlWspgphpOhzqaAyw9R4/EaTz+j0MHavbS23iTnMEt2oR+W4BPFW0jQkXZJxV2jn2A=; 31:n5iWBHTaiqfUeZx/aVlOdTP/oEKwXm12KCgrat3Wj1T0eSt6+aLEd0RVYvZ8hksojM1MfeOQhwnbsIU/gq7dltIyZtbR3SBzPTM+XuYuOyACyuEVfWNqp46Byk9w8eqU4POgVeZA2d/mXCnqz5qWGFum1NjokHEx519Srx5OQeE0AcT6i4tUA89b/qIR5Tx3hEkXYc+phKNfCINcCyQr1XJS7mVteHcsdJfNqmun8KRQek2RPqaXH/R28Tq0Y645r0zVAPMjKxogs3Kwzf2Fog== WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0366; 20:qKRGtUF327VzcOBS5SnZxCpH+srIrxVM3Tw0HnwsD4TcTFvVHCalsn6s7iNZLA8nSmwFHbXq4LnAAC+we9SRSDSncJn7g4QnZBclt2B8QR5vfS7qbV6XWSYPXd7gmQC9bA4VT4QlRJbcl9STQyFSVM1I3FpneAfjFM0fbCv5yegS28dVy+QqQEW8SmnUJc0ha2VnEHvYquIrP/5KnU0u2B9RA5FTAeYzEFmq2QD5neqIdnoG/teSC94PgsvWQ08TI5JnxdokRdIJqSvaOB1oxlTwZGBtPFFfhRFyVz0w+hQhieG0JvmM1fQx8escViWlxqcimPbMJrfv5cfEWJNoOHrkZprVuLA54pQmBc1J3OA1YZUEaQ6f/EHwHw1gQWXiQNgPO89L6K/m3y/hZ1DRVkeNww6CHNQQc+DNoSRvU4NYOqr0OvD72TSneWrL1FtfsUT2Gk4lQpMCyHtynF0UpYXv+hCDQSJza/5qdt+Syo8HcohdV1qKFzd3LwWTJT5t X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13018025)(5005006)(13016025)(8121501046)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123562025)(6072148); SRVR:MWHPR04MB0366; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0366; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0366; 4:ys5t8Zkda/+eq9lCJhT+FgP3Qpz5hBXyGZh5GT8SBdo6n9tnyxrL/H3sdPYmpMokwD3j6D1cMEGk+1RrPMjfs+ZJBFWbNVxrCmXxJ2l1dddCXZ9cbLmwPKTTxRlaotQbdQTjlGI7abGFbghfsQT7xp6dGRq2JNNI5v5pYlBKViIZIGNsaNh2ujyzRCBtk7QWgftJ7tcXnrrsdhDmpNryIABvC4LVwJCh2h7wi3qVf0Gx7fmMGZxhlbqhAoq3mNvfyKmVX/679pzfjLXdD4wqj2Ai1v4fxKixxOaAqg0pDcgFrkneJrOm++1tOgugp0A4fIujlpco83f1LftvA+5EadkqehFCXqvVJOPwArJkz+RWgZhybONEWyDvaQI0vWWpaRU+Mz9gvl0XOmn4Njhj8hip2N45jr1awhiqMyxwh6hSTWaspmvL2zpkMEVOg5OVOVUx2AJZpOQimtTL1Iq/vU9fxqf28isGg03Bkh6Mz8BcSsqlOk+PHhqt1aOfO6c3KlbPvSlTSZ2lEF8Dd/XZxlV+D3vLWmKV+TuwMTnDURNuOQRclvI3cblruNsv/C53//4rFJQSh9KIFTshHb6Cm8HCJuS6mydzdZm7QWNCzqxecvs8tl3spwGuCscl1VbbiMcZfutS0qMZxqkKFXhrdNZKd7cR3KW5sqAC0/+HmDxGzoKBEewHUVISt/Tu6ibO8qtiS73hMO2p5AqKRx217i525/kbMUMrPD9wg7eJK8BSLPvGWXWn+svQ6Vj5IlII8vIHnde4VZ4jP+JD6f4ZRT9xqosfCZ1inuanuOAcW4hrktbV8vuE7wvMJjkpTFPVwFqTUQHN4Hntl/92hh5TO7C0f1R0y7cwLtnU7QIG36udRoElh3sxUOwgWtiRd113 X-Forefront-PRVS: 0316567485 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0366; 23:SiEoMENtUsqnXgxG68dhaUg1zdhbal04qHPCJjagF?= =?us-ascii?Q?0oMhf0vLLTqloomMcvYUYcj2S9kLlCfVVUCckGqqAYV83Hep5qCCAzDV0UU7?= =?us-ascii?Q?4ZqsSHfyUbDh1IrqziYz/Oz4vLDftukewDH5ycwnSs4sNRID+KFu5Nz1iFs1?= =?us-ascii?Q?+LMpnvAZSZ+Ut7hFGiH4p2Lhm4EzCeDfmmLxq8Gz56ajqBgOkkaXN57ExkPW?= =?us-ascii?Q?aTqdBy1kyWKLLkn69LnIY4fFtelohISLUj646dgqloHqz7o0N2PLs/AGhuRN?= =?us-ascii?Q?PZrSCobiLWAAcKOndZTBAJjNvBMOl/zS1jmuWiMgTxpTzpIjTFc6AQhq5Ea/?= =?us-ascii?Q?NBEComfLewHLCkq3BjY6GUM/sqq9N/hvvltYNmOsyVVX9Zoc+Kaf2Yf+Widk?= =?us-ascii?Q?AF2uzZ05tUWacLWTHP7txy+EXbCePhtvCmbD0sk7sqgCKnZGq4UGSD4wIWGz?= =?us-ascii?Q?jdsWowdTc8Gkjx1spEZJ2g0OX0N7Bn6OXPwskvWdYu+VKKMcmUn/MBX2Es6a?= =?us-ascii?Q?XEETGoFrGJjlr722GmyRQB89OwW86giS9d41mT2fAU1vr2cLvtlgUoD2tB3o?= =?us-ascii?Q?iGpEugkr+gNJ6+uRXXI5FTUog6sX/FluHkdejUU6jLBbagpcGFWi34MS+OWZ?= =?us-ascii?Q?1eFIXiD3B1aRwsCtTqcAKtfvKXC+mev/5RjpaC4RIUTF49KIcMLH6f8tBCUg?= =?us-ascii?Q?AR+CSOjmuPg8MC+QzagBtwI2Lg9iVibCo++0zYK1FuARmmUJSH+XE84KRsND?= =?us-ascii?Q?SpzX4tbU0bGO3Z+t0hkvariGE3A4RMMT+CIWcvDRjI7zYi0e8F1ttC+FLoDu?= =?us-ascii?Q?opHaCRe/sf04LdYjfUaDpkVEWSpgy02k25kIBbSXCsHWDF9zUSUwMRmJ/3t/?= =?us-ascii?Q?qBgJUFJjVIGztWoJM0LUxlQhdsV+89HkSNp/fq5Rs2Tug1Ptdxy2pPiHgsOS?= =?us-ascii?Q?PraUaVXeplEaEDZleWoW4mU9co5Geum/8o4J+YC2RIH0mpRAkVGwS5jfcJVu?= =?us-ascii?Q?AejB8sW90tHl785PSTN/5ArjEy9hUIrfA8VphrrCTFDTM9T2D7LZL69n/lQy?= =?us-ascii?Q?aTkUvHh3bQvCeQGd7mNAwPT9cxmYzKZDP2bkyLZYQBzVfazk6T1pBFUSAd/1?= =?us-ascii?Q?B5xmQxBLZM=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0366; 6:VYki+aZcrlWd9qIe5Mgb+8AFrYvoG+lCwWDWmKGLrnp3sj+fMaCe6t3vK2L5zfxxiitly9JeEsJZdLP/l1MM3HL6Dg01W/hD6SW3H4iQOcMWovTnxJmOwk9m5GQ+cFoE2BLfBk3yIasDKVdwZ0/SaGQ4NOxxRL7+BgK8h8r4yGM3i7Ti/aCCKRUjXowks4RUoSofjG7CmJBpMTwQkKBaWN7/7yU3eMvp9/BXwriuLrd4hph/2vcAttgqn4TGelY2RtopeothF6xs6z0r5HV52cERxRkdSLoxEDhbOPD6/CWyCYgRH8OJeJEAXQNWJ4PTtPu94Ew7HRZtFJiruSpfwL+pWPHbPxajAeWVgjl70PHFrfEh4v+NmRCE1wJfzVPWywZ8qfYQ3AGPhRql6NNQvzlkrDZ9stuIJnbmi0ftxFv8OFtDU/lfg4za1yyJxVboiiKwxg6xhaYh1Q5BNxJ42Y8ee2GC68PFi8qbEyx1wbVZvxayXEhVtNN5fSVDa/Yudmdw3QWQNeryKAVkBl7MnLLLorTzkKZcaPjEH4s+szg=; 5:sNnyLALHT5YFCSr34xV2P5yLwtm9nfwAmf8HlNjZ2acS19l6++saMzinlAv5gC+mRaumG0wce0LafskX9FilPs+pVAWGlQhQieX45SzHay7WNFYGdyjcxS0sihRjni0CKXmrcAukOn8/icK0fsO6Bw==; 24:hd7lYepk1UaiGSfubPE6IveDHT0n0QGuERPkXx60NwUBsgQxVZfrQvlZDap+kqOGYagJEc+TElR2eRegHgdeM51fGy4IeYRLWmi+2Oqnask= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0366; 7:Kf9VSExQK7Y50ycUZ0Ta7hVJMi1P182tOrNTKJ0Bw2jwArw+WiLxUSiGDz5QC24cUT0Bq9WOBDVQ3ucgNp7Jt4S3jpWVaY6E/FNicv9kXCJQHRQjF+8tWrrFpK18Rg7O4aPTlH9mDucCu8mAh4YwYycjzXxEYJNBe//VNWS1zwUuVmiFF/H0Iao+aZg1x6yaWAAqZH452RaezzsteoXODP9cQ+rWEMjhwSGX5OAnI+V1yuFh8N08pdHWSALr6QKp1l/2J3yzr8GBseWW3TSsTn7b+nPEha8b5b/m+JmF+VFio3wfhmOi+ohxHfyB00OHJJsLyaYATt1/aatRS9PSrw==; 20:ITUd9JVeACmMsSRJNbqjA85Mg+X7RxeN1j9J9/onxr340Uv26P18+JmyE0bO6gzBFdKy1K0d8HonCN+g7MnbxO8P15S0MWmNLss5cV7wfu18YqXBITzwHTnwCH/1Bko0pDUCh/I80BEEJnOeCuyK4aR1xngAYl9UdHh3SUaI6YI= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2017 23:49:05.3506 (UTC) X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=b61c8803-16f3-4c35-9b17-6f65f441df86; Ip=[63.163.107.225]; Helo=[milsmgep14.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0366 Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Initialize .data_direction to DMA_NONE in iscsit_allocate_cmd() such that the second argument of __iscsit_free_cmd() can be left out. Note: this patch causes the first part of __iscsit_free_cmd() no longer to be skipped for TMFs. That's fine since no data segments are associated with TMFs. Signed-off-by: Bart Van Assche Reviewed-by: Hannes Reinecke Cc: Christoph Hellwig Cc: Andy Grover Cc: David Disseldorp --- drivers/target/iscsi/iscsi_target.c | 4 +--- drivers/target/iscsi/iscsi_target_util.c | 29 +++++++++++++---------------- drivers/target/iscsi/iscsi_target_util.h | 2 +- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 26a9bcd5ee6a..083e6228c99d 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -488,15 +488,13 @@ EXPORT_SYMBOL(iscsit_queue_rsp); void iscsit_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd) { - bool scsi_cmd = (cmd->iscsi_opcode == ISCSI_OP_SCSI_CMD); - spin_lock_bh(&conn->cmd_lock); if (!list_empty(&cmd->i_conn_node) && !(cmd->se_cmd.transport_state & CMD_T_FABRIC_STOP)) list_del_init(&cmd->i_conn_node); spin_unlock_bh(&conn->cmd_lock); - __iscsit_free_cmd(cmd, scsi_cmd, true); + __iscsit_free_cmd(cmd, true); } EXPORT_SYMBOL(iscsit_aborted_task); diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c index 7d3e2fcc26a0..41b9e7cc08b8 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c @@ -167,6 +167,7 @@ struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *conn, int state) cmd->se_cmd.map_tag = tag; cmd->conn = conn; + cmd->data_direction = DMA_NONE; INIT_LIST_HEAD(&cmd->i_conn_node); INIT_LIST_HEAD(&cmd->datain_list); INIT_LIST_HEAD(&cmd->cmd_r2t_list); @@ -711,19 +712,16 @@ void iscsit_release_cmd(struct iscsi_cmd *cmd) } EXPORT_SYMBOL(iscsit_release_cmd); -void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool scsi_cmd, - bool check_queues) +void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool check_queues) { struct iscsi_conn *conn = cmd->conn; - if (scsi_cmd) { - if (cmd->data_direction == DMA_TO_DEVICE) { - iscsit_stop_dataout_timer(cmd); - iscsit_free_r2ts_from_list(cmd); - } - if (cmd->data_direction == DMA_FROM_DEVICE) - iscsit_free_all_datain_reqs(cmd); + if (cmd->data_direction == DMA_TO_DEVICE) { + iscsit_stop_dataout_timer(cmd); + iscsit_free_r2ts_from_list(cmd); } + if (cmd->data_direction == DMA_FROM_DEVICE) + iscsit_free_all_datain_reqs(cmd); if (conn && check_queues) { iscsit_remove_cmd_from_immediate_queue(cmd, conn); @@ -738,23 +736,22 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) { struct se_cmd *se_cmd = NULL; int rc; - bool op_scsi = false; + /* * Determine if a struct se_cmd is associated with * this struct iscsi_cmd. */ switch (cmd->iscsi_opcode) { case ISCSI_OP_SCSI_CMD: - op_scsi = true; /* * Fallthrough */ case ISCSI_OP_SCSI_TMFUNC: se_cmd = &cmd->se_cmd; - __iscsit_free_cmd(cmd, op_scsi, shutdown); + __iscsit_free_cmd(cmd, shutdown); rc = transport_generic_free_cmd(se_cmd, shutdown); if (!rc && shutdown && se_cmd->se_sess) { - __iscsit_free_cmd(cmd, op_scsi, shutdown); + __iscsit_free_cmd(cmd, shutdown); target_put_sess_cmd(se_cmd); } break; @@ -766,18 +763,18 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) */ if (cmd->se_cmd.se_tfo != NULL) { se_cmd = &cmd->se_cmd; - __iscsit_free_cmd(cmd, true, shutdown); + __iscsit_free_cmd(cmd, shutdown); rc = transport_generic_free_cmd(&cmd->se_cmd, shutdown); if (!rc && shutdown && se_cmd->se_sess) { - __iscsit_free_cmd(cmd, true, shutdown); + __iscsit_free_cmd(cmd, shutdown); target_put_sess_cmd(se_cmd); } break; } /* Fall-through */ default: - __iscsit_free_cmd(cmd, false, shutdown); + __iscsit_free_cmd(cmd, shutdown); iscsit_release_cmd(cmd); break; } diff --git a/drivers/target/iscsi/iscsi_target_util.h b/drivers/target/iscsi/iscsi_target_util.h index 9e4197af8708..425160565d0c 100644 --- a/drivers/target/iscsi/iscsi_target_util.h +++ b/drivers/target/iscsi/iscsi_target_util.h @@ -37,7 +37,7 @@ extern void iscsit_remove_cmd_from_tx_queues(struct iscsi_cmd *, struct iscsi_co extern bool iscsit_conn_all_queues_empty(struct iscsi_conn *); extern void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *); extern void iscsit_release_cmd(struct iscsi_cmd *); -extern void __iscsit_free_cmd(struct iscsi_cmd *, bool, bool); +extern void __iscsit_free_cmd(struct iscsi_cmd *, bool); extern void iscsit_free_cmd(struct iscsi_cmd *, bool); extern int iscsit_check_session_usage_count(struct iscsi_session *); extern void iscsit_dec_session_usage_count(struct iscsi_session *);