From patchwork Tue Apr 25 20:37:39 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: 9699715 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 7438460224 for ; Tue, 25 Apr 2017 20:38:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6410E2846B for ; Tue, 25 Apr 2017 20:38:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58A6228484; Tue, 25 Apr 2017 20:38:09 +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 20D6528485 for ; Tue, 25 Apr 2017 20:38:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1950291AbdDYUiG (ORCPT ); Tue, 25 Apr 2017 16:38:06 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:14525 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1949931AbdDYUiA (ORCPT ); Tue, 25 Apr 2017 16:38:00 -0400 X-IronPort-AV: E=Sophos;i="5.37,251,1488816000"; d="scan'208";a="13849580" Received: from mail-co1nam03lp0021.outbound.protection.outlook.com (HELO NAM03-CO1-obe.outbound.protection.outlook.com) ([216.32.181.21]) by ob1.hgst.iphmx.com with ESMTP; 26 Apr 2017 04:37:54 +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=bQRf8BrgoXE6mTSys0V05oat9RNUIbcZ99u9xpK6DfM=; b=GXADEpR5DtSEU7YQioHp4A8HOQaVUPjzPxcnz51kDDPvjBYkn6bsBOIC0tCsCNx8bu+zd6l5McMYItp3XLNUWmm9+AuNqf3zsUnpymQ3z4icxj8s9NHLN5hmA42sQoyqUGWPJsyNp8eMCBiFqslLGbdeg9/QsqV9RPOOGWgCLis= Received: from CO2PR04CA0101.namprd04.prod.outlook.com (10.165.94.155) by DM2PR04MB416.namprd04.prod.outlook.com (10.141.102.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Tue, 25 Apr 2017 20:37:52 +0000 Received: from CO1NAM04FT053.eop-NAM04.prod.protection.outlook.com (2a01:111:f400:7e4d::200) by CO2PR04CA0101.outlook.office365.com (2603:10b6:104:6::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13 via Frontend Transport; Tue, 25 Apr 2017 20:37:52 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; suse.com; dkim=none (message not signed) header.d=none;suse.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 CO1NAM04FT053.mail.protection.outlook.com (10.152.91.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1047.9 via Frontend Transport; Tue, 25 Apr 2017 20:37:51 +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 43.1F.29323.E93BFF85; Tue, 25 Apr 2017 13:37:50 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.9.6) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.319.2; Tue, 25 Apr 2017 13:37:48 -0700 X-AuditID: 0ac94369-548749800000728b-d8-58ffb39ece25 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id B9.2A.18148.C93BFF85; Tue, 25 Apr 2017 13:37:48 -0700 (PDT) From: Bart Van Assche To: Jens Axboe CC: , Bart Van Assche , Omar Sandoval , Hannes Reinecke Subject: [PATCH v5 04/10] blk-mq: Only unregister hctxs for which registration succeeded Date: Tue, 25 Apr 2017 13:37:39 -0700 Message-ID: <20170425203745.19946-5-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170425203745.19946-1-bart.vanassche@sandisk.com> References: <20170425203745.19946-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsXCddJ5ke68zf8jDI7OFLFYfbefzWLBm71s FntvaVscvneVxYHFY2LzO3aPy2dLPdZvucri8XmTXABLFJdNSmpOZllqkb5dAlfG+79CBR1c FRfWbWBqYFzB0cXIwSEhYCIxa2liFyMXh5DAUiaJ+VMesEE42xgleic2MnUxcoIVXWrcygqR 2Mwo0TnzIjtIgk3ASOLb+5ksILaIgIJEz++VYN3MAlMYJaad+8MIkhAWiJC4++IcK4jNIqAq sWruOlaQ1bwC9hKPprJDLJCXOLtlJzOIzSngILHiSjfYYiGgkq6du8AWSwg0sUrMmnkbbBmv gKDEyZlPwGxmAQmJgy9eMEM0qEucXDKfaQKj0CwkZbOQlC1gZFrFKJabmVOcm55aYGiqV5yY l5JZnK2XnJ+7iRES1Jk7GO8+8T7EKMDBqMTDG+DxP0KINbGsuDL3EKMEB7OSCO/FJUAh3pTE yqrUovz4otKc1OJDjNIcLErivOdkpkYICaQnlqRmp6YWpBbBZJk4OKUaGPfNW80+QSh0z6Nd zxarPv1gc6N7rvh1H0P1egvNM6wHn23iTTmk+HaehfTWJZMObG8zfNSvvaPVV8F057wH915n fHgn0T9V70vz9w6hvEb+C/p60o9sZaQO28TO9SgQD9det3KZwaHjq1YtvMq9rUVh7fKYUBeN wIlzJwhZzOncPjPXYNrRffOUWIozEg21mIuKEwE7/HxKZgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMJMWRmVeSWpSXmKPExsXCtZEjRXfO5v8RBlNaNS1W3+1nszj4s43R YsGbvWwWe29pWxy+d5XFgdVjYvM7do/LZ0s9pq05z+SxfstVFo/Pm+QCWKO4bFJSczLLUov0 7RK4Mt7/FSro4Kq4sG4DUwPjCo4uRk4OCQETiUuNW1lBbCGBjYwSR94mgthsAkYS397PZAGx RQQUJHp+r2TrYuTiYBaYwijxZe8mNpCEsECExN0X58CaWQRUJVbNXQdm8wrYS5xYfYwdYoG8 xNktO5lBbE4BB4kVV7qZIJbZS3Tt3MU6gZF7ASPDKkax3Myc4tz0zAJDI73ixLyUzOJsveT8 3E2M4GDgjNrBeH2i+SFGJg5OqQbG4CS/H4u3vDE6+Ly740X1QpG6NVm/zbWue2cbbnBvPvVE JIizRPRmXvHpm8IGbEv2Z5fkOc+u/2n4vzwtX/Xp2sknJnCWXVraH/ZDbtWCcLV3THfWuFy/ mM/+/859T7V1wZ+FJE9t00lwP2Srm5r51Zj55BlB9YKZr3V3OU5YJvnz29UjTOuSlViKMxIN tZiLihMB6nKPZbYBAAA= 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)(39400400002)(39410400002)(39850400002)(39840400002)(39860400002)(39450400003)(2980300002)(438002)(189002)(199003)(9170700003)(76176999)(50986999)(110136004)(36756003)(54906002)(53936002)(77096006)(38730400002)(6666003)(33646002)(8676002)(2906002)(50226002)(81166006)(5660300001)(106466001)(2950100002)(356003)(50466002)(48376002)(8936002)(5003940100001)(6916009)(47776003)(1076002)(4326008)(189998001)(305945005)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR04MB416; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM04FT053; 1:77qmL8gYmcnWvUmYtQSt1eDONTWmclRV9kZiR2P5njEP5HvAG7dtbh1hGSWiEO9sVhjbVuYkPHN+ZyTjGAHtns/ZfGScv27z1oeuI1tAbJ1FFhJBGYIvr0tK3SeJAl1JM5/eiF8z/JziOkO6Idy/QS54rqOU6EPEIdZATem7k9iAVGHjyL7oL2zS6Db+dsOvRnO+sNkU2G+N4KMhsNzKcv2A+n7sAN8KqiOEs2zmDr8gAH+ITvu/7FL4ISsY6NAkP8cC2QumLEFqqASBf49LvOGTJCY4NmKu0/vcDF3EjPqBr6wdBKX8aWcWTDY4dAY3obWjG513NB4xbfx6vSn+WA2IUk6bGlLCB187P0kC1aPfGSaTsO0WG29zB15JvFvfRHPaBVAMzU7/BhohLPssN6gSdQHEXB2NQto0YJl11zIRsBA/T/krTOBVZI6is+AAGt8MNaQ6NNY+JXfwIs9jk0XR8BN0Xc/yhaZ2ogGEjTqZArGehVbhVn0f3mDsFcxtYTq5a11LjnqanZguEs7fktWgLaH19QWA0sVYIxOgfRY= X-MS-Office365-Filtering-Correlation-Id: fdaaf5ba-d82d-4529-67e6-08d48c1af1df X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:DM2PR04MB416; X-Microsoft-Exchange-Diagnostics: 1; DM2PR04MB416; 3:YkH1JxMBy9SEF+etmM+dLcr0OXsxA7CdgoSnFinzkV9kHJ9EVbWKxfw2MUdVoaIBIpwtMRNs2KR91wBNPBd5OTPQJUzEy1WAusCyoLiCGyOtluoBqxOxHvbjxxHqrC4CoYd460pbzWTqgD5ufvognLUmEE0VKqlE7jPFPY0tHj5uuTGocvVWhVd75D6AhJDecwpRWvWXtq7LWDmGsk/kTUMpHYZ1EV4pMIDjPbCVjfJQIn5pewGTqiEpq6M8Lx5jPHf820V1agnLCOaiVlrQbVRxYn/Ax+hjqBJf657JL14VrMJ0V8YDPb6bsJEk67V0oLEuPoDot43eQ5H7V2jT2UZKs32Rw2R3tqVz7ZL9mIo2nqoNe32cuZNn+LDw8AvVzFLszlY6JkBrSHJ18bNpTwy2HkZHwcwU2lv5bwyxsObcNLSxdDVARZV3T9+OsPJ/nOSmFppCEQPhoouJDkiQIa8IfmY9Td2Ud1TT826ORf+Nskv60UsroW2pdsyWwyjY X-Microsoft-Exchange-Diagnostics: 1; DM2PR04MB416; 25:nvim2l7GPrYjETWtwmtWxhXhe+gLSflZXcACeOYLseTYTG1z/e5mR97feDAI9stB+eltjoA2xagN9OGF5QjGUgcOmYtDdDg6SuQakxOxnUsZjM+s30cJ3XV/AOk7x/i1CT002RyGvwLxkvFfIjBswazAoQOM4q2tnkXWAv+d5a151g8smituO3E4EvaPWkGc8wzLhJMu/NziRqQ87zXbIT1gHpiCksrojX6uSavZGJMNakcTxXMICRoXP/AnpJ+5GaKGc44MBlIoiM46tjyhQ+us1aQfsvv+NzTm7lD8aVLcNulm1LNlXfAadr5RICTPKljrlMtHErhaw/fWJkEA8seiwWLPJyI/T7CzM+Nm/xxh4NSH4CKmkAOh1sRu6fLFglab2p7DxNLcTPhP5aJPlF5Bglk0EmifjbfTIoiaTM3HaZr84wMVCzWyOJLmCxUdPCkGR6P4T/jPw7tDBntmrw==; 31:kmzH5z6eMHue8I22IOXqImHx2FWfMT1oqp4KbVnAo5415CN0MUSm22YOimmi8SuINGLZNsTHqMJiHEem8RK9nzBkktYqVitHQJ9zy7yGPqJ0TXYeWGcn3gSN/1YXaVXsJtpcTA4m1ch3sp9V7/p5GqC/ptiQ79pdol9j+HN5T4jX8vLx3iwX1jKTD1G8NIlqkIgRiZ3QBIm9aKPbRBbz7gFh0iPoETBAUpbCWCFW1j8pDFxaW8l4NvDncX1cSDUXSerCGXcfucx18cWqyRzYVCFSLD3MYSACHCDDeOz9tJM= WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; DM2PR04MB416; 20:c1/XoGpDn+A1o9wuG4hJCa0hZSznWFJ8NxV76FtvZXyvK0YYQXVccZo8Bi+APr6QcpnCtQF3Rss35A7AW2kRs9TPFZadZm6GQt3sb2mn5qRVDxpsXxDFZqcs8eTX+e7tn3Qhh9bdBhUsculxZWv8rpu36WlnGfZ2jiC05LKNAnZs4G+Y0mZFD2jyLG/eteovqwNsqP+I20ZUF/LRSMNgeVvw5e68iUb5FUTcVuxsD+FI0KSM4MUs6iY+vO1+2RO1qUa+B74iVOUm0rbp7GeMq78PSBiIKLc6ghw5YhpNDhWE514GU4YTRcRrnu3xjZSOz4RnexMLyZ2ZF3lMDzxPGfWzTX7unhUGHGabQbtUSI0qdenQFKIvaQxY8988u03N2Eti/+FAx4vDJp70N/3r8E/577rvUgsQ1JfkK+h102m02nRBP92UtorveMq1wbM1OXK3DTkbsn7/hu6JHXt7Iu7cDx1/3H8ebMbQVeM3AuYyc77qrmMClz6mrF2+mItl 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)(13018025)(13016025)(5005006)(8121501046)(10201501046)(93006095)(93004095)(3002001)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123562025)(20161123560025)(20161123555025)(6072148); SRVR:DM2PR04MB416; BCL:0; PCL:0; RULEID:; SRVR:DM2PR04MB416; X-Microsoft-Exchange-Diagnostics: 1; DM2PR04MB416; 4:c5R3bAbEDMMOZmWeWfeEHEPXuHu9RA0P1omm30J4pK2HExlAM1b7x4FAUK/XyGTST+rZDFRJ2vnwUAXI+zwJoMRvmXLamNrh0BkZbal2WSiOXIC30+xzCw1m2PEsSPSp7hiA/ELp1PBcvNbk7amgmDkh0ahLYNi8zmeXSH2rq5gsuV40yipfBP77muQOmBsLh4Dn9Aefh5pUwWdHU0B2ePtU2qPfejPXCQmUQokhcyOBrGH0ODdLb3gpDpswoJ6aooBDxL0RnYkPurg0oyyrYXfSsJfPYXagGcPZ4GHfyfnQN2WTqT5bKk1rSRrSBNZ58zTHr0YpXTKBC9IOHkeht4vkddYdeQEfLsT1aFIrXlXHB2FMTRNIv5Rlqm6Ao+s/5LOMPpRQJvmSUhtR042ig6P7vAyp1wfyBSyLVg/yBCNpNdxsbQkp2FxlfGMLA9NHbDylR46TBbFBRu5ZsGVlCfhFbU96Y6GcDNJcg/gJBuZrRV4F5CufEnKmwO1/QU9btSBTGn+hRYg8taZfCMczVwp3iX9+VMnBZu2RPCwnquOiYK0R6D9VBzfZE6JW885VnngMynTjB+xHkNQ4AFflINHchR9k1Ee8pfa9oQppObgX2gZxxUIEDEyRjAySxKEzX+IcGSB+VtHQPSg8cmWln0a+Kk1NTH8hMPyF1EcLHnmTWzaTn24IkTX/Z7ezu0ZGlklnF9EuWl8N+R5cT4JlJeuWa7AGB/SDrL0HwxStop3imVGI4/03ZD0NtR/frZjurCucbcMeEI7rpX7CQ50exZbb0q9fM3L3oFJCRxahgiAerSWmpPC2tVGELYPXNTMVoBVoIlrPRHgOjgqgaFPIlOp+wg7HAZbIWTwLQCn/fqw= X-Forefront-PRVS: 0288CD37D9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR04MB416; 23:yhBAlNlIhxLl5lPDC4+burpDI5oGNJRuFy1p1hG/Wh?= =?us-ascii?Q?jxzSokcTq+1NVQam+jwcEeNqCxBNIwZMNUjB+BN5QjKZ/JoyxxH/Tt/KyD2y?= =?us-ascii?Q?A+j8t/CtXXjQUsIrDImnqAUX9CgkRLyAvByrvYkeMjl3ApoiwtGaR76o3e1w?= =?us-ascii?Q?KGSLRtriytsBaPN7Mpzc/M/Ed6pcdDSx9cjYVpMfQZoPyvkYkMo+BtYxa+Or?= =?us-ascii?Q?JwViFIWKoQg4EufmXGcx3mjLseJc0lxeMDyPAjEE1s4V6cfs6OOWUFI5M6dS?= =?us-ascii?Q?6HvHAEAEakQP4ChTTd45j3p4fsCZJlyUiqbMZshP2MgQJxMeTHXu6EFWbAr2?= =?us-ascii?Q?utjpQJuGOvrk2HnW58nZzUehGzxnef0EGIZbY3dBXBpc5kXder32TXJ/DnWY?= =?us-ascii?Q?wMAPdASveSyUMuJU/Ae+1tpfbKOcv8+uOU4UhZ0xEQUIoBKSl06ENNvuk9fm?= =?us-ascii?Q?CW5Hkdu3u5rLdu2AmBeCuKRU+Yg7Eu4FkNPncR9yV2azrWG7u1CZKlq0VcI9?= =?us-ascii?Q?FhRhNya2AwAUgAB647lT+Jyb03+y2sXtBXC866lSuKXkS88C+Hc1KEZbU1q3?= =?us-ascii?Q?BEChSpOwvyqneSuCm3ungKyTJTGCxGPpuCXiPq3qz6wA8vTO0lnhbfuUrRZA?= =?us-ascii?Q?cU2kFnBBpOqdKTg2zYpBY8Ug64CQHmQSJMLFuTW2EX+vtP5prPh5CC70UieI?= =?us-ascii?Q?tNwM9/NnYDx4uP04x6HFajzbMpxNWjEWigIrwnTH71r0TBTAvZ6TZ2paEta/?= =?us-ascii?Q?qSBPlwUBEeq7QuKtguPW+k4K6D1/GkU3hBLD1s1bnKFZ5tGk7kpL+vE3FibH?= =?us-ascii?Q?X0bSmnlS+Bu3TR04R5IEXSqx76kwE+ubR6vwkgb2Lg+M3IH9RPoJ0Z5BpDpe?= =?us-ascii?Q?oOnlvVzOQPYxwzD/FDO0RkueByjN/1bdXiuGAOnDr0ftuBBAW/X60Ukw3xxE?= =?us-ascii?Q?h2chDHBxAQ2wtB4uVhUg6jNSMzQcx9HknbX0tz2RVzRPjqTwmmJc066zDIbe?= =?us-ascii?Q?RZVhz38Gg7o6EueZxP3K49NNoJn8ID7jMB2TYXwCxgaA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR04MB416; 6:ETQVostEIXk7XZsUJdQlgS+8YLW6PTsviRzO7ykJstPvATYjJKYSbt+1mp/1zbDYrhwIcFt58u4il27rwm7h+8YqZuxd66dbNFecjcdoKmhN9nnQVoU7X/2xRFTqZB9Poy1AHCq7vidlscUSMWCh5LqvC98EmEXnj3hhgXfx3sjfpkdvOxRidxPeKJ8Gva+qgc2gTFmtVLivmndZ+mJhlsaguHnyAcG8Wrv7N4censH35p1alrgsi0hSsM88kaEY63TQIlJvQqW89ELKUwhAaLBuBrLFDXR9/OjLZYZWyp02fi6ie6Cxog+n9RhDa47lpRCgGTC3pxFV/W+QdAQ/MSE1/ULRAGGQuBs/W9AO06eZnKF0/qCydBs7tjByct5WUvZFVpJXoJHlDmXVKY18C6TDEwxtQfKOX+ej50a6vrKo37cEM/20yFtxuF2UfmIKNLjDhWsuQExsc7PfhbhSkGBiS+stbUInYlpmQTx3JU3TdM2Ko0ldhEvrV9dtbPtWjAnT01kPy4P52tQojnPEFONHtbbGX4iUfpP2EdwPhF0=; 5:7WZRN9s0pd1aqqG3MBLLy0n2mbJEQs5UWWjDXQa+5KGKWzpe1rvaWp7tmqH5ArkXZKeQI/bG6TNw3SBYg4yOCX9R/SGeKitfP17LeU5QIj4U5fenw1K362BwaoLdwlpFrQRnQWqT/cLcik7zJaMfJQ==; 24:5Qccjn0+W+SglEGgRBo6z8LVb2q2NL3EL0JUwxYMjxs4vH5o+JFzGlFyfz/fCgOdoCd0SGq3w2Ds5wFl0xHa/CqeBUIjch9dGYahczPKGDU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR04MB416; 7:uE/GToK7h55g4Fk1V43FPafDWYf3bdxNSXNL4s4mI0wv3Xk8wlfmu3dF6Qh8S7+wM/827rNfbCknA501OwOl4uMWoTpm1fzWsHrlkJGDc/vx0xg3xowdOUVjgbbmoN9HeL5H7NXFOGhFF8k4oC17BK4wO233tnc8F3vpzwqUrZ97nG6CQsKjEc5YEb4W69AkHHHPVVZutzdhqfCYiB7UANhRdWXUlHgdC9p/XWwlNsfevfjnoczQWmxFiWq4zS0wz4n6cpfWD5G94zvxN5CmwJqv7OPzA6DRF5qT2D1rSDNU5m6qeizy8tp1B5vdHeO/JRyTuM/ocY1DO+n7wEOJJQ==; 20:jDAIt9KEiC1h18f0MRAN4wd6NGTxd9n822QPLcItNLWmqnGqjS6/FHQ+qeQNDqcvyB8tRGWgr2m9Abii9L/6kukVRA8oedEDF0k+q6fsZ3kskq3Eqwdr9jF73m5KjXMJ7yvAAEtrnaM82GbuUTJ4O+yzbvrh8GtDEYXRn5xOjMw= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2017 20:37:51.8258 (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: DM2PR04MB416 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 Hctx unregistration involves calling kobject_del(). kobject_del() must not be called if kobject_add() has not been called. Hence in the error path only unregister hctxs for which registration succeeded. Signed-off-by: Bart Van Assche Cc: Omar Sandoval Cc: Hannes Reinecke --- block/blk-mq-sysfs.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c index c2cac20d981d..053549a32778 100644 --- a/block/blk-mq-sysfs.c +++ b/block/blk-mq-sysfs.c @@ -323,16 +323,24 @@ int __blk_mq_register_dev(struct device *dev, struct request_queue *q) queue_for_each_hw_ctx(q, hctx, i) { ret = blk_mq_register_hctx(hctx); if (ret) - break; + goto unreg; } - if (ret) - __blk_mq_unregister_dev(dev, q); - else - q->mq_sysfs_init_done = true; + q->mq_sysfs_init_done = true; out: return ret; + +unreg: + while (--i >= 0) + blk_mq_unregister_hctx(hctx); + + blk_mq_debugfs_unregister_mq(q); + + kobject_uevent(&q->mq_kobj, KOBJ_REMOVE); + kobject_del(&q->mq_kobj); + kobject_put(&dev->kobj); + goto out; } int blk_mq_register_dev(struct device *dev, struct request_queue *q)