From patchwork Mon Jan 2 13:16:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9493515 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 5E07362AB2 for ; Mon, 2 Jan 2017 13:16:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FA381FF27 for ; Mon, 2 Jan 2017 13:16:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 448FB2679B; Mon, 2 Jan 2017 13:16:30 +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 CB9CE1FF27 for ; Mon, 2 Jan 2017 13:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751553AbdABNQ3 (ORCPT ); Mon, 2 Jan 2017 08:16:29 -0500 Received: from mail-by2nam01on0078.outbound.protection.outlook.com ([104.47.34.78]:32530 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751353AbdABNQ1 (ORCPT ); Mon, 2 Jan 2017 08:16:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandiskcorp.onmicrosoft.com; s=selector1-sandisk-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=X1cEA1VItBoN3s1pT8M/gMH2E3zYSLhkKPi45xCgqLQ=; b=pGSc7LfzDOZ1QWs2p+gWKhH1ylTI3HraH3Pf7MJ6Zevfvg0n1vvOvvQeNulzcEoaNVueivXF7NrhX6VB1hxiTVoc5SuOOeZrDCQ2ziIQOwJI2xSxz6O0RaKgnxZGdE6WjIUYysUVEzwnC/JRGqCm1TYgxftOS9PDy8GnbTimhDE= Received: from DM5PR02CA0053.namprd02.prod.outlook.com (10.168.192.15) by CY1PR0201MB0987.namprd02.prod.outlook.com (10.161.211.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14; Mon, 2 Jan 2017 13:16:25 +0000 Received: from BY2FFO11FD041.protection.gbl (2a01:111:f400:7c0c::174) by DM5PR02CA0053.outlook.office365.com (2603:10b6:3:39::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10 via Frontend Transport; Mon, 2 Jan 2017 13:16:25 +0000 Authentication-Results: spf=pass (sender IP is 74.221.232.55) 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 74.221.232.55 as permitted sender) receiver=protection.outlook.com; client-ip=74.221.232.55; helo=sacsmgep15.sandisk.com; Received: from sacsmgep15.sandisk.com (74.221.232.55) by BY2FFO11FD041.mail.protection.outlook.com (10.1.14.226) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.8 via Frontend Transport; Mon, 2 Jan 2017 13:16:24 +0000 X-AuditID: ac1c2134-08fff70000000abf-75-586a5ded86e3 Received: from SACHUBIP01.sdcorp.global.sandisk.com (Unknown_Domain [172.28.1.254]) (using TLS with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by (Symantec Messaging Gateway) with SMTP id EC.B3.02751.DED5A685; Mon, 2 Jan 2017 06:04:29 -0800 (PST) Received: from ULS-OP-MBXIP03.sdcorp.global.sandisk.com ([fe80::f9ec:1e1b:1439:62d8]) by SACHUBIP01.sdcorp.global.sandisk.com ([10.181.10.103]) with mapi id 14.03.0319.002; Mon, 2 Jan 2017 05:16:23 -0800 From: Bart Van Assche To: "axboe@fb.com" CC: "linux-block@vger.kernel.org" Subject: [PATCH 2/2] block: Avoid that sparse complains about context imbalance in __wbt_wait() Thread-Topic: [PATCH 2/2] block: Avoid that sparse complains about context imbalance in __wbt_wait() Thread-Index: AQHSZPppjtvrHJtdB0icukHTNGnBWA== Date: Mon, 2 Jan 2017 13:16:22 +0000 Message-ID: <1483362874.3592.60.camel@sandisk.com> References: <1483362698.3592.58.camel@sandisk.com> In-Reply-To: <1483362698.3592.58.camel@sandisk.com> Accept-Language: nl-NL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.28.1.254] Content-ID: MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsWyRobxn+7b2KwIg8VnzSz+7znGZrH3lrYD k8fE5nfsHp83yQUwRXHZpKTmZJalFunbJXBlbPz4kKngFE9F/7oG5gbGBTxdjJwcEgImEuem nWDqYuTiEBJYwiRxYusWRgjnPKPEhosfmECq2ASMJGZP2MMCYosIKEqsbrjPBmIzC9hL7L3d yghiCwskSuz4e44NoiZN4s6ZY8wQtp7E7F3NQL0cHCwCKhLXu6xBwrxAIxtm/mQFsYWA7Ckn IcZwChhLrLj3kRmknFFAVqLlNTfEJnGJW0/mM0HcLCCxZM95ZghbVOLl43+sELaCxOcV/9hA WpkFNCXW79KHaLWSuLPmDNTBihJTuh+yQ1wgKHFy5hOWCYxis5BsmIXQPQtJ9ywk3bOQdC9g ZF3FKFacmFycm55aYGiqV5yYl5JZnK2XnJ+7iREcT4omOxg7NrofYhTgYFTi4T2RlhkhxJpY VlyZe4hRgoNZSYRXwTcrQog3JbGyKrUoP76oNCe1+BCjNAeLkjjv/Zu7Q4UE0hNLUrNTUwtS i2CyTBycUg2MoTo+C1M5fPmabt+wq8r8u8EoeNFiK9uo70d2Lvg5jW1h0V/+F0+KrySU6Dpu 43BRCnSRs3bNSeO9X9zG7td6TcHyH+eU20durjMM6iwTM2BqCzY9JpN53oW7x+C1t7TK7J/y scWTove6p2jzFPDdb//CFi43I23fNG7xBFmNRUu+dPvyH1ViKc5INNRiLipOBAC42nToowIA AA== X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:74.221.232.55; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39410400002)(39860400002)(39850400002)(39840400002)(39450400003)(2980300002)(438002)(189002)(199003)(8676002)(33646002)(2351001)(76176999)(81166006)(106116001)(68736007)(50986999)(2270400002)(3846002)(92566002)(5660300001)(54356999)(86362001)(626004)(1730700003)(5640700003)(38730400001)(47776003)(36756003)(6916009)(69596002)(356003)(8936002)(50466002)(189998001)(110136003)(23676002)(6116002)(2900100001)(106466001)(305945005)(7736002)(4326007)(2906002)(2950100002)(102836003)(97736004)(103116003)(81156014)(2501003)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB0987; H:sacsmgep15.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD041; 1:N0Qs7cyhhXF/AfnOq8jDh8jpI7cgJ+XRLXYXu4WI0xpLcv3JYK+uT3BAZU7MtEcAYwZ52NhuuSlyqnlh63+2IMF5hcS7h0K4zZXTmOXnvgOjwg28yelhdqZpJ888/J5ioFrdAZ64eLgZrDzoftdjBR/M7/kR4y2qKXGsfCrLPGwXD9xSXDw1Aut5NrjlPG1TyThJspwkfVX9USxVzmF3PzMZOslrSn9uqDRHbzS7TW/xUUwvzuAjL+01FL3GjlMn3Oi1ca39ZXpYziBugCyXRKDUcSSiSCvS1R7TUDR9znNKqOzPpF+JihvHuMhvNH3h9vJjB0EFhhyqb/cpVs+johRd9sjg1ODZIhvtLRis70HrxyPnL8wztnyapg5Y1VeNhk7t1Idyq1kjCaSfSxVbQYtTVsoVs9vao2nNI/jTGsqNVJFc2WyY/BivYeJhnYe0viHzVOCHHkkTumB7VlnXlWW0gcay1/tL1cCuMi5Q9fT06Ercp6QlcYm3pH/YHkVrxLfnkllUpiBVgfk0mO2dfRZ88U1z8XiJCJR6bmyScA478NQjuNnVvrPWcDnLvlL1Du682KV5XyRWlK6G+Do+NA== X-MS-Office365-Filtering-Correlation-Id: ef71c4a1-cedd-4907-b578-08d433118d8b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002); SRVR:CY1PR0201MB0987; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB0987; 3:iWbLtlBNilRTylgFwYYVyS8paTN7bhX1oArpgMArpdnhLmRAWJDT1si26WPiXvEEMKgiwBHJ6k6s+HzMp4v7JQ9Aybqh1dABpJJ6bFEngiYS8nxuoRYh/bxG4LUjr3nVPgVzWiIDKNVLI4hZ/l+WTDq7Qo92ANiDUnSPtXEjHmCz4Ur8+FQhasRjfbgRAXR0o5Rim/77tswuAfUn0iW6+UNNA/dMgj7u8Gxhr5pTCJ5GUghEu7M126M/d8jtDxpZz4hpP+D60p3u0K00+mSACxz4c/0knL4DwWl+OjVdfMR6/p+gLKCCamOMUF+MGwO55ib2wLnZcOc0aiPBebVgFUpw1L6bNeeg+ixWHkzXu1O+aotGy+i0dHIkNzMuCAkpXXIJTy2FVV9VKdWCEAjPbA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB0987; 25:M9gjH17pvKqhse7Zix8ITNwHgmUfML3VhHjJvkwoBEqHoLy5HwLF0XXLJGqpKC89dgHxrsd045W3GJ0HuE8A3myGxvaNXlq8HuvfkpVyIKaWm8NQrreYvwnRfC+uxExvp+1jfqaoD5zzmqq9qunr2k7TDwuZLD8OWogpxmp1hamoEBACj04fjUIDd/Ivopeq2Vw/9VReSyDp9/UNttJNgcQLAP7ZEp/Kd1TOM2uQZ2c/rpiiPZvRo/WF8qkDWQFjBa3yqFpGYenWxedBjo5+cfxbSYa4xFAFWUkAXoRVP+ICf+F1Q2NdoG6HwJ2uaedVVq+J8ZL3kFGmbA7DBSJ9eqSlNBAlExJU9+i7N04bC8dgRkS5zbxGk7XZcJT5ldfBSjBlLPooXWZZK3wSokRV76smxX/Q89PVxXIlS3Hv2noECJjJl1onpv//Gw6RxmgDA9T1BYabcBJ0c+29jz+nkhiwrLn+k8XYbVwQiVOOrYaho1quPsxTOTsi6yl/kCUl4SQ83JgG+eLYpPJZ0W/hjAMTUcYyY7xxX6j1caLwqbzXnA/dAevUiRtZwsHKNnZm7Y7NmflKttC71WcNQSv6o/tgmidvb2nn02eMH0tfc24UiW/95Ms7EJXnY+Ck0s9J/fjOMZfZHdbOWaFcdhyvznejPldc7SROKLqZJobyNmxAtaBlk0/r+r5XKkJAFlc+XXJxqAcAaeLI/56jlri83f19y2PvqoT1OfBb/2EPqAb6rRTcJdbj6en8borpIfLVhQK4XUHIgXX4wtNxcnHXVuyBy+oABw/dt4oWnl9h56X8rmKlZniiENbSgWa2/seN X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB0987; 31:Z0qFuLmOnCZlUXhXKRvdtWz8wgmgYbgXHSe3NuZiWDgscfPCKNj0T7myKDVH1AzBhqCOr1LO7D4aJEJhy1m3+GYpOOYDLTAsatoUvvkcN63FZb3rSv4CixSNSNn1qwMLV/ICcDlNXcn0bJtvWLDwcekYRIQYFa3ct+Bdnp1oC0TItmPxagRsBKidSBG6mnnG0kOU+KdzumqrMqtYimxsN+iBpYfvRG9LDNpr69t9JiZswYAW9h4ZNOGh58Mv3u34Hfpv0L0pe9cGTVi/3Iqc0w==; 20:8jro/gu4q5ezs+RzVkkXqWq07g++IsmM85FR3OVo5G5yLFytnMpgEZpMY1kctInTVBX2pMQ8QowkB1Kfx6k0MAyNnKBSFoEKzVKokOfkhBvN6QIH4r373NtwaVR1ao805adVDq/oSgV8meo/cAErfy06UYzAUrawUGl6AL92MSvHu0fn8/Br/0BAtwCdg5HTnVvJeFG8736ohOGbv/JSLkVK4PrCODSH0B7M/uJnsDHekJeg+DGFLuuljx/KZBhNg1KDgBmLpZWSH+sNj2cf7heXtwPJlJxIwAhTyqzR4MiMGFi2pmuxTuCsnBohi27zh+/RitGWN8BUbYQyzArQ8Jrl4YIYMsv5XKhhjtMh3SMADMCR51hpd/NEvUNdRjAPFaJcEm7CcVh9LgSjJyZqmQfYmZyC6Ig8TztwrKEQdWtTv0VkBe24tJ/YzFm/xBmwAYZdvvY5movuii3SEPl7dut7PW8PBqqrBUtF5NS+xSGjqLDDdh27vU/uUxQYMyhV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13017025)(13015025)(13018025)(13023025)(13024025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123560025)(20161123564025)(20161123555025)(6072148); SRVR:CY1PR0201MB0987; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0201MB0987; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB0987; 4:2C1aMQp7CIDMn4/+BERHS0n6oMXgKpwkLWFngV4o0IwzmRTylUYJpVSAy2FvsKmOZuhX86LJknvKOXQjssDtfQoky55pDNmhPY/GorIC+ajFgYtsFj8mLOORjkqjOP1oGqeFb01wYsBLllUv9E2Ubx/hs6sHYDLml8UrerL6XVqD/7VsmuvlSDhzXO6bJ+h6EBhgMFaEXKb5LV7sNWTtxgJuERBnlqhtorPlPtCLDKhMp1BFE6q5uYwylM+lBTOi9pSLS8IynmHhrrmpA0np4SApqxvb79Co0IJcq1CEKwvwSBwkra1F42dkvMY+rGvOmRhUqOH6Y1iUW8rB8t2RyDG+9DeCkDMSiIpH1HItG5dM5P1dDRXAspyay//ISXiqZjO6s8v8ltkOlxsjPGyCxThbl0trplMASIej+ScGqoaY5uzDao9L1WVEhBTJh4CKD7pMxW5qQQfT+JbTLf6M3xlCKBd/R1xEHr9ZRgq06sWI++zUl7ZANhb3Y5HjqUSSz9EbqZwYuPb7Fu9Wnmz4+JQjsx4dLzRzkd+Fe3QOd8Iblf3N4kJY1VI/NyK90SSYK690CDc8I8zjPIsvcnsIulAyzUqvVtO24710zWk5IRn9b1Gflrai2cp91iZodvY9yYUsI2Q20zFug7v3VEfZQ6LP29Ol6Bn917pxRxelzbkGZlYEENZE0XWx2GshnpHTcIvahXAXe4oejfPY9ssprQHhi+ZG/7NhrWy7feKdD7s= X-Forefront-PRVS: 017589626D X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjAyMDFNQjA5ODc7MjM6aUtyTit3UTltZmFSWjJIZnNIa3JUN1Ju?= =?utf-8?B?L0dyaGQ3ZWptbVVuTmFwQkpIQkNDbFhQRG81UnZNVE5IVGlvaEdGT3FwQktl?= =?utf-8?B?UEtKd1RpRHdCeDIwUGpTNDVYSnQ3L1lnOTdlYjYrL0R4L0QrRFJpeFJXYTZi?= =?utf-8?B?YnZXUGUycXo1YktHY25jRE1jN2Fja0srUGJKa00zc3ArTDBhUTM3YWtvWGlD?= =?utf-8?B?VUFzMjN3RStOK1o1NXlNbWhqVVdUeDhTZkFUUXNtOTA5NDdQdjZMRkFjRzBs?= =?utf-8?B?U25rbGc2Snc2cnFQWEFVTnZFWkF6NlFXb1RobEVjalQ2dVYxUmxJRDdiTHlr?= =?utf-8?B?RVlZWEh2RFpNRThVMmNRMEQrUDM3bHdiQU5oRUh5alZYRUdVMHZHODN2d3Jk?= =?utf-8?B?YjNRd3V4WWhsU2ZiM1F2MVdseDVnZFpjaHdPRUxxNGRUS3V2UEJYM05naHlR?= =?utf-8?B?VXRDT052Q3lOekRMRHRkWjFhVG1URnFUYWoyTXNOVXlBQzh5N1VoT1FSbFhv?= =?utf-8?B?aFVjVTh5Ni8vTldoNGptMjluYkNuTHEzZGFiZ2ZPdXpYTUx6L0hpcVdvblpn?= =?utf-8?B?bk56VTRnT0JzcGIxYUtsS2NoTVB6aTBPcndWcjB1b25tVHFFZFlUQmQvSUhH?= =?utf-8?B?cDVXOWJ5VWxvSVdpS2hackdSOXVTYTVUNlFZV3YwWGFwcjBOQzhXaVIyOUN5?= =?utf-8?B?WEU5ZWswY3hhWUlEaHhpcU1HTTRrRUVIS28rcHMyV0ZCaXhLbm9WWGhaQXdm?= =?utf-8?B?Z0RQTmtmU2pGVGplcUh0dXR1V2cwL1puT0owWHJ2Z3loSnBIUTVpS2JHdjc5?= =?utf-8?B?MENCZktoeGxZa1R6M3RPMkE2elpHcGtiUll4cDE2SDh2K05iQnVtWmpQalJC?= =?utf-8?B?UUV4eXRhV1MwVitaTzIvQTF0YmQwa0NVSXpxVDRZV2luWFhWL2NWakI4bGRN?= =?utf-8?B?N2lXVzJRajlNTi9NU2NGY1p1dTlnbC84eDFaZlEwQXRkVjFEd2s0NzdkbWZn?= =?utf-8?B?RkpUU0xUWVVsZGx3bFJ2cUgwbGUwNC82UU1qa3hpd1V5T3VxeVkzdDhjeS9O?= =?utf-8?B?anJ6M21YUDFpK2Ywd3ZKM0ZCdUQzRTc4YUlsNzFkMnR3bGZsUkhNbERCKzAv?= =?utf-8?B?VzZzYjhndER3SGZYNExlUUszeDU4VFlBQjMzYUhxUC9IZ3lkOWtQVW5iSkd3?= =?utf-8?B?WkloNkhnM2MyZTN2VG43TFd5ZTVnUUl1Zk1ZVkNuNXgvTDJYTDJkR2FydTla?= =?utf-8?B?b01IM05kMTdNeWI3b2E2dVUwM1dNNDVxT1ZZNUF0RmdFc0xwcVB5YTh3ajNE?= =?utf-8?B?WWE0Q3VFeGNOYUl5dHVScjRDTnUySW1CSzkwd3liOWljc1piakprN2JnK3JN?= =?utf-8?B?alcwZDdRVTVONTQ4MG4xM1V4NDJUdmwrVzdrN3IzK2hSdmhIM0xQdTlqUkcx?= =?utf-8?B?ejRKWTZFYUJmTnN5UGpHYXQxWEhlUHFmbk9hRkZjT3A3aGU1dElRNmtXRU9I?= =?utf-8?B?THhkeURYcEhrU3M0cUQ5K05QNmY4ZHlXVjBBSW5DOEdaazd2OXNwY3R1MXlW?= =?utf-8?B?UHJWL2hrbnVVejY5Y3QxUmJOcHJvS25WbmRua0hwUElrUmF3V2xSc3ZSK1d6?= =?utf-8?B?Mm5LU2E4L0huLzNPT0s1S0VmQlREUHFyR1VQeHlMTWFuTTlpaFJWRkxGbytV?= =?utf-8?Q?iyUA0z1s6egkXwQ3uxbYpbblavJJnoeejkm164Dxd?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB0987; 6:LOUtJDRR+PMGDiuS5RGwvLyf/hWcwn1foBECghRH+qjNlBeoF9/lddnDVD4WnXVwe38ox3xb0ksKUuMsgqEpRFeL6qHSTho3IJ1gCelG7qYVXk8N8IE2VVeckpU/aaFgLsAEPEQc6B2x0XljTyYWZmuu8gbzUCu/oEBXCUnigKhPEFYseLj/0HH6FPh85CzZDquuykucW6s/64LJ+euF2TUti8NzYHbP94YEA11zU9M3hU1mrn3H7iqn7bPqDT0w8XeA8v9M2ikzPcn+SZvEEtT0Bz6HIqgy4yGKUX9jv5VYrIgv2CigMbMvWafS1+k/LuUDDT4n5up10vOoB0nWZltp0t4bnQeXuN82lV9UHC5UBju79GZVtS1kJFD78MJ4/47ocjNiETvdhTtXdKUNajPeidb2jepP0HdLlCKT+lt56JWC3fVjG0QtFzGsam89zZXKA6swPbHZ5GQ6vKpKpg==; 5:BzpEgwRxiUmuLU6Ot7mkk8gtG/tsHa0OfU6tSv2WpJ/73XBXyvfQw/hJ/N+wI5QQ9R3tiCxbvC6LHUVyKnzvNyHYZsETYc4R+IUlD4xCNmyyeqnh940aMvJhah49a/vtuI0QGc0XfJq4ea1oPqUHRw==; 24:30wfB2ZJE4avUr55bzDMj/uvpMRoU0n3oYDB0eUbd7OSAtiE9J83TzAMJJL79j4OuCgS5XqsEZ7sBoYnw85N1bgPGGuu+ppp9vHKtd7ktW8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB0987; 7:gsb2yBuWWcb6GItMSkPIoF/nd7I865JTUIC3XUHvIZ2Xb0cjLx1o2TMKXTKzQ1I2YVwCPNFykXuAF9t2ZVrMCSd4o8xA4XY3lodLk0b+9iqze+sRZJ7H7w1dJKuGY3JxptgGsVCMf9hocYJnldk/huLXk1nxQldVxutrMhdl86QkehblBYibHNRnEyUZLGGJ098i6Q/llv/hz4fa/K59wrSQdHzG0p+UfTEXswaIuigCjYVmZY5FVuukRn4QvLdrm0HOq5s28hKnt/jvh9riUCsxIg+JG2UahyEIw+ZKfnG/0AwgRg66rYfz1XU6npiCDSqs0fTSLI5KAHkP1C4VVhMRg/oQMIlsVK5elYfULLPiwufyc4TI1IfnH37fAnvin386xOeJl2jMZyGqvmfeqLgbRm2dMbNVWbCOe6Y0Us6/bqGaVSZYXaMA9Jtoh5+jVK3XMR1LZ5QaJkF3LbRM+A== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jan 2017 13:16:24.7974 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d; Ip=[74.221.232.55]; Helo=[sacsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0201MB0987 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 This patch does not change any functionality. Fixes: e34cbd307477 ("blk-wbt: add general throttling mechanism") Signed-off-by: Bart Van Assche ---  block/blk-wbt.c | 12 +++++++-----  1 file changed, 7 insertions(+), 5 deletions(-) --  2.11.0 diff --git a/block/blk-wbt.c b/block/blk-wbt.c index fd28c2806406..aa7b9ccc6fc5 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -544,6 +544,8 @@ static inline bool may_queue(struct rq_wb *rwb, struct rq_wait *rqw,   * the timer to kick off queuing again.   */  static void __wbt_wait(struct rq_wb *rwb, unsigned long rw, spinlock_t *lock) + __releases(lock) + __acquires(lock)  {   struct rq_wait *rqw = get_rq_wait(rwb, current_is_kswapd());   DEFINE_WAIT(wait); @@ -558,13 +560,13 @@ static void __wbt_wait(struct rq_wb *rwb, unsigned long rw, spinlock_t *lock)   if (may_queue(rwb, rqw, &wait, rw))   break;   - if (lock) + if (lock) {   spin_unlock_irq(lock); - - io_schedule(); - - if (lock) + io_schedule();   spin_lock_irq(lock); + } else { + io_schedule(); + }   } while (1);     finish_wait(&rqw->wait, &wait);