From patchwork Wed May 24 00:34:10 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: 9744727 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 02600602A7 for ; Wed, 24 May 2017 00:35:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E96CB28867 for ; Wed, 24 May 2017 00:35:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE04B2886A; Wed, 24 May 2017 00:35:31 +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 6374028867 for ; Wed, 24 May 2017 00:35:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765694AbdEXAfa (ORCPT ); Tue, 23 May 2017 20:35:30 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:21845 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763366AbdEXAec (ORCPT ); Tue, 23 May 2017 20:34:32 -0400 X-IronPort-AV: E=Sophos;i="5.38,383,1491235200"; d="scan'208";a="116871013" Received: from mail-dm3nam03lp0018.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.18]) by ob1.hgst.iphmx.com with ESMTP; 24 May 2017 08:35:37 +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=Bn+6qPFVNOLTWRAW6EPEexdGBtDb5qtUC5U4NGrGdnQ=; b=gNtc8Zjx8MUgxljoqkS+yyJJjInL6bg/WrwpRrRiEEvFGyzBcPVMx8Mn/qmwUqVWMrT7wjVlkV5T9dvaNuMkBlFBbAVgfGQk2QQ4R9ojEHaLBAbDCE63T/8ohgNfop+jhP/D2DxK6TodVeGjPgJbVto2YPfAyVP/GqKZucjunoY= Received: from BN6PR04CA0054.namprd04.prod.outlook.com (10.174.93.171) by DM5PR04MB0508.namprd04.prod.outlook.com (10.173.170.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Wed, 24 May 2017 00:34:29 +0000 Received: from CO1NAM04FT039.eop-NAM04.prod.protection.outlook.com (2a01:111:f400:7e4d::201) by BN6PR04CA0054.outlook.office365.com (2603:10b6:405:3b::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16 via Frontend Transport; Wed, 24 May 2017 00:34:28 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.225) smtp.mailfrom=sandisk.com; oracle.com; dkim=none (message not signed) header.d=none;oracle.com; 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 CO1NAM04FT039.mail.protection.outlook.com (10.152.91.80) 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; Wed, 24 May 2017 00:34:27 +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 A6.55.19026.215D4295; Tue, 23 May 2017 17:34:26 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.9.6) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.319.2; Tue, 23 May 2017 17:34:23 -0700 X-AuditID: 0ac94371-41ba798000004a52-2c-5924d512e6cc Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.9.6]) by (Symantec Messaging Gateway) with SMTP id 58.A3.18148.F05D4295; Tue, 23 May 2017 17:34:23 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" , James Bottomley CC: , , "Bart Van Assche" , Hannes Reinecke Subject: [PATCH 21/31] scsi: Move most of scsi_init_command() into scsi_initialize_rq() Date: Tue, 23 May 2017 17:34:10 -0700 Message-ID: <20170524003420.5381-22-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170524003420.5381-1-bart.vanassche@sandisk.com> References: <20170524003420.5381-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsXCddJ5ka7QVZVIg0sXdSz2LJrEZLGxn8Ni 7y1ti+7rO9gslh//x+TA6jFt0ik2j49Pb7F4bD5d7fF5k1wASxSXTUpqTmZZapG+XQJXRuuR m6wF5/grVl87ydTA2MHbxcjJISFgIvGv4yFjFyMXh5DAUiaJy89usUA42xgl9nS0M8FU3fy5 gxUisZFR4tniLYwgCTYBI4lv72eygNgiAoUSl7Z1gI1iFuhnlDj6dzU7SEJYIFxi7Yd+sCIW AVWJKauXMoPYvAL2Em/m9bBDbJCXOLtlJ1icEyje9WoCUJwDaJudxKLtFSAzJQS6WCWuP3rD CtErKHFy5hOwmcwCEhIHX7wA6xUSUJc4uWQ+0wRGoVlIymYhKVvAyLSKUSw3M6c4Nz21wNBE rzgxLyWzOFsvOT93EyMkwAt3ML6+7X2IUYCDUYmHN8FBJVKINbGsuDL3EKMEB7OSCO/yDUAh 3pTEyqrUovz4otKc1OJDjNIcLErivFmyUyOEBNITS1KzU1MLUotgskwcnFINjMmX4rc1Rbv+ +vBWwvPLzJMbVZI0eRRC13WszZa+vIxHKGXHsvifDZb7ps5i+F3BOdlWv7v2WISe+GWh2Lln A55wGAjwTvRckHDpoi7n1+CfvjHsts9CDGPWvU1ReFvctlM48EzDYpNnW0rXfLh61W93m4FP 5ab428e7YtK+Vmr9uOrAaZ64V4mlOCPRUIu5qDgRAPMkenBsAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBJMWRmVeSWpSXmKPExsXCtZGTTZf/qkqkwdZOKYuDP9sYLfYsmsRk sbGfw2LvLW2L7us72CyWH//H5MDmMW3SKTaPj09vsXhMW3OeyWPz6WqPz5vkAlijuGxSUnMy y1KL9O0SuDJaj9xkLTjHX7H62kmmBsYO3i5GTg4JAROJmz93sHYxcnEICaxnlFh1/jQbSIJN wEji2/uZLCC2iEChxP3TIHEuDmaBfkaJa+uOsYIkhAXCJdZ+6AcrYhFQlZiyeikziM0rYC+x 6ucTJogN8hJnt+wEi3MCxbteTWDvYuQA2mYnsWh7xQRG7gWMDKsYxXIzc4pz0zMLDI30ihPz UjKLs/WS83M3MULCImoH4/WJ5ocYmTg4pRoYBTfZviu9s6Lpy3yGcOGvG/47vA3a1xtSNvWG ZqNJwYY5krENRpvcu3YVrtG6d2aVyLayFJvITb3R+57a7zuk5PzottvhM+2u86IUZMLn1/Xs kq//Gly440Tvju59+zb4qJj7/NzXmVT6qLDo/xfOo5oXZ6pkykrn3LVhdjzBsOmrPUvL+tKt SizFGYmGWsxFxYkAlZu1ibsBAAA= 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)(39450400003)(39840400002)(39850400002)(39400400002)(39860400002)(39410400002)(2980300002)(438002)(189002)(199003)(9170700003)(305945005)(6666003)(2950100002)(54906002)(86362001)(77096006)(50226002)(8676002)(81166006)(53936002)(72206003)(8936002)(356003)(5660300001)(478600001)(76176999)(575784001)(38730400002)(48376002)(50986999)(36756003)(1076002)(47776003)(33646002)(5003940100001)(50466002)(2906002)(106466001)(189998001)(4326008); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR04MB0508; H:milsmgep14.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM04FT039; 1:/46dzaRYw0Y6c2bB701GuCX0a8VltHAmAPrP16H1kX2jLqvY33QSN8n1qzu/EmmIm2WkUQ61/ssfFV6y+Hyu+HKbZd9N45+p8KwAmaIgdOPjtEtZwRXskbcsxlM6tytrpmqSoXD8qrILJt4T/EkjIyzKNHqZWrYQ5eOGUBsmIuW/F3+wIU7H9800qJbl3c4uzxqFbgjK0ZQjedP1SSonAEmmXDod6ukT+L3BYSh+XSUaSjmOJhyn/YtltzqV2Hr5CeoMX5xWyrXB0yURUknIAZgWgJAG8Vu5zjDLdR0TII9Qe7ORByfDYB1BctjFUGoNVGsheOL1nEY8SxZn3tQQp8z5ewWuyzNLYaxj9K8ZMWNf58a2Xm7glYuMz/oWAGLPZfnoU9P3PxJxykG5j0dIcC075Gy1CUC1KBILF/Av9uK9inVg2WaNlm8BQn3VKhNwJ7xL8/QmUKWt6ZycIPQ/nU2816nOIeG/y7tXDc0oQ7Pvl8Z/kmK+A9+qBkM9tpge X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR04MB0508: X-MS-Office365-Filtering-Correlation-Id: 0679d7a7-d00d-44c1-187f-08d4a23ca2df X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:DM5PR04MB0508; X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0508; 3:cu7faEMENQQMv6FvQ7FnrpGvXTXDETnmqcPAA36OpdJ9jizyDheZsErevQ30Nkbsrax0+0zTNl/6v82qG/ojxWMnv2zfioGWlMMV4qzewOERlOyLy8JILeZ/59YL9rwGCEmQN9crOt2ZS9eB/E5zDZEMsg4KtG1l1fktUAbSkPXHcjY302W4a6/h4/Xs+o4fdztNiJNe0E9HPhlL5ck+PMxa3MS/WAl2Zfo6iWMJD51Hdbw1Tl0u+ceWYSPEaaLE5N8Zw2PhApgfGLpPgnZnsrsaWitcUns+adGYyafQeU3XBNZ3axjCPMlLv2tj114G443BtrQTBRsGlFB7YzuCPVNLufyFLB+TpxiqyJIFB3tkyitbatx8EP5JDGhMVGSw6ytyWJHGXEnc6XyoyPJxB2yxbreryjUSL9vqa+CCRlb2l5+TqluV3k10QabMFUQ/w5Yz4YC1iZu+1BmX609cOObEsadchrWqIEW00jrWbjTvgL0myRRVuq8K/EQvQ+KW X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0508; 25:xlvpEED/v22uwrHhGqOgmLOmq+m9kDjzZuIGSRZh2cWgxG9VbVASMN+lwKnnQEkOGAHHzMaxLzLVjY6O6HhDjGmDAAVt6fYN3r0MnWMatZVNAkEYXiZzozu9pbtgjrU4Tmzg/Xbb5q0hqHsfnPZ4dCerKfSWg4DZTunzDcep8s9r40nmOh3IlkrC+fU6v89EXST+KKexrbP7I53UNnylE4pGgvWRnnv47/6zsJwhxUAMJQwEoyyhrmCfEYwCGOnr2+IXOE5TgDHX4jfqiIoGV1G7Nw2i+PuP4OL1t8yp1BraFvbI0NzKo7z4YO7mbyj3Rm3bHbCxDjs4ZRvO75xuVtFDYdCrAwIwTPGW29ivFFD83C0uLj0+OdGTB8ZhWjKbTyqjQFaeJO2dqq5VpXhOFNzgx99k13ENz9C16+LWNX/p1rMrC6ZT0DEcbjncIJNYBXCOpMyQR6mPfad6LGZD5jK4AO7OoQA4GgEL3oPmSk0=; 31:AgQzKTEXiHgaf8o1jHQEGF88QhGnK45PJrABEgPuGZqwx/oj6bHqSvN7FakLSm2Tep7OjuvPZbyU+DipV8285mF78tpqb0n1H1ZStH8GjKj6oRN9P0C5aWJ609uL+/TqiKhArGtoCdbpFdtKSkXNcHguGLNky5Q8M06VQZyIJrzb3+czZhwtAUdt0HxV8enbmiOK78+THQ4zo4utDLdsXlZFcbiu4I/7/ChnkYwWA2DW8m5q8pbfJGYuK23WfZO6EZkHZMW01fOR3uO8y6UoWw== WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0508; 20:331gDTtl6XpbMM/24UeJOXj/3aEpNY65ixursBfIzxYcDRu2hqimlEbXGW38aosMMe0WGUK0BF0L2iAl9wdkt7V8MIUK8FQKdPItjQZlrdghwwjCW/WdHQCi4dW4nBpnVrRtdW5MeaiEWqL2+OzEgn0ZW/jmicQ5hXg7slaIHCiEcge/Y/4LIsVzLF1/pIJ0CBbCtdBcf/xUrugH8Sm178f5z7VFkdBX2pKLWO3KLup9NC5WO7A8N1FjWpGKPgcI7vwrYnAIC0HfTwcBwZUD9O5wno6r9B6b1JomRNrIWkWVtd/D8DD1vIRhFFI2gZ9zEyaB/6a8gXO1EcV04g336+41x33tS2Ukq8LkF6PLUJ4Va7qjMk6YX6X4R6Elf95nDAFtUecX8ufMAb66nZk/d5RL+Ks+gu4K8cViLmoWRDVFRHnkUqhpIDHs3nTFTlzXhsMkQEmcQT8zJmqd054ok0c0Q4iy9cs7HOL1unFGFqLvEVt8AFrT+lX5RDnjzQPA 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)(8121501046)(5005006)(13016025)(93006095)(93004095)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(6072148); SRVR:DM5PR04MB0508; BCL:0; PCL:0; RULEID:; SRVR:DM5PR04MB0508; X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0508; 4:iMCDU3TUHsUDaTuR9/1sWq7VjMhoPbJ40N1iIAEjYOvzojFwcBi5HiXJjqQfr6MXRglgdiNFVncEq+daSksu4O3+4MHZahDzDN7y/j8pjb8JVmJNVMVBVRIhx3txdITZZRzD8W5JxTd3N/GpoKipZQldv52qVRI+o/Ye6OJNDnxXmO8APnNHFwMAyNs/wPidUqGr+X6A5rFlqIvE11WFhX9HheZBNfzzXt7GWFEh7usFw1NJlGuPNKwpp4oOkSS3rrBeFh5nTwWG6Erd4DNQ6TEONkQYVhG14JF+j3wDTuihBXeSYsYwTuxtqKjrFSwVAcrmzpZaDcsGfwnksZSBg1Shh9y8FiUPqnrk4tY0pzqeU7LNPSlDuJGaXdM5DvMd9uGruJx2f7QAe8fnEuwM7FQOiBW9/RvBMxV4ZSDnM85fdXv3eu+ttIvrjvwRdJov7ZKMjeJn39ONIQyQjeWxezs2cRcO3TLryB86xb2He7IVeeYgIxnZ/LFa+DTO1eJ8y67xmr0NvtdP8N0HREhviRau3DD1rZ1DiYhtNzs7iAuwMVdTOaJVVuNAaTY0a+UPylNChRi0puODo3Mv0cjZMGK20qS0QvTmvM2JOESpGmk5Dn14tZ8EX7gbToN6kI4+tuwjjzFs8niFXu/MsPZV0qij5dIcFSkbGrTsHxRZcEYBTyX53EeueDzMjQf1mwnybh0ZKXpMbuqO/E4x7vPYlwqQ7QosDp1e4aTXI2NTV9QjL5Fckhrc2eR67QxjnA63zQphJPEzw3MCfBaYEf35zQ2qUhHvJmAUxOlfF4ZeZxT0BzBMmsrwvcqkYovud4euo2UEkwERiWqOgAzaS+XSyETOKKZo/5cOeBF/v2zzSVz2trtHwoI58HqkVXDhvJV/ X-Forefront-PRVS: 031763BCAF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR04MB0508; 23:6m7C476T/5lD3t8604Ff4VaoFnO2Iym2mRHbsiVx6?= =?us-ascii?Q?pvZSciUqUqbV7Q0Azq/EnurL++P9SlR4hFedNuZmXstC8DuDb2GlKkrvT2k7?= =?us-ascii?Q?7o0eLXxfjMQBhRS6I8gsB7Y19Jn3jXx1EOOpyTXIQ18V8ztbDaNudbNQto/i?= =?us-ascii?Q?OHchPPcDYBNSb0d9ST9FxeTWcojKDlq968LIvT38mrhNmJjenL7AKf05c6wC?= =?us-ascii?Q?2EVdXc6x7GuAPWxqyBSAjy+SMzleCA4rPjw+Po386Isnt0l+VHH3nydfMjPf?= =?us-ascii?Q?dkg74dLwqLUxge4fijobfvDLDb/XXG/CxcUdDecADruly88AtVCeYA/kggMw?= =?us-ascii?Q?7jTaU/xehMxyB6x9G2xDY9O+xej2dEH726Cp9F6XoGDrrMG2PsfWrbRi9CnP?= =?us-ascii?Q?HfuFi2zqUzryjw6ryFQ6K0yUA9n7AKpr8xZxKMYbJ7f7THLtc9SRQ/O+zAQc?= =?us-ascii?Q?nNghF9pp6Ggk6dyO84xhFodvbHBYKEMPMGx9yeluhKZ253aV0OoQGtfXgeqM?= =?us-ascii?Q?vzeZK3PVQzGTpHFMXA1ICDlvqdV46iEarWA6dWs+OYAoessxLjVrbKKo8EH8?= =?us-ascii?Q?WciqJ4js3o6NEgwknH+yT0YvdCtTbWRPXiPNEGaPAez5Csyr9grbYhtzr+PH?= =?us-ascii?Q?ebFKffSPLHAIblFtDMwNXgFUw6CawCpY1p18qDNBsBqJnLEBzvvDLD+PJ+cl?= =?us-ascii?Q?dbY3eycfNfm3wnzUlD9rvSx1ajkGyHXvfDMR07C6F7e8Fk2XM5jwNhKcn/JS?= =?us-ascii?Q?HwUoXsH+VcJCiLzRz4ty5iBbFmTtWE+ufqRovA58BDZqpA/bh69ucj5ChmLQ?= =?us-ascii?Q?4CuGslkHnLWrz1QsoIQMwJUwfsaYlcdNJARHSqZ3O3hWVVpii1y2ILvzhlQj?= =?us-ascii?Q?09Bv6XsQ4DZBUNw4XWTPUQLIAUyO3kcCBNrI8ekH0ROklnZOQg5RQeHhdQRv?= =?us-ascii?Q?GBEw6IIDFAeqWdEgoG8AvQuOO33xZj2M0SWGeE1jk9LQu4V3zTbN+IM3Mb5E?= =?us-ascii?Q?fJq04qf/EJZ55met4W3yejNv99WFJwl3qY81tT8Gd2V3qjXm3AOE4O2CfEgi?= =?us-ascii?Q?owkY2b37+kyWgGeoX2QYLbLNssn?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0508; 6:yuCCuOFeQOk07SsVzbb6DdLpM4/JKtCaj1dDz+pYMEg59GKD7uQ9aQnW7TvoRCqrf8GRZPeuLPfZC11rZaXoaYZLiIUhqtbgiH5F8+pBK6QaRXtXpqGbsD2QZ9G/d/LsPYVoPl6qvVuoruAKunL0FRwrlXwtmsJ/++si5nbLRIDVvV1/nxwXZ8iW4vyMnJMMKU3GQdp7kE2w9OtN8FabiXCc3HeC7JtYfN7sFgb4j034r2XFox81hTi+r8qbzDqsBPvfRIRtApm2Vajq/bQ0hqWlwkbEcRlSYmngiG6X+1y535NcnxGSzXV2Jm4Z9Oy0JmiszyEfQOU4tR8QRA/Pa480CWTem/cDjV5mrE0GwYf4JGhuP5VpthdwiS8jigtg7RTVxHxM6qCDS06TMwbNjs6B8lkxatlu6Sl4vjnCPciNlkcyD/yZz+0X/Ch8xwYAGyMxFiPm9z3IqfSGT8aM/3sgb4KJbnmDYUTFdh25mcc2HCMHlw7ixf4Ea1g/1kIEPXf+7VzUXnEk+WCzShGEkPoFNiBMhZ1GGL7la7/1VBI=; 5:n7wy00Dry7vjYIKkbmhzQXn00ySqvDZM1ymhX3jZc3cDDRLUlUMylUMIWkEHLiZoQrHFZt845JgM4MlpUMOLjArW1msZNjH8c2E/2Pg5rGuHSzrLUP9iCL3gh9t/DncIzdQ0V75Y7RUAtaP77qAXfg==; 24:Z3BfbN2FnIS2sbPw62KcqKEZq6mu1/VF5q3Ea0+O+JdmZli6hoYerW4+4sDX8tCP4BEexhUYqINmQU2lxgsNJZ1Cm3vNOPLJWZ1vO2BZ5HI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR04MB0508; 7:ZRh7sCXoMNuqiFG59px36AK1O3rYc7u1u5AetarSIHQOHuXEGo/79H/vwOVplUpCqF9+jfyXtx2khxRTRkB66Kv0g7/IEPwizlJZwZIrKG8CmI5jyxa0CxuFVJLV9eod1HytygMbpFa31PmVQv9GgFYJpXpxX8n1gByooEKUiJQ/oSvJAHf/h52+mT6ELwWUr2kBjs/z5i0L+8zwEAa+JX7xoIHHijLZ8MAJb8BrM99Ix2N6R69ahWpPxHOXYvQ0nttPwPl9nyyeGdOfSN3YvUBq/pH6+RfepRwB0qE99S7vzUr0UuaevNYCyNNzbkDqDRcleKVZhpIsZZMdCXxalw==; 20:bAXhfCsP3mTPhv0WfJMJx/ikpvkLhjQb6FvAi87XAWB0ADfqZ9eVNQV34wXGhh39FcU0oAOt1ZhTSR/+1q084izZ5kAJbviGt+3MpXNq6Zzw2e5FUoJ/N2Bou2QEsb7DEKXHernmKctCbqXO54vAbKjC5S4NyFvSPLg3qjfYEMc= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2017 00:34:27.6899 (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: DM5PR04MB0508 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move the initializations that only have to be performed once and not every time a request is prepared from scsi_init_command() into scsi_initialize_rq(). This patch also moves the jiffies_at_alloc assignment such that it gets back the meaning it had before commit e9c787e65c0c, namely the value of the jiffies counter at request allocation time. Fixes: commit e9c787e65c0c ("scsi: allocate scsi_cmnd structures as part of struct request") Signed-off-by: Bart Van Assche Reviewed-by: Christoph Hellwig Cc: Hannes Reinecke Reviewed-by: Hannes Reinecke --- drivers/scsi/scsi_lib.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 5e2f26524475..d2e6b4c14e35 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1155,26 +1155,25 @@ void scsi_del_cmd_from_list(struct scsi_cmnd *cmd) static void scsi_initialize_rq(struct request *rq) { struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq); - - scsi_req_init(&cmd->req); -} - -/* Called after a request has been started. */ -void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd) -{ + struct scsi_device *dev = rq->q->queuedata; void *buf = cmd->sense_buffer; void *prot = cmd->prot_sdb; /* zero out the cmd, except for the embedded scsi_request */ memset((char *)cmd + sizeof(cmd->req), 0, - sizeof(*cmd) - sizeof(cmd->req) + dev->host->hostt->cmd_size); - + sizeof(*cmd) - sizeof(cmd->req)); + scsi_req_init(&cmd->req); cmd->device = dev; cmd->sense_buffer = buf; cmd->prot_sdb = prot; INIT_DELAYED_WORK(&cmd->abort_work, scmd_eh_abort_handler); cmd->jiffies_at_alloc = jiffies; +} +/* Called after a request has been started. */ +void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd) +{ + memset(scsi_cmd_priv(cmd), 0, dev->host->hostt->cmd_size); scsi_add_cmd_to_list(cmd); }