From patchwork Thu May 25 18:43:27 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: 9748929 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 39B7260209 for ; Thu, 25 May 2017 18:43:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EEB02679B for ; Thu, 25 May 2017 18:43:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 221042836D; Thu, 25 May 2017 18:43:59 +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 7DB002679B for ; Thu, 25 May 2017 18:43:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968915AbdEYSn5 (ORCPT ); Thu, 25 May 2017 14:43:57 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:21234 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1036485AbdEYSnl (ORCPT ); Thu, 25 May 2017 14:43:41 -0400 X-IronPort-AV: E=Sophos;i="5.38,393,1491235200"; d="scan'208";a="117364867" Received: from mail-sn1nam02lp0021.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.21]) by ob1.hgst.iphmx.com with ESMTP; 26 May 2017 02:59:01 +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=diDy1dU7k5uu2L0a2XnbXZV0r6Sem+ugLROlQPUbVZU=; b=T1ArGZuqiqDHXaSIXjU21NR3RquPEwxe9lv56P/kKqWBvF87Bx7Qsv1Af2iLXFoF0t50peTMIeNhzCukUaAASDFUyR20ahWu1Ugb/MPyuEXAOSK5TlEwI0Lxfx7IMOCNYdZO191u28fEZYTrsNugLz/NBvUFdR1K6utwJFHCFfY= Received: from MWHPR04CA0065.namprd04.prod.outlook.com (10.173.46.27) by BN6PR04MB0499.namprd04.prod.outlook.com (10.173.201.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Thu, 25 May 2017 18:43:35 +0000 Received: from CO1NAM04FT044.eop-NAM04.prod.protection.outlook.com (2a01:111:f400:7e4d::206) by MWHPR04CA0065.outlook.office365.com (2603:10b6:300:6c::27) 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; Thu, 25 May 2017 18:43:34 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; 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 CO1NAM04FT044.mail.protection.outlook.com (10.152.91.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1101.12 via Frontend Transport; Thu, 25 May 2017 18:43:34 +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 48.BC.45291.4D527295; Thu, 25 May 2017 11:43:32 -0700 (PDT) Received: from milsmgip11.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; Thu, 25 May 2017 11:43:28 -0700 X-AuditID: 0ac94369-166ac9800001b0eb-19-592725d45c09 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id 31.F8.11415.0D527295; Thu, 25 May 2017 11:43:28 -0700 (PDT) From: Bart Van Assche To: Jens Axboe CC: , Christoph Hellwig , "Bart Van Assche" , Hannes Reinecke , "Omar Sandoval" , Ming Lei Subject: [PATCH 19/19] block: Make request operation type argument declarations consistent Date: Thu, 25 May 2017 11:43:27 -0700 Message-ID: <20170525184327.23570-20-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170525184327.23570-1-bart.vanassche@sandisk.com> References: <20170525184327.23570-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGLMWRmVeSWpSXmKPExsXCddJ5ke4VVfVIg8aFGhar7/azWSx4s5fN YuXqo0wWe29pWxya3MxkcfjeVRYHNo+Jze/YPS6fLfXYfbOBzeP9vqtsHuu3XGXx+LxJLoAt issmJTUnsyy1SN8ugStj1v4PzAUXtSqWzgtuYHyo3MXIySEhYCJx/98xdhBbSGApk8TGj85d jFxA9g5GiWUfjzLDFH0/doEZIrGZUaL9909GkASbgJHEt/czWUBsEQEFiZ7fK9lAipgFrjBK rL38nQ0kISwQJbH09jmgIg4OFgFVif2PA0HCvAIOEr2dG1ghFshLnN2yE2wZJ1D8y9SLbCDl QgL2EiduOIKMlBBYxCpxf9tbNoheQYmTM5+A7WUWkJA4+OIFM8QH6hInl8xnmsAoNAtJ2Swk ZQsYmVYxiuVm5hTnpqcWGJrqFSfmpWQWZ+sl5+duYoSEfuYOxrtPvA8xCnAwKvHwcjxUixRi TSwrrsw9xCjBwawkwqusqB4pxJuSWFmVWpQfX1Sak1p8iFGag0VJnPeczNQIIYH0xJLU7NTU gtQimCwTB6dUA2PSvACeQxsVrkZ53uiKOvG1rOSGeae+tKjM/a55/DIF2vHMhWV3vi3JyTs3 /XGQpMyvzIurPwixBLpIZj6ur/zx+PlSpaCL9Y2HH4TXn9knfWhnctPjpiZdTZsKodVFH3/O EjrQ6cz38RpH9INvVe12NskOp5dwqbXOWn/O6sd8iaTZEvUnDiuxFGckGmoxFxUnAgAKd53V eQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKJMWRmVeSWpSXmKPExsXCtZEjRfeCqnqkwcZubovVd/vZLA7+bGO0 WPBmL5vFytVHmSz23tK2ODS5mcni8L2rLA7sHhOb37F7XD5b6rH7ZgObx/t9V9k8pq05z+Sx fstVFo/Pm+QC2KO4bFJSczLLUov07RK4Mmbt/8BccFGrYum84AbGh8pdjJwcEgImEt+PXWDu YuTiEBLYyCjxbNd7RpAEm4CRxLf3M1lAbBEBBYme3yvZQIqYBW4wStyZMpUNJCEsECWx9PY5 oCIODhYBVYn9jwNBTF4BB4mbE+Ug5stLnN2ykxnE5gQKf5l6kQ2kREjAXuLEDccJjNwLGBlW MYrlZuYU56ZnFhga6hUn5qVkFmfrJefnbmIEBwxn5A7GpxPNDzEycXBKNTBuPrGWo9vpoems zo4lss8rBPnr17tNCrWKfbfsz9Fndfbbfko1zDazuzDJq1jz3P8PHk0aR6MXrLml+ePvk5Le /wEdnAeCHTK1/zxcf39jDvfNS8/2dK38wu2wM+SP1h771Q9CX3PdO7HnBF/qrqbmnGe7M29l 7tkeM+/Qoo0JVdMuH0ioarpdqsRSnJFoqMVcVJwIAM1PsO3IAQAA 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)(39850400002)(39400400002)(39840400002)(39860400002)(39410400002)(39450400003)(2980300002)(438002)(189002)(199003)(9170700003)(305945005)(4326008)(50226002)(48376002)(575784001)(81166006)(2906002)(356003)(1076002)(478600001)(72206003)(5003940100001)(50986999)(86362001)(54906002)(8936002)(5660300001)(38730400002)(53936002)(106466001)(110136004)(47776003)(6916009)(2950100002)(50466002)(8676002)(77096006)(76176999)(33646002)(36756003)(189998001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0499; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM04FT044; 1:g7phgzP5Lg6qjWnEqcCsrOYDJsod8viSjBmciJlFdeopqph6wbtqOFobzhCdqsSbKsGv2b7iB/lAARJHg3EEUCOBx7JIO2zPvj3uUyLIkdJqeRX431aTeanG0R3gh6vgdXsbOuunDCl9Aa8W9a8uAm+WIj+uK2OFfEaORZm4gpkVJzZKUPvDWliBPxzO6yKLTWRpsoOn9U4tE7avBilST+OwTavW6EKTSEmqhZ1w2GINwolnOBckQkzzdE89z1a93plx7Q+h2zF+V2tC1LgW3QiI9V731eNPzIqIXNxzhuUt75+6PiKYMRBhIXaYmrPROvM0uIUjvPuOXb5UuL8MK7yCg2JizQDEqSAVfEjpdxcDgFqsiDSkqW4jAT6IDtJ/TKqtROSlTLMqyXSqi9pygan9fkDs25UjmHJzCrJKcfcyQ0RHt7+ruFuB9mDgRv8vZaeudG+LYsvaDLesqfRh6PqB63AylWB2Om+PcogZ8EteR2uoM4BvKZJ9vSCqnvc5ZvTIxMTXte25GELrzWw2SwlomUogXvUanUNogaCGDqk= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ad8c4c4e-6580-4d1a-5583-08d4a39df2d8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:BN6PR04MB0499; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0499; 3:3Pmb57WJ2k3QY9AnitTKA+uGpWXUDgfq+HgBACQ6TCKLInt2QOr7Kx2td/3qQPn5+uOY+ZL37xIyqgPYI5cZonknsnq8uV2QzNObWBnjA/AdYBJPjYwrm8OA9LsBhk3LU5EltjCcQ7GkRykCTl8UMX4EaIyXi2jvFNlsNsEZZFxecqpjFgfeqJktNdu0aHYFwUNHC/uLM1ur1rNtsh97ba32PPeofwul+zYEGtLX2H7bPrvbOY2c/1aWZT5dWqym+voXt177kGDIN4fU7USwmyQA6x0Qricm2R9v9sF+aLd+Gpy2WhEMOdM1aZ5vGNlZBAObHnn30pQYjGS7OT0tpczM5ee3E9wsoL2W8htwjn7nXHMdImor2Z8UOlTn2aseKRCFo4QVBqYrPu38blUg9qUMAqXdLrA8EoQV4EzQZ5lvx482Z538SgFlyvN1hMO1YQr5s6UQ0jIyMGX7J/OmxBIOWPJ4gzPAnH1CLY1iALwYBlOZ+mvFS/hNUv1GtvrH X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0499; 25:JdGHRd85eo8A4MloqetXTNTcwdCNy6dEwxNw4aFVd8nr+1tdtZNbZph2Z+C9HKzBc4czHAhV6LoB+v9NREh6aeM2JhafqBU0b8SBx0nNnwsu88aTuxsRRJnM5jOl8+F7zNuMeVXjAsPSOEYhh+w5iq7MPCxh20xT6C6Zyf5nPW8czMNnH2e+6uoroQx25ML77hocPxYrRsuei0/a2pv1sSeRLh80MwwDAYlHqABKm83GRjxosmUu8gnDcGxowoQh19FA2suWycF2+Nr/XPLtjCinxN1NVF3RqBavPDNcaJSXhjeBij5QJ92227eABV3r0qF/Bco5gsva0QGcbNSyMXSAonkOWuUZlvZkGnaLOiz3O6t6/J9gqsClt1mZ0xxzzNZmYRWkf8Q5utP6/cz/k/DdC3SyB6vDbG9WeylFi4xqpZfqaR8LPwBBUScaxHOWnuQIL37yqrfkRl1FYDoehSW3UuxxSbL/ydoAN6G68hA=; 31:wy4n5TdzcfA5tfmb9KgSd1xAxEBOGudUFIlVoabklgiji0KPROBMxgiOQH1WxnBHPWjZT+aWjUn2pA8sY7GPgIDnCCDccm19MGseHsAKc7hM59LXfNCHXcgOzLzLbeoxj4vx1m1myHE/90jQEUwjLlq4G4SoNHJBsZMSEvGpKCDY+f3LF4q6HELEwGmw56e78agMmoic0sXyQ/YV4ykbk19B5HVbhBzq4Bvt0O1Yjv5g+t5pB8c+VyfOKzndfY0clrnCpAMY0t/b1LAjT9hX2w== WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0499; 20:rUcb3960e301HOjYcki0doniOlZz5+bHc+Gc1J0WW4+lpsFYkzL3H4AuFgOwRrJg+FL1U2fkpbkpADqeysBRLBSmj2D9WNDJx8hSouZLGjTNhGi6Arg2VXeNUIiwnpTZOjdeVl7kfZRb6+s0eyuL8OwCr/Q/Ju2ZG1RveC1FrlQR1GZsbp4C9AsB5KH6mcg2Onj0BJQqGcyrXcMJ/EzlPdmfH1dLaVHgLhX4xDnDHdOljKx/uK2IY7PdwMvrKuYjKr/BtND/EOJKaS2GAqWFpP2ry2i3RQkYfg0pbTk5tzvYqlXfQRvYubnKZ9g2QB0NhdHtrtWNOah3/Um7pB9FpJG2vSn9qmj0K9kNLNbhvmKpgph073K4H2qf9sjSaicuXbwABQQ2DvYd5BUudbyyrPQ9M1R3HSvtOJmT2zDvRy7s50FycMtPjK8P7CwmXk/T/c2itBRY/9/mJrQv0ybFu5DBYXZJfLfMjUcfb33bZO5CnlGYP1PVKAYY2SgSLxyY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(67672495146484)(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(13018025)(13016025)(8121501046)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123558100)(20161123560025)(6072148); SRVR:BN6PR04MB0499; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0499; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0499; 4:T/d5PU7NP4GB72I2vRL5Ik6SHlCc196a/w7Bc96xu955yQHBFojGaVahnRNAVd/DQZg8r90s1ixOmHRsojSksnEUV5YzNj4xc5MNAR/XeuFq+HCd42TlOe2SR1ZxztJ2kmAWaA5m2GxF4eDsRo2oBuhX5erH485m86uDWrAQKUKmGUBzohnIqRX4Ighm4/zxow8KahWmxwvqwvoSS3Z42gflIHZuFuuUX45r4o2sLCKofL2gONX3NS6AhrVSD5OLoL/LxCffEV+tF7049Okoiw3IFThHnJ2tNukSgigfsI7lK5qcbflCe2YXUq07xPDeYeaSZvyfoJpX1q5huF3kllWikfJJ4nMXWlCj6Z3SPykOSJKA3L1mRK+JUn7fG6fLO0sVlEhi8k9qEvgGF7kvrcZk9EkDcEtxYQWaQ7QoyCTJetmu+KKNq2SaqbUFhKCr0gDZG0Woujim+azxM20SeDJbAkADfKGhBmPrTH0zzqE/Czcei3tqppTA4mGZF/uAqG9vcdmyryAWFHqQO3q6D9HF3qAFjFPmTFVpeJFzVx+VFEXuGKXysyW10yBDfHCwVQgSJ3p9SriABbyk89k0g8U1IfvuDWfWC6ufMWCvnyoOi8sDahnI6rGTwuoJWHl/PuvS183F/NFGdzSkIcEZlWRipc1vJG9d52iTARknnqjwcnfHhgRGEpsnY1bv7hRfvsX699TmqEFpWMAgcBbVXtuMbB9DNiz7WJwCEWPd2ejPPSpxUS5AFHXYpqe4XBcx5G3FLqqekhYsB9I8DAR8u6H2coUZIlllMt1W6Oxi1aTa8aK17feReDqW8YKjZ1MpNhxNPVMbzZT4Dl454kD/osCUboGorTD7/TBQOkP4w92kX0S6ZUiCJ0c4xvt3Scpgg84/B7GwaZLy2/a1gACcovp4yrOcI4g63ZYPrOfOm2 c= X-Forefront-PRVS: 0318501FAE X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0499; 23:sGozQ2hqlUyKgaMCYFWsr1++kxKjRyp//nDJKV24c?= =?us-ascii?Q?rlLtPRpivFyA1MUosABjGKu6paHZC/ThC+A94AG0lQVU9V8h3AxIP2++jajR?= =?us-ascii?Q?4W+Yq3BFf+M6e7/uMXKKRvikMWlJUw7ZzkXMa42MhxKWuUX2t819VWFFZhuY?= =?us-ascii?Q?WJEIRIhgpNC5qT3AFLxiTZRDfQjgWOYOrvACklPrweW7xxxVNqZVWjw3sJWR?= =?us-ascii?Q?03TSKvgDd1lAWlJ4PTr0DFnoW7w4/9MJKNkOFuPuMIUq37FZtj0XfmUNH6zB?= =?us-ascii?Q?C1Fi9YfiICQM7sKJwHvCUN+9zO3vl74JeURAbxaFpSG41M3SWpJ5bIE181J/?= =?us-ascii?Q?y+LbWjrG/7ZrNDiFTcN/WNS5GKSaVMOsKigw8ySm5SZhvMKUmMYbJjqTVKNl?= =?us-ascii?Q?d0smumDa83VmA4cA/BCVDDxFRAf6dNTKVQH4RLLw7xhB4QTjXk1YN5OoKgQt?= =?us-ascii?Q?oy8JGJIukG/VrYlaVj1nuD3XfQZEM6jiqfrdAFkxm/zIW32voDXLoY6Xdj2+?= =?us-ascii?Q?zmA7F15RHyA906zcW9r3OJnpUnYFpJrvzHe6U+Mw9VT4OGY2322HsSUochr6?= =?us-ascii?Q?Xbe48StySwLMzaWryigTpvuHhzvbhDVivKVRZbgFMBYb1X/w4+ww/7y3HbuL?= =?us-ascii?Q?Obb0UX8vQryiM5C3gCqgI1P1R3Kj9EpY6y8PSyeEXm+e7W9jQK6kiuDrvo4M?= =?us-ascii?Q?IZybQPSfMzasDu5Sp/rEU+pdgG27ogoFWqp+UCQwziW72bwyDZltHITHcfGz?= =?us-ascii?Q?OaiPMzUM9ctjld/wRvrg2bPVy5H29n+bCBk9W8YH4pWtFUglTAFzArM34Rph?= =?us-ascii?Q?U7tRFW5SykXj1YzB+5jfqHKXqe3Ae+vTUCiX1WeaNiuLoVKvx2+EaDNAqHnP?= =?us-ascii?Q?FbvpkX/8xTU6jk49+fhoI2/IHkb2ddn3sktST0Kf5RtvwWT0vw+Fdsh0SZV6?= =?us-ascii?Q?vorH/dsbJp7lqbuLx3LR85t3Yx8RX+Xb2DirovmmkdiXHjRBc2sORPcdhZy8?= =?us-ascii?Q?rO9zZyvW3L7uMsd4y/8ZfhgayRtbNrnfw9gbTYt2U4Eb9ONkYzbcXGG6UXl9?= =?us-ascii?Q?7jL2Me0QwoicA8aVr8hYCGNa3T+z05dWcCsp2QC6YHf3Ip1Ag=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0499; 6:QISIzHc+yH/HQjU9FcSF+SQrVDPASnbgvdPzjbbVDVKkE7yVLZyupb9NP2uHC/qZiD8xgtDa8IYqWeZA2scPHBfDRKCuvlTs0eWYqSjIyLTNJaDnEC7xsiD4XNiQvNXMrIG+u/MDE/r/13YkzG0l6re0tTNarcwD7RCjIgi4QSzKZftKHV/0Lj/jL1WqsT7hqaUjA2MVqzmH1mjj4s3UQGACufvkSrZwE6pqEJJf6PL8jcziNsyggI350ZdW1emrIOo6o/GQwK/nfZWsBKDPTDzWrLC9QaO2tk3PWs/f3HIAPbqef2CLWKjL7j3h3ZTa5+4FDhAFvkn1OvM4AJAivsW7boKbRm3E69QMboMZZYGcJvmNqwS6QfpMd9/q088qfTpLbddKvsWRwy4kkozFvbsHH/Be26p646RX3pupi+MvxU5u2TuB4aW61y/NSej9vMsQyqFwWui7pbhdcTEY/ONwexLbHVYlRgYYOYdy2gifTN9/aGhg7KIBojaXAxFx7I7YcohTIpYpB24rnj7yDitZf0T8RGcvqc72q//Hq6M=; 5:ZbiIlbf7J9MgDqDnU5XWVXrE19yVkX4qJNU8rOM4rptLRIFtR9BlFroJjMJgih/hzkYBmz/acXJHCNEk9rd7rHmuRPP7C203CGT4UJiUuaCvHdecjVYzE1UnGkxyGwrsecZYLGINLrx/knumxSMjRRDFz/vVq3tsXDeDSNvr2ZI=; 24:u9tvD9YMLVzq+VrNLEgGOkOueaxUO33k4u369QZyfY/dE7B5F2CgYMjjzfEtdbdLuVUs0WJgTycnSmAXf6I6Fw+JdeISH1BbNcVLXHGJGZ4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0499; 7:SLee9DY68FW2Jt5Smx5Sr7K5Im0I1aRI0FNjhHZzBD6ggaDed48Fi+jcN+4k/IfOHBNyBa2tN0XpS9vbmA+e4iFxIS8krzIevgerGaPJLKcOdOiOOMKnTmzaEAAjGqLJ0CYP/0aDnFYhtkFXwQKNCcOTrk0jorCGuJrpHX5RoWraBj5Pqi9UkC7nTNO/jkpyKFmhYAbCMtWl6V/6M8o5xmhwo6MVNHZe4/KW20SuGOBkxKMB/g3WWpHHmOjddWBdewKEgQXNpZ0Ye72mUghqhaOrutAYG+cyLp7Mpfu+t2HrMPnZbYyLdcmbKeveTmvbMMSk5rMOjigg5TqFUIpeGQ==; 20:wEC8SFxbK/dk3NwjpFSSArs3cpTQCJ23BVi4oo5CHNwfjD5V+jKe1bt5WaRnzbKj90REyflkL7+KViunDwa/zj89ZhrneeJIboJP3hNZ9Lf5W2C9zQpy5riXgQg7YAiImBMLQslW9nSbhUC/+X+BJbfpPWwj4pL6iOMDimk0+TQ= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2017 18:43:34.1633 (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: BN6PR04MB0499 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 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'. Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Omar Sandoval Cc: Ming Lei Reviewed-by: Christoph Hellwig --- 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 82e0dbfc593b..02952e85c580 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1326,8 +1326,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; @@ -1337,7 +1337,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; @@ -1350,14 +1350,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 4b1b2c7b4344..aa2e9eb643a9 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -281,7 +281,7 @@ struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data, } EXPORT_SYMBOL_GPL(__blk_mq_alloc_request); -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 }; @@ -292,7 +292,7 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw, if (ret) return ERR_PTR(ret); - rq = blk_mq_sched_get_request(q, NULL, rw, &alloc_data); + rq = blk_mq_sched_get_request(q, NULL, op, &alloc_data); blk_mq_put_ctx(alloc_data.ctx); blk_queue_exit(q); @@ -307,8 +307,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; @@ -343,7 +343,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_sched_get_request(q, NULL, rw, &alloc_data); + rq = blk_mq_sched_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 c589b81be491..da892b9fd4d7 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -205,10 +205,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 293067a2726e..85230b5259da 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -942,7 +942,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,