From patchwork Thu Mar 30 17:12:41 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: 9654853 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 6F91A60113 for ; Thu, 30 Mar 2017 17:12:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59C59285BD for ; Thu, 30 Mar 2017 17:12:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D732285C1; Thu, 30 Mar 2017 17:12: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 6CC72285BD for ; Thu, 30 Mar 2017 17:12:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933245AbdC3RM4 (ORCPT ); Thu, 30 Mar 2017 13:12:56 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:58725 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933024AbdC3RMy (ORCPT ); Thu, 30 Mar 2017 13:12:54 -0400 X-IronPort-AV: E=Sophos;i="5.36,247,1486396800"; d="scan'208";a="7351627" Received: from mail-sn1nam02lp0017.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.17]) by ob1.hgst.iphmx.com with ESMTP; 31 Mar 2017 01:12:54 +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=h2a8bAvTLK3RlegXnFRrn+Eaomt7xLh/GPiTKVHff5Y=; b=AXksh+3siOhD266/gK2AXocRuHFmc93mJu/RMVUsVt7fOEMOW8OPY19+W9YBjkYL4FgJ7Fi6fUrITEx5Wu4nLwxPTW+yqabUv5hWNzHZ3gS9q3wN+H96vVN6LA1Rk6Epa1Mm+ktxxkhGmzntdmPbIM3/d/J0qlwnxe2VrhpTG6M= Received: from BN3PR04CA0041.namprd04.prod.outlook.com (10.166.70.179) by BLUPR04MB104.namprd04.prod.outlook.com (10.255.213.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Thu, 30 Mar 2017 17:12:51 +0000 Received: from BN3NAM04FT009.eop-NAM04.prod.protection.outlook.com (2a01:111:f400:7e4e::204) by BN3PR04CA0041.outlook.office365.com (2a01:111:e400:7a4f::51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10 via Frontend Transport; Thu, 30 Mar 2017 17:12:51 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) 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.21 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.21; helo=milsmgep15.sandisk.com; Received: from milsmgep15.sandisk.com (63.163.107.21) by BN3NAM04FT009.mail.protection.outlook.com (10.152.92.126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1005.5 via Frontend Transport; Thu, 30 Mar 2017 17:12:50 +0000 Received: from MILHUBIP04.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 E2.BD.29323.09C3DD85; Thu, 30 Mar 2017 10:12:50 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.9.6) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.319.2; Thu, 30 Mar 2017 10:12:49 -0700 X-AuditID: 0ac94369-1d7ff7000000728b-48-58dd3c908cb5 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id 4C.29.18148.09C3DD85; Thu, 30 Mar 2017 10:12:48 -0700 (PDT) From: Bart Van Assche To: Nicholas Bellinger CC: , Bart Van Assche Subject: [PATCH 3/6] target/iscsi: Remove second argument of __iscsit_free_cmd() Date: Thu, 30 Mar 2017 10:12:41 -0700 Message-ID: <20170330171244.8346-4-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170330171244.8346-1-bart.vanassche@sandisk.com> References: <20170330171244.8346-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrILMWRmVeSWpSXmKPExsXCddJ5ke4km7sRBjPiLNpWn2G0aF36lsmB yeP+9iNMHp83yQUwRXHZpKTmZJalFunbJXBl7O8MLzijWnFg8y7mBsbn8l2MnBwSAiYSq1ae ZOxi5OIQEljKJHHo2ytmCGcbo0TjjClsMFVXL+1gh0hsZpT4/G02E0iCTcBI4tv7mSwgtoiA jsSsuy/YQWxmgSCJf7v2gcWFBQIkfjxeDRZnEVCV2DStlRHE5hWwkzgwdxLUAnmJRZtmgNVz CthLXLi2CKxeCKjmXXsf2GIJgccsEis3PoFqFpQ4OfMJC8QyCYmDL14wQzSoS5xcMp9pAqPQ LCRls5CULWBkWsUolpuZU5ybnlpgaKpXnJiXklmcrZecn7uJERKwmTsY7z7xPsQowMGoxMO7 Q/BuhBBrYllxZe4hRgkOZiUR3g5roBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHeczJTI4QE0hNL UrNTUwtSi2CyTBycUg2MUjztXv9v1R4zXNTy9tVB+VdvZht7Fe546eK1KnIZx+Rs2XkGHFuq 59orP3U323jPOGtp4hk2znQjHh5rYcPKA8FVc+UnB9/5PNv8jczPNVWfjpX+KRdY/vHK4Wns bCd6vwa+PvKGk1Pk1eu3Xm1f1vO/kf9scZlx5bmHHvvW/zeSX5FS7mDyU4mlOCPRUIu5qDgR AJFAyo9UAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIJMWRmVeSWpSXmKPExsXCtZEjRXeCzd0Ig46t0hYHf7YxWrStPsNo 0br0LZMDs8f97UeYPKatOc/k8XmTXABzFJdNSmpOZllqkb5dAlfG/s7wgjOqFQc272JuYHwu 38XIySEhYCJx9dIO9i5GLg4hgY2MEtP3TGYFSbAJGEl8ez+TBcQWEdCRmHX3BTuIzSwQIHFs VgsTiC0MZP94vBosziKgKrFpWisjiM0rYCexav4rZogF8hKLNs0Am8MpYC9x4doisHohoJp3 7X3sExi5FzAyrGIUy83MKc5NzywwNNIrTsxLySzO1kvOz93ECPY0Z9QOxusTzQ8xMnFwSjUw 5q8rO3rvhPv6U8cTBX/YbtQRiFxmv6No8YLtp5rStc+6fvHfqyMl7Kjs0sBxavumHVlylaWT hd/qOocH70hIfpYrxmwXvIH7RNObfZJ3ZzyvcK12v7ZPqXqC/4PrWy7N2qf9efe5WS7pFw+F R8cyaT2ayCU5o/fqpT8p31bPTll4wWG10cmZDUosxRmJhlrMRcWJAIt5KBykAQAA MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:63.163.107.21; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39410400002)(39860400002)(39840400002)(39400400002)(39450400003)(39850400002)(2980300002)(438002)(199003)(189002)(9170700003)(4326008)(305945005)(47776003)(1076002)(5003940100001)(356003)(8676002)(38730400002)(110136004)(107886003)(54906002)(106466001)(81166006)(36756003)(33646002)(8936002)(50466002)(48376002)(5660300001)(53936002)(76176999)(50986999)(6916009)(2950100002)(6666003)(2906002)(86362001)(77096006)(50226002)(189998001); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR04MB104; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN3NAM04FT009; 1:Eraz8yX1ju05vexmMGSZPP8T2z3zcLYmRNXniZPEqfZ6jqQ+ACzNl4XbKtE6IIB4LTuglLMMm3vtZUhMeOZlafrL57yADP4PZOGfDWu867ifOVCxC0bbCewn+Yt4V1KdZdhjRXlrIRj/QjlNGJ+GQLGlP8B4N2DgmVUmzrcUo/gZt8DsPPah46gbz+V7WzFWyEZVVco32GDDyaQq+mozb4YWLnhdkWpW8VPblh1ioBRLV5bjpNDtodD7JsZHClGPsu6Pg+ZOTwHur5/jP4sTXw5bWxrAMMa8M0XTXKkRFfIGq+XaXocTHOhH3k59yj4ygozT0tSKh9JPUvB1KHeTWkWFj0OezGGl94jjiHeQ2JfUcaG3LGb/RGAIt3qkBZSjjGEcNXhHVkogrYQ+VLW3yGJzzeD+TQB9Ik7kSny5WI3OEZ5Bw2vG6xzn9x1eVtuS0SA7cHmvgH55teG+ZKMGzbz4WAZF2JdlpFqOGmLr0dfzDP8g51IhszprnFXrHl6I X-MS-Office365-Filtering-Correlation-Id: d3a13e0a-e40d-47c6-ae8b-08d4778fff0c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR04MB104; X-Microsoft-Exchange-Diagnostics: 1; BLUPR04MB104; 3:pcZfIDK1gUQucVuwdsuy0ymwabqzJ8esf4x2BgyiXmce/lSnzgP/8EC0qaz9jl4hjXQLHHbVeTuklIJ3iajytgaCrJx7tZVPKMBNoPEkIoo8u5iu2AqhFI7py2iq8IaSpVto+yX+lkUOH9Yi+Cd6UMZUK0MdxqMMSLh7O+BelpapYB0cS1Gkp4/sdsmlgA9PYh8LR/3rAQ193CTWLjzmLazKPkEFHgKLp/u3fiM35ZbmtcVP/XnSV++xbIJaeb92J/wjws3N6LLBPEpCGArH7Bql1jfPU+9aYdX0mMqAsUpfKHgelA/GBWhhLgO90E3CvXILrXu2qTvI0fKre/wTCJ/0l/yMyFeN9W4JR8Uo/cpCowvLj/ojYDnbDl1unSE0e2EmfL5pw7/4nbylDo3i21B+6614rz4KUn/X9zadCiRHfk6Ukyb1lxNPUaTgBulKLjqIA/mRq4MiP7uAXGvhxWw+j8Ooo6+xaW6mws+x16RNrtQsn38ImKnIMTdk1Thzx4NA+RzHnz+CX0qsD9Ssog== X-Microsoft-Exchange-Diagnostics: 1; BLUPR04MB104; 25:1z1sJ5NtXB4ZKA1IZUKWarAkkr3GEG2hRNFLtOpaKb0SP5fUQfI15xmt9lEkbL1CsKBc0wHGgKGsmLhhvA22K0M36oKAIDPfT3P8M0JTLITDY1IxAdBjpgCiuI42gZYzxYzJkdA91K0cFotQZFnFe/fm6ER935FTVuDGKdG357an2IbdRnxAf+MqYMSFMrPavewKj7GMgzSiDHq+uTNfq6NvGTfDfi3mL9XsWZzdsZq+X9k1OprGRQHidgduEvej6/9BJOnFycckY9LAPzPyN0gpNT+K5h4F2srTEukGnv6X87Pm4YGlGp2Fk1F/WYcu+IpnrlDoGhHpWoR8rVzFM3tJEjMfViOBkVyJwOQzuMnlwqTerFBBOFvQEj0Lkhzcd8UJob8/RVsQ4G8fve26v1FFTDB3hR3PMQTbvHfob7yGzmhr8DTqab8sssiUYddavHYBizGhQv4bnio0C15mIg==; 31:WqWhODyTHRl8AIFYvIHHgRgj0O4rhVjYGsaq2waL6urggxQcMKGJFwHwwAVnB55sRGMShFLVo8k1p5eDHASJEPqoM//6+0MtukdthCiLW2pMChhhVeJCxHKHWM9Wl3UIIQuKM4/mFoDVFbWCGyM6y5lICu0WEaB9aOAtKIBj4kLrJ5s8q0mr4JIN7SJDm0UNm3HF3EsofjX+WMabIV+H7aGFVeekz188bAxLR09tHRLqwXkfFpuCvgEgJggoTMe+jbNV6qVQF+xx92DRR2zCZZhkchBN+q3IOkCPElJAbkk= WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BLUPR04MB104; 20:QQ30wtsCB/LABPoUBe9qynumryRy9eMxS2Jtbx2QBQN6DSilNr3EiPIeb0NWh5/nrBx4DKc9ObFpcX1bGfBS0dGQe3FtCFAL/QXy/luvm5Q5HRPWbcP3r0kGAJ4AbYsUNI3FfkufQ3xAndXxZYOpZBiEjPWzEnaPqimtqqNkDkgxvu5kQFXFywIt8bldA92Uk/63UtSAUQsFSK3Nv20p5oDG2dg/SGsUd5Rm4etoL+3GkL87MBos/tuS4Sh5y6WUsX0khXFCdHvrSAqRml5hEhKZQy15UrFEX9iut6vVkKKLe3Ju/f6M+pFlSrCf5rd0iCHHny3+FRSF2S4V86AoP/INKK75oiW/da6Oy+ZtyyEe7XkVlffKJWhFatnZQqZQU9obg7+swgJ6ieIoSh0LNSrPn37D76bU2kR8KvtMOT0H6179nxv/NX0IKAlWm6Mhi5E53qKlqjP7eMVxpViTPpyEFM9Vv17uctpv99L8Ed+qxUDwFl/u0ZJiotoRaJCt 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)(13016025)(8121501046)(5005006)(93006067)(93004067)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(20161123555025)(20161123564025)(20161123562025)(6072148); SRVR:BLUPR04MB104; BCL:0; PCL:0; RULEID:; SRVR:BLUPR04MB104; X-Microsoft-Exchange-Diagnostics: 1; BLUPR04MB104; 4:jDJodCjmAS6O6vfsAol5ce0JHAd1BJvTA81yOOH0+qXrlGVJQlW2Vjsy3mvLU9KrzxEoI7mNgs08TVsTSsEMaCkzdV2Gf9vV0yKK++VThViatStuLt7LMauRygvQGvJtQVIsbgvuEso2//idyl8eIMWbjiIcayC1+TzbyVCO9INf0o/hR5+EL7YNQPtJ3GVYW95kuJtnaUKH2/pf7/KDPnxoo/WxAgFUqN5NWuv8Cevezcs4VHr58yroxCHGo4O43bfvVlmIH11o/0lZPNTtfyD3948v8zi81W5fwAQjNU2798d/b54arsKKhXdE6Z5P9reyo9P9CFT5N0RZXavIZ20RCbWoP7jVdPkDQIMCF2VQlOd1l07ZuIGaHI7CZyEVo0mJlr9/GOzhor7ANHwPQnazPSwHmMkSexzxs1lwmEKpo2VbTC68poBkWnK8zZ8DipsduBSR2/U4IOZtTcJ8/4h4ZSKNsSlIbCUzliPTOO6IQvE8KR/aZbDqjVDAb++Z9f/QsaRUY1zIeO9in7M+XyX8WNCLhesz4g5l/3XwyM+w2I9RxEGS9yWs0be8VLuoI21zKWlzE7RvdctRQV1QQ40yCcDddrmlum5lL68/vXNkmvt0QjN0hiHGeyXcNFd66zevKs0vv241Qv7nLKCqsuCiqNBe+8J85Q8PrJRu4kk640CgZy5JrF3lxhJLsjrFeh50LOFoHM1zwbQG/1X0Ae06/nq7LuPfMYAHPju37+M6uHmwx52jwslZcNL5RkB7BLgmTk+dQEd0Nqhd319BC5xD8LVWEvEw0WzbpQNP2i+99JmM1PnR1g4hvjRyfQrS X-Forefront-PRVS: 02622CEF0A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR04MB104; 23:MU0oS4b0864ZY/rSvnoqrFUVd8dRpg4YDpfPoeNIT3?= =?us-ascii?Q?d82eUOL5c67nG9b2CL1B3Zo++xXpnVC5eDfvQoBZebRghilhd+aAOQ4FHyxO?= =?us-ascii?Q?lavCvwDM7mbqNhgMTScr0cyaMWg7g0+Bilw1RGZEnpomB4Zx0PN6h4Lw2wck?= =?us-ascii?Q?DUyGr6uIWjgEp+1PhovNOjMAajkZ17cH268GnnsyFqp5qi/ngltvyc/ZCxzI?= =?us-ascii?Q?H3sU1pAMHdqlsX68KwRvBo8pgPi7UCtGEfW7/qfrS0jgfX3Jjmr035ohAEmX?= =?us-ascii?Q?xq0SPPWqHCDc+jha5JKpU7l59C/4zriYivPQUzb4vN85W6Jylh2eiTNbVNBo?= =?us-ascii?Q?nOEQbIO7Zl0tpswPd9jcI6b2IQoDii+q/EzZRMC+EVF+uYhdillO1p32+lLr?= =?us-ascii?Q?DTZd6j0vg1JyelFgI54FEUtV3dVf1wfIayJCTzh5LTQsLIDIb+/Qnf2yikO1?= =?us-ascii?Q?tWlg1DP+tF1Xt8f+Zkos5S0GhLbw0zbbye76aHXarh8aUlxzo/tztK4wj8iV?= =?us-ascii?Q?eQt680lfTncBFI71wGAN5JGwgzqkvvc/52w6CMMFU1GFghc8R1aiPM6mB7X9?= =?us-ascii?Q?ss3C/hzPkdKiWBa1P/POF6DpaYnOsszCQA8SRyWyj3trqxhb/cgyJhFKUTlc?= =?us-ascii?Q?0A+v43yfsMGXGFKN/dtTjfOZocrdZcneqpMLRHIFFa7H9fgUchoZURpUGlx8?= =?us-ascii?Q?CMPDmOzECemhg5MYJlyWGr099dd8Q/NfB0+1sp7o2PJwzdaBjC7/RgkIwgla?= =?us-ascii?Q?Dfl1bOCDEcYai+unCtJPJQIWP+ZAJMP+J/7FaGDZODlTsJ6jYytow+c+twFy?= =?us-ascii?Q?NUFqJv+5ez5aaYcAMOhg4oKU4NQN3FO+uoekE357WMvbkGQzi9J8O+TaFB1q?= =?us-ascii?Q?ExzPFMeNmozxy9H1/bkk+puMXPK609K331oQwTTCeIM5RdScIFF4ERN7X78I?= =?us-ascii?Q?nEYZdqgKou1tSCr0jlxj5ta5VUDmFos6ldgqokntIDu3E4brjG591R/ZgZhY?= =?us-ascii?Q?KuNDgmGfFbUrvJKOwTxcWil2iIswpCPUQuRjOn5GESARUFakK5DjiMk6zq6f?= =?us-ascii?Q?zMmww=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR04MB104; 6:wCbd5R6macz6aTGKSiO5i5ZMXWRSbKa1uqDdg8xgMX5X+sPKudsKU0mslAuAK6nYXW4qBvzRX824UaFV3SByX5vU7/hpuqilGou+1951PDdQlMg/abmc6YQAOIL0iZoG6PeEnvN9nKKs/cXvV/6ZdPOqJz/di4CKkomOdFOh+YGQIaloTBvXczffi31+MlNg/hIpT7GhtSRToUSDsUO33iHtiw8Ajs6JwleNkVhX4zSWPlysXE205/rOn9Hc9rqgH7RSXmjjziQaFJXTA+69jICFa5OXOwZJ5QNKibxoegw3s5v7g74p3o1wbbCMPJrmJJHGkrIWthJTAZJm1BstZSgV7Ez+7syB1jt06IMWScCjAFYVrSwHMdAqG1z462iZZsEYKwo0AQJ3R2xqboonASRnCpD3525PKyWi/c89KgA=; 5:i9oBgXCBJyJMB+RqX5PGL1ZjdpYqZ2H4a060mV6kirSPVCYveCPSKRVy8zRYnUdqAZh6iQHMmzODibaPTNuqU1i8uMIbFAtogFXJ/1gD7GmHOrnZ1vLIgsboDLhKKOg5s6mAv488chay00/epyvuIw==; 24:M6+7C889rdSO/KBUiDGex6z+KdnG8hu848IWU/Fn9kZkN8Jg62ZJXUWpz0GmNIGtObnPopq+2sNnkBBXFoATqV8Taq6INREDBmPPd63Zjn0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR04MB104; 7:n8yJ5jwXznT6eSzzKfiZneG+NlgYpbku/34d9ozxWP7baPVgwIoKi/RmvZix/6hN6bbxwV5Nx41n/88CLtq3UfH+/cPktsI4gPuXLmtQ3GGK/Jp66ssThfWvl9tGCuXIeiwdQxaJlhK6A2RxivH80psv232hBkRw4xCQTGH1Uk/GPt41VG1LFp5eR+l0NADZpkNW8oWgc56R1ephUZ/IeXZhhKwAy8fQVSz/mI7lctYFyEKVlyZV7qEE022NPprOY00gZm+Hc/D/h3WkYL6qUChMu7BCQX5xEeJsgpdsVbFVRfX9jpdA1LbEYqjtpBFPU22zRzWbfRkPAs7c10MDow==; 20:wRthmlDmvJwcXTO2Txr2OUZR0oVtiAICJ8USuenLp5+sb8x1G4nLTijHJKqaO9LUnYfTX4PNNh7+4HXtZzCqsqSE+u9ANDj+14zTZt4GKwKlPz2roPZl+BTstCQ2bWPfhq2wbnZV0uRHuRrEj33y/6hgG6VFAHLYqViN5ORT9Oo= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2017 17:12:50.6319 (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.21]; Helo=[milsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR04MB104 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() to be skipped for TMFs. That's fine since no data segments are associated with TMFs. Signed-off-by: Bart Van Assche --- drivers/target/iscsi/iscsi_target.c | 4 +--- drivers/target/iscsi/iscsi_target_util.c | 26 ++++++++++++-------------- drivers/target/iscsi/iscsi_target_util.h | 2 +- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index a91802432f2f..73d8eaa0973b 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -492,15 +492,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 8a022b5b2317..8b89251c644d 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); @@ -716,19 +717,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); @@ -747,14 +745,14 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) switch (cmd->iscsi_opcode) { case ISCSI_OP_SCSI_CMD: se_cmd = &cmd->se_cmd; - __iscsit_free_cmd(cmd, true, shutdown); + __iscsit_free_cmd(cmd, shutdown); /* * Fallthrough */ case ISCSI_OP_SCSI_TMFUNC: rc = transport_generic_free_cmd(&cmd->se_cmd, shutdown); if (!rc && shutdown && se_cmd && se_cmd->se_sess) { - __iscsit_free_cmd(cmd, true, shutdown); + __iscsit_free_cmd(cmd, shutdown); target_put_sess_cmd(se_cmd); } break; @@ -766,18 +764,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 8ff08856516a..add23bc8ba63 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 *);