From patchwork Mon Jun 19 22:07:51 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: 9797943 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 3B1C060381 for ; Mon, 19 Jun 2017 22:08:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21BA326B41 for ; Mon, 19 Jun 2017 22:08:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13A9926E49; Mon, 19 Jun 2017 22:08:51 +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 33DDC26B41 for ; Mon, 19 Jun 2017 22:08:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752677AbdFSWIs (ORCPT ); Mon, 19 Jun 2017 18:08:48 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:53868 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752605AbdFSWIU (ORCPT ); Mon, 19 Jun 2017 18:08:20 -0400 X-IronPort-AV: E=Sophos;i="5.39,363,1493654400"; d="scan'208";a="129340275" Received: from mail-bn3nam01lp0184.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([216.32.180.184]) by ob1.hgst.iphmx.com with ESMTP; 20 Jun 2017 06:08:16 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9K0SkPEPT2tsTObi7jESjBWCcfPo/J6kmbI2dROvVks=; b=ohG1wEcll3T/iKr2ecxxqpUggvYIoVrLQMNWZ0+KcigYPHqqSX0fSx6uJwDcc19pTUe1MLPF9gxTdKTY5WLpQFXV7l8tTBO3Lnv0lRoqzAGd9TDvTc0Fv4/gx0cOnaHknjdfEust8LoTJ88H0Gg3xXvq0lxDZDLdTxnt3wjdVVs= Received: from BN3PR0401CA0019.namprd04.prod.outlook.com (2a01:111:e400:51d1::29) by CO1PR04MB554.namprd04.prod.outlook.com (2a01:111:e400:103e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1178.14; Mon, 19 Jun 2017 22:08:14 +0000 Received: from CO1NAM04FT032.eop-NAM04.prod.protection.outlook.com (2a01:111:f400:7e4d::204) by BN3PR0401CA0019.outlook.office365.com (2a01:111:e400:51d1::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1178.14 via Frontend Transport; Mon, 19 Jun 2017 22:08:12 +0000 Authentication-Results: spf=fail (sender IP is 63.163.107.21) smtp.mailfrom=wdc.com; kernel.dk; dkim=none (message not signed) header.d=none; kernel.dk; dmarc=none action=none header.from=wdc.com; Received-SPF: Fail (protection.outlook.com: domain of wdc.com does not designate 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 CO1NAM04FT032.mail.protection.outlook.com (10.152.90.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1178.14 via Frontend Transport; Mon, 19 Jun 2017 22:08:12 +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 90.03.02805.B4B48495; Mon, 19 Jun 2017 15:08:11 -0700 (PDT) Received: from milsmgip11.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; Mon, 19 Jun 2017 15:08:09 -0700 X-AuditID: 0ac94369-9c18398000000af5-22-59484b4b6c23 Received: from exp-402881.sandisk.com.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id 75.4D.11415.84B48495; Mon, 19 Jun 2017 15:08:08 -0700 (PDT) From: Bart Van Assche To: Jens Axboe CC: , Christoph Hellwig , "Bart Van Assche" , Bart Van Assche , Hannes Reinecke , Omar Sandoval , Ming Lei Subject: [PATCH v4 02/12] block: Make request operation type argument declarations consistent Date: Mon, 19 Jun 2017 15:07:51 -0700 Message-ID: <20170619220801.12557-3-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170619220801.12557-1-bart.vanassche@wdc.com> References: <20170619220801.12557-1-bart.vanassche@wdc.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRmVeSWpSXmKPExsXCddJ5ka63t0ekwaNGNYvVd/vZLBa82ctm sXL1USaLvbe0LQ5NbmayOHzvKosDm8fE5nfsHpfPlnrsvtnA5vF+31U2j/VbrrJ4fN4kF8AW xWWTkpqTWZZapG+XwJUxf9801oIW7Yrrqz+xNjA2qnQxcnJICJhILFm7hrGLkYtDSGApk8Ty 31uZIZxtjBIvfq5ggqlqmzYVqmolo8Slp7MZQRJsAnoSp+btAysSEVCQ6Pm9kg2kiFmgiUmi ZcIPoCIODmGBWImvqwtAalgEVCUmbvsAVs8rYC0x4/QGRogF8hLT3vWygticAjYS3yfvBIsL AdV8fj8BbLGEwCZWibdb21ggmgUlTs58AmYzC0hIHHzxghmiQVni/NonbBMYhWYhKZuFpGwB I9MqRrHczJzi3PTUAkNTveLEvJTM4my95PzcTYyQCMjcwXj3ifchRgEORiUe3h9v3SOFWBPL iitzDzFKcDArifB+kfKIFOJNSaysSi3Kjy8qzUktPsQozcGiJM57TmZqhJBAemJJanZqakFq EUyWiYNTqoHxVPIWxWW3g6yvHze5tlM9ovdkrZ/SlL+WU31Sr+rxn7j0yMvaVG1zpUel+87w 3C0/2z/ekzx9auHtBXqzJBsKtgWuk+CUy7GY4q38Iuxh77xvT80X7u1QeRLEsEIhyOX3NWPG t/NfLp5X+9VsgWtp7YPCp1uqwucpKPoKLrTnZmcRj1vV8jxPiaU4I9FQi7moOBEAvW/OzHwC AAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEJMWRmVeSWpSXmKPExsXCtZEjRdfD2yPS4OJNA4vVd/vZLA7+bGO0 uPTnC6PFgjd72SxWrj7KZLH3lrbFocnNTBaH711lceDwmNj8jt3j8tlSj903G9g83u+7yuYx bc15Jo/1W66yeHzeJOfRfqCbKYAjissmJTUnsyy1SN8ugStj/r5prAUt2hXXV39ibWBsVOli 5OSQEDCRaJs2lbGLkYtDSGA5o8TM5pOsIAk2AT2JU/P2MYHYIgIKEj2/V7KBFDELtDBJ7Fl3 ir2LkYNDWCBW4uvqApAaFgFViYnbPoDV8wpYSxz7fZ8FYoG8xLR3vWAzOQVsJL5P3skIYgsB 1Xx+P4FxAiP3AkaGVYxiuZk5xbnpmQWGhnrFiXkpmcXZesn5uZsYwaHEGbmD8elE80OMTByc Ug2MW36tYlC1y9CXSfg+nXMz52JPYYUytoXeh+WmFZ+6FxQj2moburq0+mPnx5duasv+9t2e fj3f/79B+FnZL12KUkUlT/b7e5knM7EuyzQ++CvjvfVx4ycpzVGHT3w98kF4aovtZV8j0f0h rRd6k61tjq1qrl8WtzVS8++04p/L9Nh3lSpu/BKtxFKckWioxVxUnAgAQON83tUBAAA= 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)(39840400002)(39400400002)(39850400002)(39860400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(50986999)(85426001)(50226002)(33646002)(305945005)(110136004)(50466002)(72206003)(8676002)(8936002)(81166006)(5660300001)(86362001)(54906002)(77096006)(5003940100001)(76176999)(47776003)(4326008)(1076002)(36756003)(38730400002)(106466001)(478600001)(189998001)(356003)(53936002)(2906002)(105606002)(2950100002)(6666003)(6916009); DIR:OUT; SFP:1102; SCL:1; SRVR:CO1PR04MB554; H:milsmgep15.sandisk.com; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM04FT032; 1:O8ox/nldqG3/aKRZJEpkaG2+3hJ2Fo6cDZ41PXSZ0VR8KBP4o2VrP3ttraW4kQ/gE03nzxnY/+/Wo6wu392Dp3cB41LBPrTw0KNimMlpKhnHVzWTOVLkQUW0j3xsKOpSQMGjkICz+M3fQnmFkDGUGjBFRg8MkTHoYebQziCi3QgALAyA8c0hjbO6o/91MjxM85+NZ9Hg9nWNClknWd0ZJUnNTLmHXpXBi1IzbHfamo+0OiB1D6tPB37zuDh7E4t9UuC/RQjj6+AVns55wVPTMTdo3mV61hkg5+FG+VdxaA+xLzQsycDXNRvGd5D8zC/EJtldxlropNHjYzJLFclWuSzF5wlAU47rNfKirPg3f2BHIeBm8KsgxvSLhW0if47FVAyrzXbvW3L9aM1VBOGNgNbkvLO4fyMlFLCHwjpkBSJc/9GnavGnzzqtdDnsJbY1Cm7S8HPtpxU9CEJI8Pkk6aoe5o9N6DJMfOQP9U3OK9ykThMSZYtfjJeACng21VrGKUGiVi227RynnwYSRwcXXg== X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc9892fd-c02c-4bb4-2f5e-08d4b75fadae X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:CO1PR04MB554; X-Microsoft-Exchange-Diagnostics: 1; CO1PR04MB554; 3:XQW9IfSv/3+DZYQV9inotQlrXMWYlAtmXqOgJeVK9ylE8A7aGJS6rFSBd3LQ7ohA8gBtROcImxCIxG005+9MdPJ+p4aUpKuV8q5WlDmxPFhQUs1BRKVfEmSEcwVRQumtE+847ztQWM+iQitwTsoe5MhPvDiX0zzqe8Uih9h35wnY2XJE9ediysycDAddQH/I4rkET/2lKh76gVCMKY/udgDYDYqHcacMreEYIOaOTx9tpHQ2rbqG6+exCXbnDIEDxjl7Lk5rGGoSXi7LaIXfEiqTTQ0IAsgM59d6T3+h0T1atkhC7ORu7Yof9yJ9AKksP1YLvwaGcGdEKTrD7Dpj5GWBev3YmqNCK0OIuch4AaO3GBbgh4k2umQPJjO3HjFvURPsR4EzSJM2CXYs2yBUvMExfQgiTP6ojk2tibmLPdMO7TPXcDL3YmQ17kmO34OSz+l8Ti5baHivQMRI79CRb8aKhYCDqJ0I2Gim9p7irLb99w6rE9/xFdqDE3u/w4NE X-MS-TrafficTypeDiagnostic: CO1PR04MB554: X-Microsoft-Exchange-Diagnostics: 1; CO1PR04MB554; 25:ZvcLMwJMOTFjFfoEfT2irCwFy7y1yRLwCGsOiJOVoHEOlJFQWulhaO+EgpIL8xTPIpZ3vpy89cwLgMYiieAMlv6oRSpdx/MxZvy9AxuQtDQxEDsPrjcDRjDFrtLqEGFsOh0etvt/7L3qwgstHvArS6RBSVPCOFVJhiZfgi9BoL17eW1tCIQU+Dghg7EoZwiJqExiFHLGOvY+RCzUMOxb9/3e/vKL/2+u/FRnwxC6ClPCwfVQkYqePxJUg1gGrDYF5P8rGS2xObdFKwHhg/pjtfziXyILWDRv2e/S74z9ygpyBHV/aAgPXRjqVeKrydSk7y1qiAxj3mbJVqjq/1CkBUZ0pA6/HvwpGkAAGtmQHjfvt7+VPRD+JPnY93tNMJpHEeVXO8t/ueOWxoLpKPOmv7wPT142xyHlkyj/c6dyDNrHjd+DLJREyEA1NnKu2ZQlOXHW3j4/9OJAKlsfv3aNFy2Gx7Rk4kBOTFWjkIMd7NQ=; 31:Jj+Dnfk4SBz5rzfGhG8mqRoCbW/3nEiCdLj2jBqaZeRy9u268QncFOW84LBLNZ3ivcaqnqrCv/N6cBcH6qCTa/eIwnd+9j011QqxuzDM4ERtYdWGpcF568NbIN/FpSFa6dqDNoewBQGdMq/hCjpRvUMfGb1ap5tMHQPyTFJ005sYV24y5SGf1jGESEDOrXOZZaGywbwCpPTgtmgwLy+vxWCfG2M4zNmqiMrSI/1Bdw5/BAA3h8hk6AoQSGbTsXFMVQ77CXil5kmyn6y99+sWpA== WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CO1PR04MB554; 20:5CfL1YJ9/IyL+Yzc7ccfh3jqurohuTXSI1JF3ZrmCnrQ7WIkZnEePpdw324bMFc/BzfCia5coM7mW4LLvko+dnKpcFyF5uPd37POiMl8NjsyQbUiho+QgdeNUPB+pjSS0vk1J7Q8xXy6IdljIlA6FpUOhmtyvI1KyoEkF86KFJ3sG+g/Yq0/GAy+dbmcApzCckBvT1sTsYx1cAA/JqmzGw1rJokI6RBPLz1cLhRFIlhaY0KIW1rdnxFZQ4mx3knZ4DecyVbKFGIRjcZLmXQco3y8bOLE/HoLri5e2IEumZI+IIZ4Imdqfn8ajMtFC6VCS7dvfFuhZXe0CLIDkM1qMlFQP8A0o1mQkF/ddrDscvelNZr7Bn4+btxJBZTTfY44XuDCEnDXNtkejYvbmQvdbEJlemozuyFbEenvto3zDXPYzPmaZsosEozHGaSGUob3KyqQc9cpV/yOqR959V/lTYMvQ5FoiAgd28U/Df7Du5lEyQkadCalPZC3Mg4f5wws X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(67672495146484)(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(13016025)(5005006)(13018025)(93006095)(93003095)(3002001)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123560025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO1PR04MB554; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO1PR04MB554; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO1PR04MB554; 4:ugRlLfopt5/RHMheXMVrymjGC6pbl3FUiT60dO9i+Gx?= =?us-ascii?Q?d53PZutg7euEQ0sZupE5MiYNwi4DYUbqc47QoKlFo7hFSXzDe1CieSUGNn4V?= =?us-ascii?Q?SgFmTAs1oha7qDiYj9NCHg4XslOnKQXMjQfC0G0TKaXWtQrkwS5NykliISWb?= =?us-ascii?Q?ejPt6m1BnpsllQ9ZdMvKoJizM1V7NvrVNu12ji92kHAkQ7wNMem05Nn9Ql1G?= =?us-ascii?Q?RcZd7Ad68EFJ6PlWv8p3XXWI4GR28xFPdckF2NmAeCujB7neIxNJTOkGVKrV?= =?us-ascii?Q?LJm/SCPToLApD53oHgDIYyOvgjxFZtdEgsx6Z/x3oewjq8Ou8xthkwVBFUED?= =?us-ascii?Q?4/zqzWUlzRGs5ghHPIKnaxabnn9T3KeFNYZ9IEEvPWYNiy348m0KIkAclO1Z?= =?us-ascii?Q?enYK4WReMk7GimxhMgaCJnXCLtxT9FcGrUKB4VziPKyjXPSq6XPmM2VOoQJb?= =?us-ascii?Q?ybOcjVwqHDVtQZv7HjYC4P2PktDpohTM3wfQ1IBiRB6ArjFZoPK/zsEYgAA9?= =?us-ascii?Q?wpGqacje3QSWPtI1hn1uFUtwDV0ryOnQ1agKnbBC151k5rGpy44ug9BWm3wN?= =?us-ascii?Q?35V/iWpdpBpJl40yEzPyqKW5ep9cZ8WBIadYmXIzvJuAUWVhqrJX/jebFbMu?= =?us-ascii?Q?ceQPVQZ/kb2jIRzolsthrDm3ov+h57uvGu3vVlguDnfzPSLD/maJs/33ZJBu?= =?us-ascii?Q?kkIqEn82fqJ3i9oU6CoUXdRKEfNs+XgnitI7HCOCbbYPDAFCQgYnPUWjFTNu?= =?us-ascii?Q?+zuSf6W0f1MqSDR/RpM7ebJaaOXTbf7wptgCUEIGdwGaEEHQZem1HXvLvmZG?= =?us-ascii?Q?WW1oe5XGdpZ9R/loPAEYPBJ9DzCBIrqziZ1I2oaCZExDuYALiz1XfIF/QgpB?= =?us-ascii?Q?d58Zqms+P8wDT3oqv0c2+XekL9ZSVNwy4++JgNAL6tnIDDteiMcm/zVYibWC?= =?us-ascii?Q?6NW+vf6P1K3s82Y/oNeGZuiDfq9q1aXchx0WoS1MoSIByiNM/Xffq64fnOZe?= =?us-ascii?Q?lYKTOwtvCng4x0sEn/6c3Svuf3UzCW4yMccsrp9fqya3y8EBCvzEgPZaQVS/?= =?us-ascii?Q?QRKsL0CIzXAcmIHa4F0NYswPnG7JQyV8DrhCaoyozCjg4rKMeTXXto55eRI+?= =?us-ascii?Q?cEaWFd+icbEeuYeJONhlLqTD55RQvSWvrtpgxrH33p8Ewv949NqEPqTGBU42?= =?us-ascii?Q?y9j5O0EM2lsusjnkpYOaWiXZZZkIieLcHTy3bNwhUEWUCsRRD1EMTS+07lqr?= =?us-ascii?Q?ibk7YelgSO8I/KjHM+LhkxE/USdXXIM1EIB47aIgbLIqUpNouAx0pZOxkCg?= =?us-ascii?Q?=3D=3D?= X-Forefront-PRVS: 0343AC1D30 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO1PR04MB554; 23:aVNWl5PU2IgFpVMBDWyfSgmmDuMcLRjF4GGIfLSXVO?= =?us-ascii?Q?CTwGICG57m30LBQ8rS1C1lN/+roU4SvMz7QsU2anFWTybUwy39g3A82V5c/H?= =?us-ascii?Q?l/PmRH8GJvvoW2n+NqLs8/Van/9YduokUDGVSsqPrvXH+rVa6Kt/hPiZPzEJ?= =?us-ascii?Q?AJt+x6NkyRpXoFEa8tGwlYk8LEhgV2oAVRcJW5LrnReh+XIXDOe+EcInCiCr?= =?us-ascii?Q?b9O+zrShAFHKvW5qvbciRptb5VgsNicl+5+yehRlQPj2+Z9jTI+Wa4YbtJ5Z?= =?us-ascii?Q?HJilGu9uuYbwXL3ZTmTfwihLI91UTtaX7tgvwUquQV1jlamiufVtnXExS0rn?= =?us-ascii?Q?vmMWpnsBhSH4kCgcrPhckQ3zEwK3q6wYfxVeWOQRqN4i/W3oTJjG1muKNjQt?= =?us-ascii?Q?AkZ112ODVPf2c9Yxzxei+k4SvU0vWd4OKNpFlDItfK33/5BEDNOtNd3Sat5V?= =?us-ascii?Q?c1FgnPRTAnfeH9lHYT9TeEANuiRV1C+8jeGHFjmQlEcZHpxCDLDbKL+YyJMu?= =?us-ascii?Q?J+gGewYV7mTmbzz2TTFIHaVhtNfrJ45vVqoTJoLnVHt09W9Ox2vpI3IvF7g3?= =?us-ascii?Q?Gms/SFhJaATS7wuB69XNK5WUwKVhZxGBvWvY+IpkOg8fInt2U8+g71PEl16e?= =?us-ascii?Q?x/uReBnARNJnLfb8BhvkeLnlnpVFHxsIHsjjVyQB1Y96Azenu9H4g1slolNA?= =?us-ascii?Q?wZCjiC61oG1A87nyUAy3wsYDeEmwkEYcdqNq4s9fs3R3OtTNnv9YQpirAN9h?= =?us-ascii?Q?jwZ8uoy2Q3RGCmV9HQ4LDegcPTTaIg8RBPdw/StpwmRmCaXSF6yqZn/0grd7?= =?us-ascii?Q?EZZF1bFwNJuKkZf29hoKWP9tU2XeAuJLw2sBR1LAabhXdDu1GybtBbhfTvXo?= =?us-ascii?Q?Lj5Y4UzydDCnab5RU215F4ClN1Dl/uZ3HC3SOLfkabfdkqqiQBuYDQHspNvb?= =?us-ascii?Q?1acAQoeoSX/V4xqB2DqYWp07OHcEXlK7yjD6xfJedeHpwZxy/ohETL1/7gcc?= =?us-ascii?Q?R3eRD9Ko5xMYiDHaTpgNtLv3rdIEXCgk9sfa4c1JwDI3gRgSQsGG6kmAr5m0?= =?us-ascii?Q?M3/V5ULe6SHldshoF5glDfjyOGjEWT1EEBt8PhoQrqi7Uh5kpKpEWwt8kefS?= =?us-ascii?Q?CPQq9Le5hxrl0j4oOGsq1ASITN6/kKtWi39VWNVvMweSA13MgBEA=3D=3D?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO1PR04MB554; 6:B/4JpV5U4W4NkRk0j6zAlTyYJZkopY+5VNZGpAefzwh?= =?us-ascii?Q?VeRWhGNEpUygT8gVWcv0+y4c1/pjF7hWwvcCfiPP3u6RVpwyqHSaxwgNPcrV?= =?us-ascii?Q?RuEucJ6j9AkdV9nHV6PylQMIH6Tjzhg8xr6PHid4+UBhy1alVdiMNdNUPaqH?= =?us-ascii?Q?HG1ZJSWeD4Zh4CMvT0P8WGp908KTslL/TK3YXiK0F+phbwcmJcz1V26KZiA5?= =?us-ascii?Q?riDMlXZXOsI/z9mf1j4PgK8/MCvbihH9fKf3FRtbEgmkKnMNH3xvhwLmFN22?= =?us-ascii?Q?rGyzKZI++8bpd9gdCbvi/qWV5TYYBESx4KjxfbZzuX/0cmzD2r/43mDkBqsD?= =?us-ascii?Q?uWQAs6fpawb8hmuq4K0/qpfVFTaM/hOO7WkAK3unZlQKDqOKTwUEMJDs20G5?= =?us-ascii?Q?I0pcDkQ2FsJ70g3jFZFAnn70uWiC64EVRrE0xNgrHkIB5/PHFdlD9RB0cnIR?= =?us-ascii?Q?hwUj3oflDhHLt+cJZy/XAwXsdShmPrdhjvU/+SM6BBn7tj6PTDdn1aUc/K3A?= =?us-ascii?Q?4PM4gKpkY+8EaqA4LgJCNyFf/904U18+RVeRBn5F3w4jrk1SFtQWD6sotuBd?= =?us-ascii?Q?2dA9PK6orbsoSK3cf6c0rF4rj/10csS3g07xPUk0Obro007NUp0qdjxjdQ0w?= =?us-ascii?Q?AAgXAERMo+C4et69FGyaiaA5a7hEVAtSa1k6E72pCcOzQrujZFVfdQo/LNcD?= =?us-ascii?Q?KsIDjIAUJYPSC7UBYN14D+WM5pUtkcaiOKIZAUiHG8k+tzSWYkmoqBHKps6O?= =?us-ascii?Q?Xy+65nBAFVOFWSe+UXk1z5tVwxd7/ydGqHbmMtJ/xMZoeD6k4jr1IgS6J2+u?= =?us-ascii?Q?2DEweVfAaIwXXLTZ5WSCZRhCctX1mB/olsaE1d0BDNDkjos0NJ2UUqZUl8z9?= =?us-ascii?Q?zuveJ/hh/rwmYXOzXt/bRm+GOEaRbVEER6YzFaVScWFAbGsvZ8vM5Xi5TE9m?= =?us-ascii?Q?MjuHubFLmlnOwng9c60xdl7D4EUfuERB8ODhWaPQVRti0U5ZAebO/q4TfLhu?= =?us-ascii?Q?qLj4xklhb7M4nuFZbIVtW?= X-Microsoft-Exchange-Diagnostics: 1; CO1PR04MB554; 5:dyErrbDofO775sbHjD80pLK2blbUskRSJWw8iMfhqbKRfZkY5MQWSy24I/YJDBcBL9PsTPZFavhDrgRE1V15+ZbIQWbEUJMCjKH+jDTzTY0N/r9JV0AS1+vhmGLVClgfmLkHOGHtLkYE3+JPN3BRGXVuUqmz0nr1hQJ3su0QPnPn3Dbbb0kDuhhIh6VLSVitDdFgnqydU8HVNQ5jqkVsWP3D2oABLcXplNm9naZkm1kDNGONuLtJh9MU1uQ0o/mYxiHfnIceNtS4oqzCwzL01JuXGbEfzu+8ZsuXDIuo/+GDfApZ8poqatEQrfdMSpWn77qrjt4BCOQ4nEvCGOjGEEAYX85YqwQr5x1V7RygGv9bX1HVeQTnFZ2+H0/r/r2VnW/46HE/DrAsLfk0PeojZJ3WLdcZ33hA+CG8cbglb/+i4Oy4uUHI3mxX8D/NbSp0R/a+MXQWNjV3ULJXSVHFTPommVYOUK2CobanqIMDROX2IytH7+mDFQ0lwcrKxOkk; 24:gGyAuxTJ+x29NMyk+TVVRPzbAlZF3Pj3fKgMRZ4qx7553/eZvcxgpjSX8u8nCiWHvSvUyxv3MwwRbzTIel2UqB08ivzyi0QTlQBEgNjW6L0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO1PR04MB554; 7:bzFX8RiDi66Wx4h+Cw5pmGAEwmuubEXcebs7vh99NJfhyotfIMAoWD/zv2/8Kecra7iWiQZW07mgMeAgffhF0gJJodo8Nf03PJCkcoBtQnruN4rKNNXMK+7tXTpVv4nE3m3RvEvnKxHXf+No5rO2eMLdBWRgLgG7Q0a9vup10+dx8U6ljtMTAopq5KH/H/itjR5oRZvu8I+DWPLzdXwVpwO6MKsQZdIRz1UqPVEvizVDN50GoVee0cbA8DXzqwULcTXnFJ7c/hYiOb6N3QkMzcGN9zNQEAdCm2mxxTpWc5Ybf40wdljnsg058ppov8/gj4mT9CSPJF8hVCVPAMR6Q0PQ7qmAvKuYQQznP1lqD845Ab32irhUafE9K6UIPj5UOu53fL1aKwGecxtRK0EOfYj52hfn9cZiDsI5EJi+90Yl0mHHoZv39brzL+pz6581tl0g1Mq4r/uWkhYgsLICkm+ftiRJ3elhgiUKOvSD1b9YDAX8u9grQ0KeAgl6L+pXpZ6kzBEonIZ7YIPTGhNggWrmXzWp+HgAw4sasQPufoCLLal5+OyMi34Mz57OHpS//bG7Ju4nh72SxJ9Oso5VGT5h7WstDPYiXp92Fn4Fu04/gPFrfCfKjxoMjM0C5lHFBZcM5+h7INnQ6IOi/rtC5yTeUvPhMIfIxHxLIQ6px84EpXrBDnglNcf/1qMSQ91f4vpHHTXHvFSDcL4oBvV5Jyhe+Rjdrx/+0FchHhVmVY29K0P9XPPvBw3Q0drh7U1OVQQAoXWazC4krF2hzOr9xq97cfsgudFK+9ao9NMfNxg= X-Microsoft-Exchange-Diagnostics: 1; CO1PR04MB554; 20:+lIgSoqmIfSyYZcBEKfJ+xa+TbHOAkZvzg4ax0zMPF6ZSySVF5pG4UI+vJPtI9JBhdoCDgPj3ESCoxnGOvtBDEb8XhCeWMoh5UY8IaHObe8wFSNSdyV2L37CjjMoPAu4KqUnxrfy9k+63CgGByOprYVMiM53ItDKlQGx06QVyKA= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2017 22:08:12.4732 (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: CO1PR04MB554 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 From: Bart Van Assche Instead of declaring the second argument of blk_*_get_request() as int and passing it to functions that expect an unsigned int, declare that second argument as unsigned int. Also because of consistency, rename that second argument from 'rw' into 'op'. This patch does not change any functionality. Signed-off-by: Bart Van Assche Reviewed-by: Christoph Hellwig Cc: Hannes Reinecke Cc: Omar Sandoval Cc: Ming Lei Reviewed-by: Hannes Reinecke --- block/blk-core.c | 13 +++++++------ block/blk-mq.c | 10 +++++----- include/linux/blk-mq.h | 6 +++--- include/linux/blkdev.h | 3 ++- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 62cf92550512..93edf22009fe 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1341,8 +1341,8 @@ static struct request *get_request(struct request_queue *q, unsigned int op, goto retry; } -static struct request *blk_old_get_request(struct request_queue *q, int rw, - gfp_t gfp_mask) +static struct request *blk_old_get_request(struct request_queue *q, + unsigned int op, gfp_t gfp_mask) { struct request *rq; @@ -1350,7 +1350,7 @@ static struct request *blk_old_get_request(struct request_queue *q, int rw, create_io_context(gfp_mask, q->node); spin_lock_irq(q->queue_lock); - rq = get_request(q, rw, NULL, gfp_mask); + rq = get_request(q, op, NULL, gfp_mask); if (IS_ERR(rq)) { spin_unlock_irq(q->queue_lock); return rq; @@ -1363,14 +1363,15 @@ static struct request *blk_old_get_request(struct request_queue *q, int rw, return rq; } -struct request *blk_get_request(struct request_queue *q, int rw, gfp_t gfp_mask) +struct request *blk_get_request(struct request_queue *q, unsigned int op, + gfp_t gfp_mask) { if (q->mq_ops) - return blk_mq_alloc_request(q, rw, + return blk_mq_alloc_request(q, op, (gfp_mask & __GFP_DIRECT_RECLAIM) ? 0 : BLK_MQ_REQ_NOWAIT); else - return blk_old_get_request(q, rw, gfp_mask); + return blk_old_get_request(q, op, gfp_mask); } EXPORT_SYMBOL(blk_get_request); diff --git a/block/blk-mq.c b/block/blk-mq.c index 2dff85cdacba..8cd423ba585d 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -340,7 +340,7 @@ static struct request *blk_mq_get_request(struct request_queue *q, return rq; } -struct request *blk_mq_alloc_request(struct request_queue *q, int rw, +struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op, unsigned int flags) { struct blk_mq_alloc_data alloc_data = { .flags = flags }; @@ -351,7 +351,7 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw, if (ret) return ERR_PTR(ret); - rq = blk_mq_get_request(q, NULL, rw, &alloc_data); + rq = blk_mq_get_request(q, NULL, op, &alloc_data); blk_mq_put_ctx(alloc_data.ctx); blk_queue_exit(q); @@ -366,8 +366,8 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw, } EXPORT_SYMBOL(blk_mq_alloc_request); -struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw, - unsigned int flags, unsigned int hctx_idx) +struct request *blk_mq_alloc_request_hctx(struct request_queue *q, + unsigned int op, unsigned int flags, unsigned int hctx_idx) { struct blk_mq_alloc_data alloc_data = { .flags = flags }; struct request *rq; @@ -402,7 +402,7 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw, cpu = cpumask_first(alloc_data.hctx->cpumask); alloc_data.ctx = __blk_mq_get_ctx(q, cpu); - rq = blk_mq_get_request(q, NULL, rw, &alloc_data); + rq = blk_mq_get_request(q, NULL, op, &alloc_data); blk_queue_exit(q); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 384a448a92a8..698015526ca7 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -202,10 +202,10 @@ enum { BLK_MQ_REQ_INTERNAL = (1 << 2), /* allocate internal/sched tag */ }; -struct request *blk_mq_alloc_request(struct request_queue *q, int rw, +struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op, unsigned int flags); -struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int op, - unsigned int flags, unsigned int hctx_idx); +struct request *blk_mq_alloc_request_hctx(struct request_queue *q, + unsigned int op, unsigned int flags, unsigned int hctx_idx); struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag); enum { diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 22cfba64ce81..c2844c27ef65 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -934,7 +934,8 @@ extern void blk_rq_init(struct request_queue *q, struct request *rq); extern void blk_init_request_from_bio(struct request *req, struct bio *bio); extern void blk_put_request(struct request *); extern void __blk_put_request(struct request_queue *, struct request *); -extern struct request *blk_get_request(struct request_queue *, int, gfp_t); +extern struct request *blk_get_request(struct request_queue *, unsigned int op, + gfp_t gfp_mask); extern void blk_requeue_request(struct request_queue *, struct request *); extern int blk_lld_busy(struct request_queue *q); extern int blk_rq_prep_clone(struct request *rq, struct request *rq_src,