From patchwork Mon Sep 26 18:28:08 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: 9351151 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 8EBFE607D6 for ; Mon, 26 Sep 2016 18:28:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 830A128805 for ; Mon, 26 Sep 2016 18:28:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 779C928A06; Mon, 26 Sep 2016 18:28:27 +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 B948128805 for ; Mon, 26 Sep 2016 18:28:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163034AbcIZS20 (ORCPT ); Mon, 26 Sep 2016 14:28:26 -0400 Received: from mail-dm3nam03on0080.outbound.protection.outlook.com ([104.47.41.80]:10709 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1162880AbcIZS2X (ORCPT ); Mon, 26 Sep 2016 14:28:23 -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=UBYvfgo3WkTDC+i4YG85NHWx9iAm/vVt5fh9mM0Vq+o=; b=Z8vyGLMh4CMo0sqS4nLKtZm3P0GvC+e3RmD8/+XpEDzZChpHxgqBsDoxzIGkh/r/MTvjOKT7pl9pmuMXwSQDkRwUfc7wC4onsXEnUmFfjUTdYHwPDNqcafFTe4NJi3eUluKF21vkfch1D+vyDhnO5vbU2rdTE8Iq+BlESOYBK4U= Received: from BLUPR02CA060.namprd02.prod.outlook.com (10.160.23.178) by DM5PR02MB2746.namprd02.prod.outlook.com (10.175.85.141) 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:28:21 +0000 Received: from BL2FFO11FD028.protection.gbl (2a01:111:f400:7c09::100) by BLUPR02CA060.outlook.office365.com (2a01:111:e400:8ad::50) 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:28:21 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.225) smtp.mailfrom=sandisk.com; intel.com; dkim=none (message not signed) header.d=none;intel.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 BL2FFO11FD028.mail.protection.outlook.com (10.173.161.107) 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:28:16 +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 DA.DD.61581.4B669E75; Mon, 26 Sep 2016 11:19:33 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.301.0; Mon, 26 Sep 2016 11:28:08 -0700 X-AuditID: 0ac94371-952c29800000f08d-4d-57e966b42952 Received: from exp-402881.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id C5.DF.03606.8B869E75; Mon, 26 Sep 2016 11:28:08 -0700 (PDT) Subject: [PATCH 6/9] block: Rename mq_freeze_wq and mq_freeze_depth 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: <129b2a52-1ff7-7048-dfa3-89416ea42dd2@sandisk.com> Date: Mon, 26 Sep 2016 11:28:08 -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+NgFlrAIsWRmVeSWpSXmKPExsXCddJ5ke7WtJfhBu+WMlv833OMzeLl+Q+s FitXH2WyWDUxz+Le0S9MFntvaVvMX/aU3eLZoV4Wi+7rO9gslh//x2TRtvErowO3x8Tmd+we i/e8ZPJ4cGgzi8fmJfUeu282sHl8fHqLxeP9vqtsHp83yQVwRHHZpKTmZJalFunbJXBlzPnZ xFbwQqHi+bdWtgbGHukuRg4OCQETiZ7bol2MXBxCAkuZJLatv80E4exglLh/uJW9i5ETrGj3 5D5GqCpGieNnTzCBJIQFnCWWv97EAmKLCMhKfN/9mg3EFhKwk5g1u40NpIFZ4AOzxNveo2AJ NgEjiW/vZ4I18AIVzd53nxXEZhFQldh7aTfYUFGBCIlbDzugagQlTs58AmZzCthLvL77ixnk bGYBTYn1u/RBwswC8hLb385hhjj0K6vExb9qEDeoS5xcMp9pAqPwLCSTZiF0z0LSvYCReRWj WG5mTnFuemqBoYlecWJeSmZxtl5yfu4mRki8Fe5gfH3b+xCjAAejEg+vx+Hn4UKsiWXFlbmH GCU4mJVEeHnTX4YL8aYkVlalFuXHF5XmpBYfYpTmYFES570Y/TFMSCA9sSQ1OzW1ILUIJsvE wSnVwOi8d5LWr5DsjqeXmDmE1nwWE/Nj8q9ik064OCFh+Y/L5xc/27E9z5I98MLyijAla32x 3z92nGK2/fhij2H5jMyG/D1ls6+kCsmpHrC0cNX+sKj5dsvirlUyS3apVd6ViQzfxbsshrfh 4JcV9j/iZomGuq99vGZ2i0exmaTdrIf5wqv0LPhX31JiKc5INNRiLipOBABa5a+iswIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJLMWRmVeSWpSXmKPExsXCtZEjRXdHxstwg5lrpS3+7znGZvHy/AdW i5WrjzJZrJqYZ3Hv6Bcmi723tC3mL3vKbvHsUC+LRff1HWwWy4//Y7Jo2/iV0YHbY2LzO3aP xXteMnk8OLSZxWPzknqP3Tcb2Dw+Pr3F4vF+31U2j8+b5AI4orhsUlJzMstSi/TtErgy5vxs Yit4oVDx/FsrWwNjj3QXIyeHhICJxO7JfYxdjFwcQgKLGSVWbl/NCJIQFnCWWP56EwuILSIg K/F992s2EFtIwE5i1uw2NpAGZoEPzBJdd66ygyTYBIwkvr2fCdbAC1Q0e999VhCbRUBVYu+l 3UwgtqhAhMSthx1QNYISJ2c+AbM5BewlXt/9xQxiMwuoS/yZdwnKlpfY/nYO8wRGvllIWmYh KZuFpGwBI/MqRrHczJzi3PTMAkMjveLEvJTM4my95PzcTYzgwOeM2sF4faL5IUYmDk6pBsZ2 55gpNmW2BRq/581NkI1LKo7ZJ6vTMlFjceHydr2/pow1Qgle6m8FDytlsL3gLfc+YNm8rFl6 YaFz7wm1D6uXhajYm7q7iwkYf33VFa0UwXOH4fKe09GRMbv3CDZJufzmY+ZLuP2iK/wIf/TE l37XLzWsrd3F3Jw/NfXejTfHg8uTpW45KLEUZyQaajEXFScCAGPw1ecsAgAA 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:(10009020)(6009001)(7916002)(2980300002)(438002)(3190300001)(199003)(189002)(87936001)(50986999)(31696002)(2270400002)(19580405001)(54356999)(76176999)(69596002)(19580395003)(110136003)(5660300001)(65826007)(33646002)(2906002)(305945005)(4326007)(86362001)(50466002)(92566002)(65806001)(23676002)(83506001)(68736007)(229853001)(7416002)(65956001)(53416004)(36756003)(47776003)(77096005)(106466001)(189998001)(626004)(586003)(4001350100001)(97736004)(11100500001)(356003)(7846002)(8676002)(2950100002)(6916009)(8936002)(230700001)(81166006)(81156014)(31686004)(64126003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB2746; H:milsmgep14.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD028; 1:ni4XsUJvzOQ30vet7NZALzrBiLtJoUWGefO3GoxvOpfBMRaiBMKX/wwvH9T1JwskQ9IqQoq6CKLnImefNzEipPETxdNNUSEIDG4Ee4HHlC2UWaboK1znuFOLkDziAJEKR8eVlNEvOegdyxR3pobWWs3mQA4WV9hz3j4WqiF08/yv/qR8mxFd4jCRkmidnVJJDi6CITjb2CQgu3nCMj5NQiLSPPHbFYJBKE5X56NhKZlvDjSHxz2FrL+0TRwyjXh5EaD3WLykHrsKDWw+ka8r3/pDHmq/SBMZ0fZWp7gKM2p3pKg1F/kZr8NqK3hnn496wEM+KKdEc/FMhTpKRQWNjHmqRelnzn0cGygM/u7Bku81yLuP34I/BGxTg3mt4e9Ny5At3nwjnu1hSMKC6lg6HL5FzulTqVnLxTj1cm1jtxdrk5cgBAmaHbLFwfuUvtZy47WDwPRCrE2RrUoTXUEZJ495SSCtANlR1b2vRv3mVo4FJcQY9BHTBAKKh87jI1JbGLMpRzpEMBMbxqmaK94397GXxmTk4D2gLikTa+0DDuJF0C/rl/yIZYGPPF0TG2LDYGqwmkMHhV2dPqoxFB31PQ== X-MS-Office365-Filtering-Correlation-Id: f9ebc94c-7d0f-4eff-f514-08d3e63ae4c0 X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2746; 2:qhrrTS7mMby0PTKx5uMBZMl++VPzXa4N7oVUawU4Tkffflc4tqjLoTn8M14QPErVuWKAmpQ//+RgnE1r4vb9ORdSTFd/3eXBH8iZ9+xZKzzzZDmooUvHKMlro9TJvpF8K8ftQsa5FiTZzmSJOTPd5Wydj+0YEW1bvGiDk2/rVoyu+JstHxADRoKfFo73Vmjq; 3:dvwMXwtPsi6qxRMgA2MIkJYWuWhr5o+a+XVvTSG6bghaXC/NLiDZ5qBF5ut2O6S/oQEEbZBOGAb05tV2g8NZraju1jKh0nvI8vbSkJBDJ1jy6x0WLmLNjwlrv4uuoOQxMJFTzYXQuLZgtsEW4pLxXSGxU089mGxOvmaotODU5yZBg3wmO9QFuLSYQhVKMX/hx5QxLLWfMLN6UFzKIUGhBrfbAm7aWQkgRXy2Luz9+6QJVp7rmzFv+Pujx1xxnoovQEcZ/OjHT+tD+Tsl6oMo3Q== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:DM5PR02MB2746; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2746; 25:0JUoubNb7mAouRqrjyIQI9spjsR6cXqpT2IGClXumiyY6Nsn8GtswbPOTyVwJRftTFH0pMm0FNWrofZFKNBNBfJguSwnYjRfF+8pDvHpnAISfcqVO3V3QGkFlgLtktqdk6KMjh5eemHnrZ6w0cX0rQxBBJTsneNuAv+j0HAt8mkr84WEIyWJ+3mI4Knxb9N3T5UTlB5R8Jl5h7vCrakaKp1XQy56RvkHhhLU8uRVfoarz47NCS0ymb84uFcA6GN9IjJXMrg8/U9jg6R5svzg+bk5DNjUfTXpCMdP2ILnECdeGYViEGtM1odCyunnv8y0p7fiT7i4+kDipW1/TgOLncFaBUJjP+xkFhuLFHnb6KoBjThlV6JArm4snBdtH7c6i38VDmHTIt+qSFMvcW2LAb4J52pyq1b6lXH+mn1DyQzLU/A8CRSUoOHk9VgCVP7DT3LWPQx4iYPQmoXTL09Dei6gQH1hX0K95vlOllqJUacDJUz9HtluU7NYBkqDoCTsFwrqWP20wxnhWbrFEdPggqyfJf59fqMTJmIxu5W1aLrGNs9/dH3jeJwo4kzJA5JhR09iHx2rLK8yuODaXwEQ0D4ww/D3UJ6GefYsg/RICx/5yR9mVlaTcKwGh+y6RnUontR/z4v0aal3BM714KeYllwFnHkSftkEDwiWgb+LyP1Xw0aQiIWZtWgutvUux5qxVtnd4SAfjE9BfMywM/RCTuN5Fnxw1Aqho+pGCvaX1s059ZbpQHltlmBRVuaHFI/WtEA9GPlA0U+grhIBxHUWM43KeSBmN9xhaHw0fTu0xFk= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2746; 31:Yw1cWurKQQnNp9v41m+jM70rlE3NZ3j5DAY5fUXHNKPdlcrO6A8voG3T6h7GHaAl+Ba3R2VwCS/8TmPU0kBB/uPqKLFutN1jOoTNq9gj5egTSbJ86xVwQ7464VDuwCE1AbbUFiPpF4AE2SUkER0n1QOVJ+QmbrR8BtN3fqdyBB3KXg9b7er67jzvjH5g7p5q6AyzZ8MAVG4x4Q8wWAikxKK/1C6uWuKBhJNK+9epEj4=; 20:ZYnCg6JwPYt6+gd6EWn8tTCIWWyxuxKvxUjUk9LkAP3EgbRpa/hbkSetdnoaVgxlxefS1S1+MArCH9JFjC3Q4AA6NmIHPOfoj71Kezae8Oj8QtAiQawQ+ThLnvDeIQsBMU7x4UQ8CeBHmmAT33gbgsWdY9RzfkfgA+OxmpzATfmdHT1HoB4w0gEL5LenTS1Ep4G1yjCdNEqahziBFUrdtmCsyErcED8QdXDaXRtMguv3NmgAlxPMY6G1t1pYgiscA658CooNe+iIP5o0XxifDGZuZq+309u0rYiA+VjFQg3K9oHD3XZxBUnk1iPGmSfrsCI6TOjPNnHBtXabAoWXaaLTrJSRkdAJMS1BNtQ+1qd68v9WqnEnu69k3Q5+zgk6MkLYgbgE4O55qAp3/LgDXuI8WDyyJG/V1CUqsr8Kf/UEzSl49fYSPSuc8KGihwC9orqt1xSKUSPleWTKDyDA2gdIN0hOERBv4UvINOedxZl/ksgj+hb1EYjYBdZxvOZC 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)(13018025)(13016025)(10201501046)(3002001)(6055026); SRVR:DM5PR02MB2746; BCL:0; PCL:0; RULEID:; SRVR:DM5PR02MB2746; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2746; 4:4l5Q1ksvxbhB2eEH73EjkuqqpYzuGp6rPOl2L4bwuc2EmCp7sSnE/cIxeT8YN/h2BxU06aRUbzXeZLHH04e4RCBoFSa9wFKoDeVgX6XHE2X/n+hnmdaOeUjb1NlaNTp1acVq1eDJfjX05HlPBV1r/f8FLTSJZpQX9wdS/SnHFuoZk4bRakZAQOx/ZiNuWLJ2beCJyBHoqc17hG/zX4xF1Dgi2p/uaDxcOxCxGHE4nskxM7lSr7bJ6FF8LWjJkLLpwyc/NS2GPgW33RjiFGs4MT+Yi8MYWY4BsxW3xjTI3du8k3R5FsVGrov95yxNmkxaG/8w5NOHaKUoqFo+dkA2kuUOJIBh2tqA/B5XbU/pszrDm5bW0BUX4hejzyQSvcQ/TDBPnfI8p40xpAs15n5h47G2UbfviId9RDFnGtzyuP9SAdSdSE+irowAw+zHpBLaADo0bdZoV4k+qyXIYCM38VrOXgR4E6QGP93+dsw/lNM= X-Forefront-PRVS: 00770C4423 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjAyTUIyNzQ2OzIzOnlrNS84bWI4dkFzaVBJck85WENnRjMxdkpQ?= =?utf-8?B?MC9STmR3K2V4MDBWREs1OERBblA3VWd5VUhXRVhmVGExallabHZyK0s4dmpy?= =?utf-8?B?MWY3d3ErZmNxSjROUUZqWEVMZG5qQ25POGwwdXlZb0d4YnRHYnJSZkM5MW5h?= =?utf-8?B?RHY2UHZVNWUxdDZ6SnMvczhYTmw0QkVnR0poa0xya3hzVy9ieU0wSVFIWGhl?= =?utf-8?B?aXJDb21hb3dZTWh5RG9ZdC9qNks4NS9iZCtsZHlGV1B6VTk4SEJ5cWNzNFZD?= =?utf-8?B?bE9WWHp3UnFIczk3dUtnWEhWeHhmcnR2bHlwWGF2bnIrK0lYM0RwRUt6R3R2?= =?utf-8?B?d1pBTVQ5NDdtSlZlMTIzR0dvbGN6TmRHR0JjOEtHRlZpYUwvcEp2a3dmcDJt?= =?utf-8?B?K01LYTZhN1N3TzQxejdkcEhxLzkzY0ZYVmJ0bnQ0SlNMMkpNSFpXZ3ZxeWYy?= =?utf-8?B?b3AxNmdKcncrRFRwekQwTWxPNktHOXhrclJZcm0rOERHYXBNOVZLaGw5U3ZF?= =?utf-8?B?QmFGYitGYmtGYkhmRTJEZmQ3VkFvcnZpK3JDN0J1YzRFNWxlSkF4Sy9lTXh2?= =?utf-8?B?OUZnQUg3N2I1VjZDU2VncjdsZWFPRFJRL3ByM3A1RkdmSWVKSWpVa0lDOGlp?= =?utf-8?B?ODNXYXAxbUkzTllITXdITlI2TjI0NmUvY3EyZkdGYWkxcThSMUo3R0gwQzIr?= =?utf-8?B?VGZBendXdDQ3N08rcHp6SktqSVByOXVCb1lxQU9RTGpZMmxXNHhsQXhzbEhp?= =?utf-8?B?b3I5bGlmeTdsWEZQam5GRGhKVzdWUjlpNk9pSDBPVWgzZ1EvMXZ1ZEdJa3ZQ?= =?utf-8?B?bjlXeXNkTHVRY0JIRHh1SUZqRGl1eG1HWFVLa2ZtZGUzU2twMzU2cW1Ia1BM?= =?utf-8?B?T2VSRDYyTk13Z0Y2S1ZEbWJoRDRFV1JPNkRpa3VnTVQ1RFFrWDU3ZThteFVv?= =?utf-8?B?UmpMbUNGdDZIUW1tNEh5aUtid04vNXdnMDc2MXAydFMzdTIyTUJLbXlXWHg4?= =?utf-8?B?MGdXaFFYV2JxNTFLeXFtbVpQV2hsQ2pxWjRQbWRPRnFZMUxFeTAxd3o3b2Z5?= =?utf-8?B?bmw1eFhDRklxcWh1TlNkajNaV090WDArenZUZ2ZTRzFScXZWRW5PeUNtUllq?= =?utf-8?B?ajgvUFRtVUg5Vm1vbWNwNFdYK1l3L2ZVaFN5NUVmZnhidUxodlZDWkRzeS9T?= =?utf-8?B?d1ZmSm80WElreWJmWTNVeVBhcDlzMmxGWjUxa3ZJWVNhblFjOE9rS0ZzbVpa?= =?utf-8?B?VUVKYkxYTjVaOHhlVHIxSUJTWlRwazZTbHRwbTZTVmozRHdLWXhGMHMyYjhB?= =?utf-8?B?SmdhdmR0Yml5SU5ZZ0lZYnhjY0w5M01XeFBCd2lVSkpuY0FkMXFpZ2cyQ2w3?= =?utf-8?B?KzVKdVRIN2tWYXo5c0luUkZaZnJFbTgvSXl0RC93WHdTS3pOdWZMWk1ldDVy?= =?utf-8?B?TFJoKzM1VDJIdFpaaVpUUHlPaktIWHZkME9nd1BLc1JMRVhqeGV5NWR2UVpw?= =?utf-8?B?MEt1NkZzTnJqWlhmd3ZlRno0aTh4MkJvZ1JOVkxoeGdMcitROEo5a1FPSnds?= =?utf-8?B?SzRNeG5RR085RkVSWkdDeEJ2dlRBdzhuckxFMVdOY1ZLaHhsMGdXQStTbkVF?= =?utf-8?B?UDZNQ2w5Y1FTdDhkcUVBVTRrajFnYW5qZStXS3lWYlJxM1JPaUFkdmxpaUlh?= =?utf-8?B?dDVKMGZFZFZpc1IwRVcvbGZvTEJlY1lpNy9MbHpleUtuQ2NNUm9ZNmlKUnA3?= =?utf-8?Q?K3aRZoETP54BskP6YA4PjM6hOg4BjFJIASID4=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2746; 6:r6fRasu4c4MYhKdizmTasupL5TsUNdkdipUPCjrc4K2wODe4EqCUglUnCrimtUv0gG6ZkzrvgswZnWkEPPzC0ktk3nQ9FRi4lPP01zLDSx/nXBlEJrDoBM6qeUyNYcorHnkI9n1VstxD3Q9KtxQXlvk8/pdOjJCghB3bdqoichi/kApCbnBisi+jF8jrCOWte3ofCNwRGaXIelK35tTJRKhWdNU5p4F094ChGQGjQ2NelsZjRRxy/9qBYNmDLS9poIUSzeYC2Imu8NYACucVJK05kISsow3ztD0IVZDr2HgfuU+fhr2v969zw6iiFbzPkkHniIv9NdFr3OcPpXfliQ==; 5:/PJfquTo/pdBLNbLFH/mDiUoh/vorK0pOsQhAl46acyudOvoRRk8+vm9J01xHBUedSWqJGGzV1jaw/CXz7BS12Fm60aoo1osew3OmfNlj7yIXBCb3Q3haikihyMN8/SiaCgcwAuMToo+9RhaOqZu4g==; 24:EpbyKLfr8ve/AQ2poVi/6wedPgAVoOSeskGbGCUAspRFaGASJ0/FvXTDFEqoiIMWQGcqMxMgaV/EyLFcYgR88luX9H0obIO5DrpWb6SnI0w=; 7:rZM3eFr7kQfQHMfRgLukDfIJnQ+0guvbu3nbLN4XFtpb+Kaq8aLiisNGTAAe/7ES9CTc3jPzSJL/XlufUgTYtjxRP/6HU1cUOczdXo6jVtyHeBRAIinfV8+OLKFe0Dj8dMa53m8cmEujeZ8T0/BDTfhlGE1M50cry/VjdhnVUIVEdgJUhWSyE5PkQNSsgudmuxq35OxzFgTaXt4dq8MufMKwOIkDts/5nYSnFUwDULD+5lcVq7shwE8xtI88UsBp4um6gzzJW4yWAeAAGoxymKua4DpOXzaO2+CT62Xy+T5ny3/t5dVymogDgkkHIjXr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2746; 20:rcRuIGRX2FogVzIAmPmz0DuuCWd72f0rKGj2Ia9+Z0b5kzdnktIJHeeGnKzLTM7Dw3b2usHZL9Qyg7E8Ip+gEA7OFWu7xOQvgT2zg7PY6jRSmf4IP0xenXYL9Vidp2HQCIb4/5296zeCkLerp96mFgMutCXmKPwKC8tG69qaXJAA2Lm9amQJubUetujyOGRuKxAf60Ae+edRhAkqR8WUWIkP1vtG5u5aNaX3bQQgxo2qqWYSscKf16pgt6f/BE0M X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2016 18:28:16.1354 (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.225]; Helo=[milsmgep14.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR02MB2746 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 Since these two structure members are now used in blk-mq and !blk-mq paths, remove the mq_prefix. This patch does not change any functionality. Signed-off-by: Bart Van Assche Reviewed-by: Johannes Thumshirn --- block/blk-core.c | 20 ++++++++++---------- block/blk-mq.c | 4 ++-- include/linux/blkdev.h | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 5ecc7ab..0ff5d57 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -659,9 +659,9 @@ int blk_queue_enter(struct request_queue *q, bool nowait) if (nowait) return -EBUSY; - ret = wait_event_interruptible(q->mq_freeze_wq, - !atomic_read(&q->mq_freeze_depth) || - blk_queue_dying(q)); + ret = wait_event_interruptible(q->freeze_wq, + !atomic_read(&q->freeze_depth) || + blk_queue_dying(q)); if (blk_queue_dying(q)) return -ENODEV; if (ret) @@ -679,14 +679,14 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref) struct request_queue *q = container_of(ref, struct request_queue, q_usage_counter); - wake_up_all(&q->mq_freeze_wq); + wake_up_all(&q->freeze_wq); } void blk_freeze_queue_start(struct request_queue *q) { int freeze_depth; - freeze_depth = atomic_inc_return(&q->mq_freeze_depth); + freeze_depth = atomic_inc_return(&q->freeze_depth); if (freeze_depth == 1) { percpu_ref_kill(&q->q_usage_counter); if (q->mq_ops) @@ -698,12 +698,12 @@ void blk_freeze_queue_start(struct request_queue *q) void blk_freeze_queue_wait(struct request_queue *q) { - wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter)); + wait_event(q->freeze_wq, percpu_ref_is_zero(&q->q_usage_counter)); } /* * Guarantee no request is in use, so we can change any data structure of - * the queue afterward. Increases q->mq_freeze_depth and waits until + * the queue afterward. Increases q->freeze_depth and waits until * q->q_usage_counter drops to zero. */ void blk_freeze_queue(struct request_queue *q) @@ -716,11 +716,11 @@ void blk_unfreeze_queue(struct request_queue *q) { int freeze_depth; - freeze_depth = atomic_dec_return(&q->mq_freeze_depth); + freeze_depth = atomic_dec_return(&q->freeze_depth); WARN_ON_ONCE(freeze_depth < 0); if (!freeze_depth) { percpu_ref_reinit(&q->q_usage_counter); - wake_up_all(&q->mq_freeze_wq); + wake_up_all(&q->freeze_wq); } } @@ -790,7 +790,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) q->bypass_depth = 1; __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags); - init_waitqueue_head(&q->mq_freeze_wq); + init_waitqueue_head(&q->freeze_wq); /* * Init percpu_ref in atomic mode so that it's faster to shutdown. diff --git a/block/blk-mq.c b/block/blk-mq.c index 50b26df..e17a5bf 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -94,7 +94,7 @@ void blk_mq_wake_waiters(struct request_queue *q) * dying, we need to ensure that processes currently waiting on * the queue are notified as well. */ - wake_up_all(&q->mq_freeze_wq); + wake_up_all(&q->freeze_wq); } bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx) @@ -2071,7 +2071,7 @@ void blk_mq_free_queue(struct request_queue *q) static void blk_mq_queue_reinit(struct request_queue *q, const struct cpumask *online_mask) { - WARN_ON_ONCE(!atomic_read(&q->mq_freeze_depth)); + WARN_ON_ONCE(!atomic_read(&q->freeze_depth)); blk_mq_sysfs_unregister(q); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index c47c358..f08dc65 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -454,7 +454,7 @@ struct request_queue { struct mutex sysfs_lock; int bypass_depth; - atomic_t mq_freeze_depth; + atomic_t freeze_depth; #if defined(CONFIG_BLK_DEV_BSG) bsg_job_fn *bsg_job_fn; @@ -467,7 +467,7 @@ struct request_queue { struct throtl_data *td; #endif struct rcu_head rcu_head; - wait_queue_head_t mq_freeze_wq; + wait_queue_head_t freeze_wq; struct percpu_ref q_usage_counter; struct list_head all_q_node;