From patchwork Mon Sep 26 18:27:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9351145 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 5E80B607D6 for ; Mon, 26 Sep 2016 18:28:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 517332885C for ; Mon, 26 Sep 2016 18:28:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 459A828A17; Mon, 26 Sep 2016 18:28:01 +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 96EB928A20 for ; Mon, 26 Sep 2016 18:28:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163023AbcIZS17 (ORCPT ); Mon, 26 Sep 2016 14:27:59 -0400 Received: from mail-bl2nam02on0075.outbound.protection.outlook.com ([104.47.38.75]:28896 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1163010AbcIZS15 (ORCPT ); Mon, 26 Sep 2016 14:27:57 -0400 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=3JzQ7qwNmUyg0aCfWw+UHjcUHS4BnBh1ymEW6dtsW2Y=; b=G19rQg3QDo87yruZAHf499AN31ixiD0Rwo0+DSYbyXfUa8D4QaQV3QKaO9goGFmR8JcOqyjyTKQAFk96kDaRRo49bOsoosCdggzO/z0hG8fQnlRG8Y1A2WY23cryaQ8EjeiQVsnqbBhBiwIseZaXntapiex5AJYJECLz/MMS9hc= Received: from BY1PR0201CA0013.namprd02.prod.outlook.com (10.160.191.151) by CY1PR02MB2139.namprd02.prod.outlook.com (10.166.190.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5; Mon, 26 Sep 2016 18:27:54 +0000 Received: from BY2FFO11FD049.protection.gbl (2a01:111:f400:7c0c::189) by BY1PR0201CA0013.outlook.office365.com (2a01:111:e400:4814::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5 via Frontend Transport; Mon, 26 Sep 2016 18:27:54 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.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 BY2FFO11FD049.mail.protection.outlook.com (10.1.15.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.629.5 via Frontend Transport; Mon, 26 Sep 2016 18:27:54 +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 6F.C8.26959.95669E75; Mon, 26 Sep 2016 11:18:01 -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.301.0; Mon, 26 Sep 2016 11:27:49 -0700 X-AuditID: 0ac94369-ef8199800001694f-95-57e96659d5be Received: from exp-402881.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id 7A.DC.02783.5A869E75; Mon, 26 Sep 2016 11:27:49 -0700 (PDT) Subject: [PATCH 5/9] block: Extend blk_freeze_queue_start() to the non-blk-mq path To: Jens Axboe References: <7948dbb8-6333-dc62-2673-4da35b4dfdbc@sandisk.com> CC: Christoph Hellwig , James Bottomley , "Martin K. Petersen" , Mike Snitzer , Doug Ledford , Keith Busch , "linux-block@vger.kernel.org" , "linux-scsi@vger.kernel.org" , "linux-rdma@vger.kernel.org" , "linux-nvme@lists.infradead.org" From: Bart Van Assche Message-ID: <7c8af8d2-2ac9-2767-5e5f-8de72eba3814@sandisk.com> Date: Mon, 26 Sep 2016 11:27:49 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <7948dbb8-6333-dc62-2673-4da35b4dfdbc@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsXCddJ5kW5k2stwgyMfxSz+7znGZvHy/AdW i5WrjzJZrJqYZ3Hv6Bcmi723tC3mL3vKbvHsUC+LRff1HWwWy4//Y7Jo2/iV0YHbY2LzO3aP xXteMnk8OLSZxWPzknqP3Tcb2Dw+Pr3F4vF+31U2j8+b5AI4orhsUlJzMstSi/TtErgyJrfu Zi5o465YeuAVUwPjD44uRk4OCQETiR33Z7B2MXJxCAksZZJ4teI1I4Szg1Gi4/pJti5GDrCq 6y0RUEWMEq/7drOAdAsLhEic2H+GGcQWEZCV+L77NRuILSRgJzFrdhsbSAOzwAdmibe9R8ES bAJGEt/ezwRr5gUqerD+GiuIzSKgKnHjzUQmEFtUIELi1sMOqBpBiZMzn4DZnAL2Eq/v/mIG OYhZQFNi/S59kDCzgLzE9rdzmEF2SQj8ZJV4uXIG1BHqEieXzGeawCg8C8moWQjts5C0L2Bk XsUolpuZU5ybnlpgaKpXnJiXklmcrZecn7uJERJxmTsY7z7xPsQowMGoxMPrcfh5uBBrYllx Ze4hRgkOZiURXt70l+FCvCmJlVWpRfnxRaU5qcWHGKU5WJTEed3ufQkTEkhPLEnNTk0tSC2C yTJxcEo1MCaHHilp8FDnFdh50+3lBvXon5OlNkayrVJKXXVr7mX/YzNC5Lee5lDdVfGEhSFW 9/feS9VFUlz399Uf6n7KPv/RlPW26tukrxyeYi5Re49BZfP2JTLPPmp4lk/kN8kIWLlsPeeD ZfMPBoXc/fbXwfM1c5pE1QKurFb7yoXVN+LCM3QMj+m79SqxFGckGmoxFxUnAgBJ2w7ItAIA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprBLMWRmVeSWpSXmKPExsXCtZEjRXdpxstwg2XrlSz+7znGZvHy/AdW i5WrjzJZrJqYZ3Hv6Bcmi723tC3mL3vKbvHsUC+LRff1HWwWy4//Y7Jo2/iV0YHbY2LzO3aP xXteMnk8OLSZxWPzknqP3Tcb2Dw+Pr3F4vF+31U2j8+b5AI4orhsUlJzMstSi/TtErgyJrfu Zi5o465YeuAVUwPjD44uRg4OCQETiestEV2MXBxCAosZJbYcmMjUxcjJISwQInFi/xlmEFtE QFbi++7XbCC2kICdxKzZbWwgDcwCH5gluu5cZQdJsAkYSXx7P5MFxOYFKnqw/horiM0ioCpx 4w3EUFGBCIlbDzugagQlTs58AmZzCthLvL77C2wZs4C6xJ95l6BseYntb+cwT2Dkm4WkZRaS sllIyhYwMq9iFMvNzCnOTc8sMDTUK07MS8ksztZLzs/dxAgOe87IHYxPJ5ofYmTi4JRqYDSZ PMP4d1bxCnUtteUmh2Z398w7bKVcvCHSU3oD19stxnlxcxiKP5678LrZ6+WbbsWLdtFBlz8s EL4cW9T7l/vk+VsxS8wNfRZVXwjek3x55iPdW7PN/opGnL7w6cfErYclTi0RdSk/LjO3QN1h suGU5Q7+B6r5MxN13x5KC7q3x/3km/T5iw4qsRRnJBpqMRcVJwIA9jCHOSsCAAA= 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:(10009020)(6009001)(7916002)(2980300002)(438002)(199003)(189002)(86362001)(64126003)(19580405001)(356003)(76176999)(69596002)(53416004)(7416002)(31696002)(189998001)(626004)(54356999)(31686004)(19580395003)(5660300001)(2906002)(230700001)(4326007)(50986999)(92566002)(50466002)(110136003)(65826007)(68736007)(65806001)(33646002)(47776003)(8936002)(65956001)(4001350100001)(2950100002)(8676002)(6916009)(83506001)(81156014)(36756003)(81166006)(97736004)(77096005)(586003)(230783001)(2270400002)(87936001)(23676002)(106466001)(11100500001)(305945005)(7846002)(229853001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB2139; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD049; 1:J2LQosNi/AaNX8Cej1Hp7JgG/00j6Sp4hUwlMK+UI+HhTQ9tg8oi+w7BPurCzzLcUqpYmUJvPNHCHrAsA0bsMMgYAWiyKSL+4bU559FBuB4lAY3eb0m1aHGaliOZOS8qnQ8IT0nyh0syanqckchIlNCu6U+a8UVnPdF0POxvQM4ZazhtxtNyTQ7B5wocTezQBhELpQNPePyXrLPUrstM5IH5HfFe4JWFoODicpII+VpM9xP2N7MH5gWRXykOxH8ACuG4CSX4dVD2mgBXz0LVDp2SlCZ6Ee308OlaCDaCs3UxdAJfnQVX8cfYQ2LPOFBIBMY9H7KnSKO4C/mkmVVdzPJTA/+ps2uA6GF4oJuswL3J4Zb82jc+zCt03rk3VkKH8yLH1JSK/PE2LxtquZ64oo0qBIaqYkZGmUYC+Mqu+BE5Hri6U3ead47jTov+ASQXZeMS2lF7l90g6gZHVgIOeCWMiBxaU5YuOeZRcNgW9s/FXzcA8vsffmzOs1gexhoi2Tx/sSVWH7lFjxS773g6vLRBuifZ4sLikwkvzmC6/84zx0hMzb4V+4Y20rmk8dwM X-MS-Office365-Filtering-Correlation-Id: 59652e52-88d8-492b-dc8d-08d3e63ad4d6 X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB2139; 2:YE4la3IvhzF/NQBOoFM3p9+gIdWrSiwhbmaQLDjSuGi0bUvBGz9Zw0epNTvwHkL7vvoQhnkpsekRGuWRVeEUnfFMp3pLnbxAA5fMbywJS40RZpSrhPQuz75rSedSuQjMp/c020VschoubeZfxgyvkzjPHEeUtt+KD/HdvaAF9642TlVwRs4EyDyoEvHJwsX8; 3:Fa0eH875KVTgYLjQqiLkZx1UdMFgtzRfu1Zj/1TKGJpRe0fqooiAO+RhOexRa7XvXMb+KTHqW3La6mO/QsZoTZ62CVOtOxYz18DuPwfjMM6iTWTRxoA9JoJl4pJQl5C4Es9W8C2T+i8cnZYjnO7sJsWDFMmb15xNXjnoIHV9KCGTi/NjjXr1SeQ9eDj/qpp9QHzhfrAMGI2mvmy5h8rZQ/afUEAFHkdXNlrNOQpGFsZgxdN1wLCbTI9AVGgk+P4Wr+YkH4+m5NFBttYDyhfLIg==; 25:7sHh/7euzTM+WFLh7u1YuB35+1h1+WS8AyV296nmqkHqeGKoXLMT7pbV94418rFbQ6VK90nMLvBrOrhcUxuHRUb0RSmYewUaxCAo7bVg9DvkjpDlqg04VwrPw5yEcxdbMp6lQYO+KW3N1iCFpMxPUxfeTeWT3nngC3mrfv+L7fksxv3EndYdLdyqx0PMHcYCuHL0nKqFqbBByEXKRcIhVErhZmGE0t4M0QUIlI9DVBlLh0R8pqtlqdcRNmgbHkj2V6MlCCRDCnHGpA6qPDt7HSB+8C3xHi3eGjjmApE5xhhqkKXcW2vEbLTVSpwuG6U4a8R6xzzKtO2BeFvBM1u56R2vf7TA65jpVcTrEXgu4QHNUp5kdeQl+yDVNyJ0feiFHSqN0f7Q1fLVp3b7RMp5E0eHBE/y6ZxmtKtkWQFPaRY= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:CY1PR02MB2139; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB2139; 31:rfFk4r7YWu2FOwkvWXAODCIKcFfWDno+E2GhXmoLSpXbOWnVJcUJL+yBIhTC6Ws6sufUUkQAqw4VT/J3P3fA2RZxX5VeuZLCrx5X8JFV06+IFsEYdhDJ2u2tnNfd7KXr5WoAJb2EHvtiLDa16WmHElWJINts7nYMYuI8N2dgANxBzENwjYK2VYO+FdQ731yEURge0y1A3DofMTA+CwUaXP0xkJKWl8HZ0E+rGfgjCjI=; 20:X3YVY4yr3I1EipNlDm3ogTiryd/xMR3J6xWlkNfb6z04LJWH/TgOnXOl9CKcWt6ZE+QBsMM58NSEKRv9/fYmJMFu/nLHZTWb75iHzNghrJdeZBskc+/33/F8uQQDSUtve656SxfDk7zp17Q2LzyTUA5P3rVOvaCe/o/IPzd20EKcoIiyEeV5sJFcCbJsXQlhUkVzj8IlTmLbdhRsJ2TXv+Mn9fYq9/2oPeNa3PD2lENR3bzGvuostJXgzLf04bqCuNNMXElQ67CZa0sPbj4iYFYYy/Y7Z4wWdKLGpPxCvsnXtaXSlxaiWJusyA1AvS2T04+vcHYqt6j/mlUwujJPPCGpMVgtMFnjq7TiYeaJvkQd2PQyjk6YW0bqolwcZmIiQCgeR8kkTGSX67mD1Nlhd+V5O4aQt1MDCcgmm5RUMiK9DGT4scLl4o51LulJOlAn5+qvDJXrOxty2bGBuKrb77Si2TTNpijfJHeBEo3ZQz6ug0xP5RSdoZR6520FHpRR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(13016025)(13018025)(10201501046)(3002001)(6055026); SRVR:CY1PR02MB2139; BCL:0; PCL:0; RULEID:; SRVR:CY1PR02MB2139; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB2139; 4:hhZys3Clf3QnskTB4xPMA8ekkLMftUuBD5fURTBb+rQmDkgBuwoZZ0U3K/XIL1kF6pwloomIyQGHttK3rltUsOnFXk75l5Rng8+3+ShO1efrWT0fbp/JJiOhmwW9bLt1BSPeDI1saRTISJDzPBdhNv03aTIOdMFCW4wFUVbRzM6mpMcrBCBZazd282PVqrrZBGWjuhQEAqXuRKoixatuSbJNbsQmA4YtgNQVhaSKronyYE6a8A4/aavQAjojIw+6cRdpiyp4CIVri+NVYgGozZw+n/A6B+HPKo+gPOzlY+nA5oim0j2kNuuwhsN/6OH/Kv2K9UFTQrY/AhB5c2u6IsYf5Bxot+rIcfdQwiO+NXqI0pDB+FuKHV1wxYWOZynDKZ7Vdd4dJs20MoQI7UVCxL1X4eH7gHxZYkV/OcfljFkwr84UzSJhM/olXs0D25N61TIVSR6Lgc4WXzBsIgqwybu/IkSbbKyt/Ux2xH95Oq0= X-Forefront-PRVS: 00770C4423 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjAyTUIyMTM5OzIzOkUyQmFaNDVhR1NsTk82WlBLQ2dra2MyZCtH?= =?utf-8?B?VnJ0TnlTOHcvcnRKTWdDblQwWXk5TmF4NGNoTDdaM1FQWncrbnR2Y2hRVG1L?= =?utf-8?B?T0p2L0tPeTJNTlJacG1lcWx0U3kyUERKbjEwSnJiOS9UVjNReDRVTkJmdlZP?= =?utf-8?B?S0pRaGxnNkRjcTEyOEptaTBYUDBTTGh0WU5tZmlQMmx4MHlzckZzTGU2UWxB?= =?utf-8?B?V1Vlbk1wSVo3UkwrSXI0YmduUi9qU0JxanlTdFM0SVdJTE9ZS2VFZlA3emxh?= =?utf-8?B?L2x4bnEzUXJMTUhCUzdvUUtwR0V4dzBpQit5NDJpUGVEYXNCMDJWT1dsSTVq?= =?utf-8?B?OCs3dk5wU0NNM2dCY0NBQ1dReUJZc0k5UDhDbE9SNVFiUWpZaC9EdTNaeEh2?= =?utf-8?B?dFlERXQ2N0d5ZTRIellwKzRnVGxodXdycGtSRXU2TWtVUWV1RVdpTkprMmFQ?= =?utf-8?B?SlBiUFdTdU1ZWnRIaXN5eHFaTGxXSUJVbC95M0ZZTExVRDRSUG8xK1Q3T0pO?= =?utf-8?B?Vll0R1pGRFAxYXluUW5WaUtEMDJEMEpWTlMwNjNBbjRmVi9pcThiSTByU21i?= =?utf-8?B?Q2FDQU1VcEU5MEthTHd2NWtGUERGNTdoWEwzdVF0Ky91bEs1RVo0aDRIaTdO?= =?utf-8?B?eUgxZkRzcWNPZzNvZTM1Ni84Y2lXbkN0anRmdFk0K3Iyd3BmK1VJY1NUZFgx?= =?utf-8?B?THdCbWhqUEdwZnZqRDljZkFzd3dUUDFaT2NKZ0J4ZnhuOUMvc0hpRDUxblF3?= =?utf-8?B?c3UxeENIVGtSZitsSHl1cEdWLzd2enJOMG1La2dkWXZFSnNpMmFGaTRiemFq?= =?utf-8?B?ZEVJeGZicFB6Y2M0WUsxSEVoTEJqSi9TejIvSldNKzlzY3YvVUo0NFUybEo1?= =?utf-8?B?cDk5cFV4Uy84TFR6UWlqUHFERnpHaWdHSmRLYVVJN3hCbVlzWmlaMnpTeGdn?= =?utf-8?B?QWNoTzJMdkltL2tkRmU5L09KWXV0RHlEZ2d6RzlwdS9iWTZqbmE1akVYNlRT?= =?utf-8?B?dzJxY0xrRjg5cWRrbVNxZGZtcUpzT0NyZkIyV2hhL3ExcGRWWGN0SnpGUXFF?= =?utf-8?B?NjYvZStMQ3ZwSHhiSWJ3R2xMTkNBNXVWOGxWUzg3SDNvUmtPWHhKTXRObktt?= =?utf-8?B?cVRxMElHdEFydy8xZWprWVdHK3A5eFQ1b3NKcjQyVVMyMGoraXpSdXM3dnZq?= =?utf-8?B?cmZrWkVuZXNKamdwQjRjZVFvNWVNdHpjMUE5ZnQrQlZIS1FtVXg4amZxejEw?= =?utf-8?B?SWdiYzBkR1hoaTVLS2gvV3F5ZEN1ZVJqOHovbjdteXUwaHdGd1VXL0t5NkNJ?= =?utf-8?B?QzNBMG16U2Q0SWhnampEZHArZEdkYUhOQ0wwdWI3Z0dEQVNtSjYwTEMyTE5s?= =?utf-8?B?K3JoRU9jSXBxd2F0bW9zNHA4cFFTMzBhVlZCbjN6dGxtUHc2N1BLem5aYzFD?= =?utf-8?B?Sm1ORWZCcG90YnQ3YkFVeDdMdXRsRlgzaGowVk9JdStoaTJURVRFTytYNHJv?= =?utf-8?B?VWlnRzNaUXFzMTdpaFhlYnd6dTBhb21kTCs3TnJ0TWphRmpvRnlKdTlvRXRw?= =?utf-8?B?ZnJQZU16Nk0rUnV0TDJHMWpaWmQ5ZWV5ckgybmc2WE9Nak9VOUl2eGMvNlU3?= =?utf-8?B?N3M3SElKd2w1TlMxQ2hZNHZ3dGc5QTgvMHc2dURIdk9Sd1hIZ3k2WWdSMzZ4?= =?utf-8?B?d3o0R04zaXRxWlhPdFdFVGUxN1NUaCtuTU9EZjR3bXhjVVA5eGV5MytVTDUx?= =?utf-8?Q?hdJ0XW1aHHeUMexaKwWmkEltW1rKkw4k23f2s=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB2139; 6:NckYG5cXKiHlKcqNn0a6IuyvUdTohEd0ivW0WCMaXIAhi2F5oST+p///e+Jyr9DQKG745mdqAPhGHzAusxXgCW+qIWuVdYrKugAayuWmKFU6tPRwTSawEzkbameY8NQkf4103Vg9hkvgJJz5mj32OmqaGOLxnZKasFkpmRa6/ttcwkmmIK/oMO3p/yY2hJ/aZ0DWmgS5LoItS0uKTtX42fgw9RDrJauqGXaLhJLQOxO1g5CC3CFZQeeM0DYwnoGK/+yBEObMx5d4W7Dz+pKjMDWlH/+VTduZLSsLpC8/O1BDoMwgEcDc7TTbAFiWm8ZckuOMx9fV1tUsGBhGunUVFg==; 5:97KHrtOELW6OponR+cc8iILhG03C5YuzvOIXIbhAy+CjLpheYAP6gUBpRtNptvYCN63IfHfh6H41EdGoHggvUz0tf83MGoKuEwqGzzMyls39Rl7M5o1aKV6wlXjyO0xOdegLLUMsp2kBChSQhmofrQ==; 24:2wFh26irZbOxUwSnj/p2Xe2tQumT1e9jOWEHKdNzkvP6bCuz0G+2qD+YrYzaMFxsYRcRTbrcMxwfqslq2KeCFTowjsituPy0yaB4ZOBBKlU=; 7:p2o15S7puYv+94JQw2sQjcF7hNhc8oa/URek26ozGiL5yVJCnf+KxVunRZvsWju1DwM7SrO5T2X498o9sgb0NeVwwB5YZ5FzFsbrTfwhU35nUsajAGXTfbWXv1WPQr50URe1xW72hdC1YSBjRq04ijBdp4SI1BmTSqAoNH90TWay96pmlQF7ALk/h47pNa2c0tFY1Oi/lEMvlsQ4XjjFn5K4gkAo/uN5zRSJ1ULKsRgP70T2FzMfE6RXBIP/m7pKs7PdStZ/yN1CPLAoB+9yCfoI+T5gHGQhftgL1lPpQJ0pPlmJXPRRP6T9zAME7P+6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB2139; 20:oxH88/mKf0GGX4NwdwSCETVUMfJ7f3Vifxv8YK8ksH2jZ3O2HvrSWM2YCYouJDQ6qkIKk2+UoA6n0eoOJVdPUOi4uw4N72AgDW5LEL7cvKd1GIa+FVP9SgmWeVEOXCwb1rmwSAt5IGChiIRoQyMYzj/CZ9cwOcFyOuHx15HjGmR5UiWdYV1n5QjzrVfip3KXI2LGNy7BR0wN1kxT35t/yMJDr06Tb08VLqBno/i0N4TQSGXtbQmfcWww13vDsCKK X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2016 18:27:54.1778 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d; Ip=[63.163.107.21]; Helo=[milsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR02MB2139 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Bart Van Assche Reviewed-by: Johannes Thumshirn --- block/blk-core.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 8cc8006..5ecc7ab 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -689,7 +689,10 @@ void blk_freeze_queue_start(struct request_queue *q) freeze_depth = atomic_inc_return(&q->mq_freeze_depth); if (freeze_depth == 1) { percpu_ref_kill(&q->q_usage_counter); - blk_mq_run_hw_queues(q, false); + if (q->mq_ops) + blk_mq_run_hw_queues(q, false); + else if (q->request_fn) + blk_run_queue(q); } } @@ -700,17 +703,11 @@ void blk_freeze_queue_wait(struct request_queue *q) /* * Guarantee no request is in use, so we can change any data structure of - * the queue afterward. + * the queue afterward. Increases q->mq_freeze_depth and waits until + * q->q_usage_counter drops to zero. */ void blk_freeze_queue(struct request_queue *q) { - /* - * In the !blk_mq case we are only calling this to kill the - * q_usage_counter, otherwise this increases the freeze depth - * and waits for it to return to zero. For this reason there is - * no blk_unfreeze_queue(), and blk_freeze_queue() is not - * exported to drivers as the only user for unfreeze is blk_mq. - */ blk_freeze_queue_start(q); blk_freeze_queue_wait(q); }