From patchwork Fri May 19 18:30:14 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: 9737893 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 B9158601C2 for ; Fri, 19 May 2017 18:30:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B05742856E for ; Fri, 19 May 2017 18:30:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A40C128573; Fri, 19 May 2017 18:30:43 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI 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 3BCAB2856E for ; Fri, 19 May 2017 18:30:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756115AbdESSal (ORCPT ); Fri, 19 May 2017 14:30:41 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:34979 "EHLO esa5.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755623AbdESSaZ (ORCPT ); Fri, 19 May 2017 14:30:25 -0400 X-IronPort-AV: E=Sophos;i="5.38,365,1491235200"; d="scan'208";a="18913364" Received: from mail-by2nam03lp0055.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([216.32.180.55]) by ob1.hgst.iphmx.com with ESMTP; 20 May 2017 02:30:24 +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=B1KE8NhOrsPk8JsYu7PH+x+x09Vs7kL76TdTCa1G2BA=; b=qqquxx+0+u5InIQ707HDGwxolcx2rZsTT/CriyyKQStaycd0x7B73knxqmnoQW1XGJYh/x3+u52ALAzuaCTRtW1+5JL4nKOESS/4eGmwcGkZL+EpJJsQSLZoJYoCfz0wCHEFmrQDC27acNfjfQFio/yr6CECCQ4OZlVLt6KI69c= Received: from CY1PR04CA0017.namprd04.prod.outlook.com (10.166.187.27) by MWHPR04MB0512.namprd04.prod.outlook.com (10.173.49.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Fri, 19 May 2017 18:30:22 +0000 Received: from SN1NAM04FT019.eop-NAM04.prod.protection.outlook.com (2a01:111:f400:7e4c::205) by CY1PR04CA0017.outlook.office365.com (2a01:111:e400:c5a5::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14 via Frontend Transport; Fri, 19 May 2017 18:30:22 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.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 SN1NAM04FT019.mail.protection.outlook.com (10.152.88.152) 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; Fri, 19 May 2017 18:30:22 +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 64.5A.29323.CB93F195; Fri, 19 May 2017 11:30:20 -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; Fri, 19 May 2017 11:30:18 -0700 X-AuditID: 0ac94369-548749800000728b-97-591f39bc3f80 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id 70.47.18148.AB93F195; Fri, 19 May 2017 11:30:18 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" , James Bottomley CC: , Bart Van Assche , Christoph Hellwig , Hannes Reinecke Subject: [PATCH 16/18] scsi-mq: Make behavior scsi_mq_prep_fn() closer to that of scsi_prep_fn() Date: Fri, 19 May 2017 11:30:14 -0700 Message-ID: <20170519183016.12646-17-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170519183016.12646-1-bart.vanassche@sandisk.com> References: <20170519183016.12646-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrPLMWRmVeSWpSXmKPExsXCddJ5ke4eS/lIg9Pb9S0WvNnLZrFy9VEm i439HBbd13ewWSw//o/JgdVj2qRTbB67bzaweXx8eovFY/2WqywenzfJBbBGcdmkpOZklqUW 6dslcGWs6etnKmjgqfi77z5bA2MjVxcjJ4eEgInEir7ZLF2MXBxCAkuZJB7+msMO4exglHg6 ZQ1QhgOsav2UWIj4ZkaJK/des4N0swkYSXx7P5MFxBYRKJS4tK2DEaSIWWAyo8TM5g2MIAlh gQSJBSv+MYHYLAKqErPXHQWzeQUcJNbOms4IcYa8xNktO5lBbE6g+MvjC9lBFgsJ2Evc76sH mSkhMI1V4trV26wQvYISJ2c+AVvMLCAhcfDFC7BeIQF1iZNL5jNNYBSahaRsFpKyBYxMqxjF cjNzinPTUwsMTfWKE/NSMouz9ZLzczcxQoI9cwfj3SfehxgFOBiVeHgTfslFCrEmlhVX5h5i lOBgVhLhjTaRjxTiTUmsrEotyo8vKs1JLT7EKM3BoiTOe05maoSQQHpiSWp2ampBahFMlomD U6qBMWrWMQG5t8qR+nveylabq9xo1Fj8iP2kqvqOVIEJrfuPXzO+mrTD3akqm+/1jVfuzwtO /FJruS04p7K/9fiCx/LzZ4X9Da+pvDpbOLlsc4GwyO7JrzyjUks42bQeCRwR47Z1zI9ekuHF VP3O82FvFvsR48Q5sj+EJ/Bf2p/UKRc5Zwnv3oXKSizFGYmGWsxFxYkAOtg923ICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHJMWRmVeSWpSXmKPExsXCtZEjRXeXpXykwbMmM4uDP9sYLRa82ctm sXL1USaLjf0cFt3Xd7BZLD/+j8mBzWPapFNsHrtvNrB5fHx6i8Vj2przTB7rt1xl8fi8SS6A LYrLJiU1J7MstUjfLoErY01fP1NBA0/F33332RoYG7m6GDk4JARMJNZPie1i5OIQEtjIKPGr p5m9i5GTg03ASOLb+5ksILaIQKHE/dOn2UCKmAUmM0p8XLcbLCEskCCxYMU/JhCbRUBVYva6 o2A2r4CDxKxTu8BqJATkJc5u2ckMYnMCxV8eX8gOslhIwF7ifl/9BEbuBYwMqxjFcjNzinPT MwsMjfSKE/NSMouz9ZLzczcxgkOEM2oH4/WJ5ocYmTg4pRoYFYoOsc1IP+6mrKJ3tHpS+RO3 iilqohtUlikLSvf/sqpVSjyldWB3X0TyxvRI7ysCPbdK1y9dJF14xDyxOHZG3n8vtalv3RKX vuPfHXCo+syexonT6ly+/Xmk90CveRG7wOwZ3s3136v5XsnFdCu9+SE2Kzf2/s2uM4mPuawP Kk7m3R3YHNOmxFKckWioxVxUnAgAycGWoMEBAAA= 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)(39860400002)(39450400003)(39840400002)(39400400002)(39850400002)(39410400002)(2980300002)(438002)(199003)(189002)(9170700003)(8936002)(305945005)(189998001)(5660300001)(33646002)(72206003)(1076002)(2906002)(48376002)(478600001)(50466002)(4326008)(47776003)(36756003)(50226002)(575784001)(86362001)(356003)(76176999)(50986999)(38730400002)(77096006)(53936002)(2950100002)(5003940100001)(6666003)(106466001)(8676002)(81166006)(54906002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0512; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM04FT019; 1:iC5BWuPv5IDb43s6z5oW4meMJyjOPIfxbonmF2m7cNbQo3LtJRANekt4s50fGKtQ5Ke3GiY0ng+ljwQt6BPLinDMJEzhDwhNBFbhsNLGSIjhzC1+E/fnmRwAH6Ib4vSRWTJp3C5AssP0pT1oTJ3SWH1JuGqv89fCthgMJp519nMW9ekx7EcUGfvz3lBiFFgx+Uvd2/y+KGKJV2A8TxI+upU3DO4Uv03R/ixX9HJm/w478l50lBOvCmCu6HvOjqENjPJNDBFeOXITwiGLF0/iR6OG64pS4lXQZ3nlCusVclBSkvHpEZebfDe3JSYuYk4q6w/WsoPKkmIDKsM8KMlmXdusruOr8Nmhl8fberWG+nCfDgk2NIK6iwT8Tdo9fACDESMOCVRBNCePgmvvn31rx8/0qVf3sCUa/k3gGgPc7thHbuwwiuPPflK4LuUvMSTnR5LUpanps8jhHWks4gbBpCjcS8698OEnGecMwxhegTdZ/Tl3m3WFER6Mp6Ukre199IsTuHHWkn4dv3EUF0VkeF+DvudK/Jxri0inNkmxtuc= X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR04MB0512: X-MS-Office365-Filtering-Correlation-Id: a3b540f2-d0cc-449f-b016-08d49ee51c4a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:MWHPR04MB0512; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0512; 3:5O6BcLb/V4wC5iwk0vVsikWjEWAtJXrAYd16FKg5MeZqEGTe9Gk2z1yDrbUdFQvSksT4ahlvIzs4xpzx7otEbsVEjrubSR3hB8FFIL7PGhuuY5BR6NU7haQ3OT65wThSKM+MFZgGHtX33Ido4EBiTjYNimNe94jnv4Zub3en+PVXskBlA0SzGj6p8WG3ji0WoRElo+RsQsxyMtOmFN+qyqEWJJEsiByhiFxkcS68ec+9X1h6HeifxUtzEwqaLNBIutneo+ZUQ7JP6uJ0zryHz69jI3540AaXKUuhMmpcp+/b/RUh4+O/XtrKKzFqqUoeniAzWHZ80V3R6JiLgMa3TRXzDOhGL9R13FazNyX11UWSj9GecmHDxBhv0pdh7H7I3rcV7gicO05dflTHsBo5tM/Wi2UpLOWO+AwwLtgW86o7WiYFG6TYsoLPtayhgc0QxIjISd5VB/sRUiDW+Ctsfn7UAJu/7Oa9kYlTg0tXQmDwe1BOBCp9Ov+NK10v9eh9 X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0512; 25:SPqFLHFZFK+8BWuA24zJvamTQYtjA9AW3qQ+XBdYElThVOe1jFk+daueYkMWk46du2Sae3SiOUwoThZlgpY5LLS0BMoBbf79kl/8xXtPh08sgY6kil7PAkQIPH0ktCTwb0F+G+/neH72u99D3L20AjgUei8xV9FkyjbrYTFkO1QgbbFRqhKZKJxP2NqlxCrMiVuBQSp/T4mTHQJW+6KELK0uqrb9JRUQ0FpfpYuCts8KwipMdw3HwfZYslZLn9je7Z6Ef+z37ac5mIfT9c1wStdUAIlnm6lVxUWjTq49BNGfXM5vzwxy03eTj/OdHf7ratBuRiblHiBf21Ktib7nalSXJgF4SzmMeV3MhlFEzEsRsjaGxiy3eg0uUXVguB6CFjPugRfr6veoZtMc9xaNJRyCSVbduoHlPfO0qRyUnpVnDyMGhv199dk+qVl/ISPXYn8oJRmSw402+TDMlUmeJBOvQH2nNebNzjgVGQ1oGp0=; 31:zZi6aDzQRjxkCbpMluPJH8yj+1AyT4MxbIxMT9lkzlaJIOC7/nl9D4Ez3BnLCTesOTmEuzOPQwfqLWJP7wWrZ3r0Ifh8+4dEYMnJ4bMdmkBej1furpASo6Ur6jEpTHlpF+qJltlRMpI1ZTLJEL+mhHf4ahw0sr/r08gTscjm1ejnr77rCpyOP1pgZtT7nlbPbG8wYoCQTqwqhHrpqrholoeWlvKa18wrbIDfXl5JLbKijxKw+4kheZo50B4z2vAyZIF45UcpU0y/EaocmPE/Kw== WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0512; 20:so5kgYohTEsPD8XaAvOmBjT263vA+N7IKoJbNyfHGjrD8zVQkj488CunNBnu4pL36qUBfAJZmanASv9BbGQPvEN1uwMlHc/6oMlJSxaf+D99+XDIfd6XpcMYvQlgtBGZhkP7WGfKo/ISSaapLrbHPnE1Uld4WXW1UGl7oVaR5gRdsSvwd1OeJrwaRxe8W8R7BEp4iJD9V5R7ma88KUlKO044Pur/PIlL50aULnNWVarfeYWdTwvMqPk3k+u6e1P/WJd8zE4kethx06AT7PktGVMPZCYoGLpRoj5jzoeSOhRMRpEE5soEnqEHaOUz4CuldvRV5abdL9EPHoAw9ea6UhhPumIvli0A3+ND8JjJokcIkF9zLKaQXDqyAAMnEHIVstBuKc1blRZulSgN7dHsq1RmNNfjku4LKHKMYkVy04RZQJFruyX8q3rtM9EWAPSLF7M76NUj5KFWFRaLWyX21VToAFnwOurwkPFbHrhRv3yZXAA03XF91WqQ1hIuwgle 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)(13016025)(5005006)(13018025)(8121501046)(3002001)(93006095)(93004095)(10201501046)(6055026)(6041248)(20161123555025)(20161123558100)(20161123562025)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148); SRVR:MWHPR04MB0512; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0512; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0512; 4:LQye+ro7mGUiesAbxJ3XkQ4QjJy5D+P13LKyszr7iOrbpzxQflHdkeV7Uymaup4nmmr69q0pRGTL/e/SRANeu3BLasfdsujbrwPslCIvtjycmxmSjOg9/MChTyVBIr0N3JvbMoFxYYW9vbMps7OKuO9mLUrKyV9L2XXzEE0Tu6OWMMxxHkquqOIW+iV3/e+ZQ7fhMTmaF9B7IN6CB0CWpWxpI7U9Dec8D9OnSuEb9Tv47M8+5BeZLqBJwGskTiyjukX9gTHoiPIK7I6j+1UuyXIPMkqbryI1OXrmNXwjbIGrf2s2Srn2QZx8N9YJItK0LUBtj//DqNed8Xg/Isgf8ntssLzLR8oz5bMy95uBa9cpLEm1kNV25gZWAeFIeG9GKZGNc2QrGou1btUP//SbnDCotD9B0Kl9iHGV4Vilp/l1OnfQxPbeBfKiW6/cFB9S1TEtIhfYvYlDN+q/6HHbrQRzcWPjwDw1YtWOu7FQxfnFOPm7LNconeQ4APTOwj89elIuuqCVX50ybQYmPPj2CFyoYibCwVbmzGb8iRPwFIEmHtlYTrB14XLqMYY/Xh1Mg0ljqrhq81KeY5tiTgVQ7nQ4mN4/zYDQbEmiRqQVuEzCtnxqO2L8qfh8jKu1UOqZmkn+cOya7Anx1aels6A4ViH5ZEICieJzdBSDs5INdvYovdPvvVLf7c7q7lND0AZnWW+PytL8J56844+8NHX9RrJavKCMWzOHalFGPVVxZcFFWlSsF+vsoe400mB5IwcSnRWT2q+R8oj4QdsUKUDPwaTQcRpLPpxBgBVGm58IuQMIQzLcfEr5vH4bKbaUKTkfXos2CwLbhngHAxkKlzK5zayYWs5wpiVIZFA/MPQC7xbhug5dSquzXU2kH3QnkowV X-Forefront-PRVS: 031257FE13 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0512; 23:rPMirdgwI3ddTtgtG+BcN5OrLk74+We7btmrONODT?= =?us-ascii?Q?cDNyPB+h7b7RN9DW02Us1iyZU7vfrC1m0d1/PXEhqpkY/FmdHZg+xqmM5/Ab?= =?us-ascii?Q?8d2HeZbhEYsTDyHxx5mhBXI1ysaMW4QVmpHGLPKc2Y/C8pwiAkbWogVXVqWw?= =?us-ascii?Q?JO22KTtvvzdvL0iQB8YCTCwXN09BMOnRPgxLdTtvaG3opBepANiaHC3lcf5o?= =?us-ascii?Q?dyNQWOJ8yfDNHBw746CM0S3gkMkF6aiMQWibZybmnVP9+N2zLwmkHpiQ8Npr?= =?us-ascii?Q?BO8su+OSpUxtNrM2sLIkypTCjoEZ/hyMjZuoUmb3KtUP0U+IhTqkMaTurf42?= =?us-ascii?Q?ueolLooNxmj1l2JyvSG8wwxc7C9DSu+IF3A9GU5w77nHZEIQcpIoSvcMW1+Y?= =?us-ascii?Q?288jsy7rvW+1NePoVDR7NGdWiQ+UbHVnB5RS/9Eyh6KZycgpqXKJPiK25lty?= =?us-ascii?Q?T7quznUhp4c9oJ96F6+OsS2lIWNslrShbymbY90L7HSg3zBwsnM6ilSPkmYc?= =?us-ascii?Q?5KofPSXTztmhA3InoKHhtuNfc9TTILWp5tNPZFP9BIXiATVCFZ5mgj0vTm8M?= =?us-ascii?Q?ZTnzqyjfNAe/2ZuU9KyzYBjoQuKj1qvoCuPVXOZwU9c1PwyEdKbqHsHScpON?= =?us-ascii?Q?BXOC8IsUZtiGHKzpS4qVg4/aqFMEbosBwGKJeXwKZkTgPgAwZVADA/Ez8tPU?= =?us-ascii?Q?vE26ON8WUMq2VlxEHDNd8FGK+eBQuyKvHR+/tb4M+4xVAYVgaqWYwLaMPigo?= =?us-ascii?Q?3KUnyAG2maWq5vx3C+afNppd1AqJM43AZWqkLmyK0mNyYajQgUx5jVESiJyk?= =?us-ascii?Q?4EOPGByH0jvCGOeZB2jn0U3W38I7RHD0H554w/4VjOjSMUP+cAGxk2TvV+jl?= =?us-ascii?Q?kIRj/dqa9qfnBdKABPZC3REA/rYeFqsDLT52e1qOQ/Poyf0NgIcdVYstWibR?= =?us-ascii?Q?6anVPPSpyEmTJhgSmTtK9aItjZkXbl0yTqHWKwx+/4UcVLv2wg4A89wlTiBp?= =?us-ascii?Q?y2hNDVT+0jMLcSvPG6nRS1Wg64HpC4L6UV2E+SVfo+IIfFJEvjdFL/kWbxGA?= =?us-ascii?Q?Ijqfj16RW8/X2I3+L3s6wtYnIhr?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0512; 6:fEAQb72yp026zYwaeLUarly1TnKnLHuUh4cNEb8b1MYSsdVEWOWfYIc//gU4P/bjcWu6fZBWEyWnqXN4BfDIY2os9SvLHTID+Jp7pw0rEMEv8uc/ZDF7spbB/ffiYTVdDXORJjHfEVaIUwwYAIuKWfHKK27vgIPmqQE6V6A1qAMBjlSGblI/2JPH/BR3MyrN3JG2xEPZOdRI0JIAU/sojQBDoMVbgYyTLOby/w57nayPfNUqzKbGuDdr9tSf2/UWqVfaNNajV8hxgyWkupjipTyTiLrV6m452Yul0vcO7QWRLyMyBLQPqoMvAef2Xo9ewsTBuzyLu2dQjTb4SvVRz5pfcqVOFMw47Vc4nFmkNpue7Yrg9KBRFTSpImxMX01it308DZn07GQfTZYUr0qYnxxL7wtzMPSjGSjdNj87t1YoWMJtoOOYTzNcB/EQXAPJieNg6cEgMP74AZKjWLPNLInCTpU8xaKrOz9uTiOTqAvRK3TdLCiL6u/XlqMXsfE22xzg7XPSMuopnBg/SQs8p4d7IeGTfd9nNQ9a4bNscTI=; 5:viRGSB3N5S8m1wC8syehiCbTF13LjehPSRhT9kSzu+bGYnVGXBqzGnnp7LMGKgpnON1bPTcq4SzUSNWsI66lzuL6gj7YeyQLFzoBP5mwe/QwQ1xXbM+WTbI/A0uqIz8qtqknvoRuT4e0fRcrMUPIrA==; 24:AyWTg9eOcUb5To3PYQJiunZFFDJH7t8U9wwAabankok13TcS22eg4b/lKRVjO+xZq8TO92ks6fTlS1+YRpqNf2wRSoDwVgGE4bp7JCr8sL4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0512; 7:UpvjSYBHyXGmfBesa6FOByEQuudmzC0sxeq0GY92UWz87vRF1Rse9YJBuBzBwLQ6byVXaDpGsh4Sk4IGWg7MeJZOVFJPSIXzOdfwqR1k+wptubnQHyMuTsS+0zGJLunSN2jypHOD8VtderBL8cTqd+4TWkVHnzQ8BueN6wF6E6DckT0192kAYY/PrDiBL2vPeLzljn5uz9zY7dHtS5G0xLewOAhEwilXZrz9G4NrcEpIhuNiWKu8c4tJRYOjJeLKtWsK9EHJ5sdoJRobh24oohdhWajr6fbguu7XvcFesmkgPfEiORZb57c2Mb1lk0CVk6llBE8uvC78bxLDRrCA3g==; 20:zNhlqFFPXK5G1hnelYOsMDZpGh/RkX9bs2pdXKkqLag2GF3UvMDNT/hXzBraHYOSqYk/u5NZnHnNcvROlfahqBxsPm8Wxd7BvaNhOd1iFlDm4BR6GsYev6Q17WpgN0KieqqvOc8slGEzsrrP+PGf7Ezwui7K59mBZfaUDFJmVXE= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2017 18:30:22.0751 (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: MWHPR04MB0512 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 Instead of clearing most of struct scsi_cmnd and reinitializing it, rely on scsi_initialize_rq() for initialization of struct scsi_cmnd. This patch fixes a bug, namely that it avoids that jiffies_at_alloc gets overwritten if a request is requeued. Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Hannes Reinecke Reviewed-by: Christoph Hellwig --- drivers/scsi/scsi_lib.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 791bae192bfb..e0c4481cb943 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1861,27 +1861,15 @@ static int scsi_mq_prep_fn(struct request *req) struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(req); struct scsi_device *sdev = req->q->queuedata; struct Scsi_Host *shost = sdev->host; - unsigned char *sense_buf = cmd->sense_buffer; struct scatterlist *sg; - /* zero out the cmd, except for the embedded scsi_request */ - memset((char *)cmd + sizeof(cmd->req), 0, - sizeof(*cmd) - sizeof(cmd->req) + shost->hostt->cmd_size); - req->special = cmd; cmd->request = req; - cmd->device = sdev; - cmd->sense_buffer = sense_buf; cmd->tag = req->tag; - cmd->prot_op = SCSI_PROT_NORMAL; - INIT_LIST_HEAD(&cmd->list); - INIT_DELAYED_WORK(&cmd->abort_work, scmd_eh_abort_handler); - cmd->jiffies_at_alloc = jiffies; - scsi_add_cmd_to_list(cmd); sg = (void *)cmd + sizeof(struct scsi_cmnd) + shost->hostt->cmd_size;