From patchwork Thu Sep 29 15:33:30 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: 9356615 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 81B0A6077B for ; Thu, 29 Sep 2016 15:48:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7259A29BAE for ; Thu, 29 Sep 2016 15:48:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66A3D29BB3; Thu, 29 Sep 2016 15:48:20 +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 64C4429BAE for ; Thu, 29 Sep 2016 15:48:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755055AbcI2PsS (ORCPT ); Thu, 29 Sep 2016 11:48:18 -0400 Received: from mail-co1nam03on0075.outbound.protection.outlook.com ([104.47.40.75]:60416 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754542AbcI2PsQ (ORCPT ); Thu, 29 Sep 2016 11:48:16 -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=9c6oCRBSLY/BDm3xghnbNPNpk5UiEBAzufB2tMYfyc4=; b=NTudyiRuTnctHKErE4rcQwsoTdEcwT1nluLbd3f7KuQ7DMzhdpC08Td3F6PdF0XAgTkpoe1op1nz48bY4vtdaWP0Vb6vXMsSkRslP92xNiugflUE/I0/8UuV8jEFVIB1TBFbQhjE14hiLeAddmfk0IZDd3RsXbbZx7OlKN5ox/A= Received: from BY1PR0201CA0040.namprd02.prod.outlook.com (10.160.191.178) by SN1PR0201MB1520.namprd02.prod.outlook.com (10.163.129.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16; Thu, 29 Sep 2016 15:33:32 +0000 Received: from BY2FFO11FD020.protection.gbl (2a01:111:f400:7c0c::173) by BY1PR0201CA0040.outlook.office365.com (2a01:111:e400:4814::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; Thu, 29 Sep 2016 15:33:32 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) 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 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 BY2FFO11FD020.mail.protection.outlook.com (10.1.14.137) 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; Thu, 29 Sep 2016 15:33:31 +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 67.CD.26959.5F13DE75; Thu, 29 Sep 2016 08:23:33 -0700 (PDT) Received: from milsmgip12.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; Thu, 29 Sep 2016 08:33:31 -0700 X-AuditID: 0ac94369-b97ff7000001694f-01-57ed31f5af31 Received: from exp-402881.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id C3.D5.03606.A443DE75; Thu, 29 Sep 2016 08:33:30 -0700 (PDT) From: Bart Van Assche Subject: [PATCH v2] blkcg: Unlock blkcg_pol_mutex once if cpd == NULL To: Jens Axboe CC: Tejun Heo , "linux-block@vger.kernel.org" Message-ID: Date: Thu, 29 Sep 2016 08:33:30 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFLMWRmVeSWpSXmKPExsXCddJ5ke5Xw7fhBg/f61v833OMzWLvLW2L X8uPMjowe0xsfsfusWlVJ5vH501yAcxRXDYpqTmZZalF+nYJXBmzGttZCqZyVKy6s5y1gfE2 WxcjJ4eEgIlE77bdLF2MXBxCAkuZJJ5df8sO4exglFi78RkrTNXnXZsZoaoYJQ6e+wOWYBMw kvj2fiZQOweHsICrxDqIqSICshLfd79mAwkzC8RIfHpmCxLmFbCT2P99DQuIzSKgKtHx4yuY LSoQIXHrYQcLRI2gxMmZT8BsZgEDiSOL5rBC2PIS29/OYQY5QULgH4vE1GU7wXYJCahLnFwy n2kCo+AsJP2zkPTPQtK/gJF5FaNYbmZOcW56aoGhqV5xYl5KZnG2XnJ+7iZGSAhn7mC8+8T7 EKMAB6MSD6+A8ttwIdbEsuLK3EOMEhzMSiK8nfpAId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rxu 976ECQmkJ5akZqemFqQWwWSZODilGhgPvnwmrJVabvr/fpRZnojka8MbYdomubevBzPdPJul npt79kSnkHtg67arD1sYHbjmCEoYWFxNP+FwoUZy5/S5v5ceEdwVOKNfdKL238DVB0UYYmok 3+7Srlr00KTb+d6bq7k5cm+5pjWq3M/5npdkb/52vvHWQ+3PciyDt+m/3JTY4SN7z12JpTgj 0VCLuag4EQAMd0ipXQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAJMWRmVeSWpSXmKPExsXCtZEjRdfL5G24wYlt2hb/9xxjs9h7S9vi 1/KjjA7MHhOb37F7bFrVyebxeZNcAHMUl01Kak5mWWqRvl0CV8asxnaWgqkcFavuLGdtYLzN 1sXIySEhYCLxeddmxi5GLg4hgcWMEmdu/mYHSbAJGEl8ez+TpYuRg0NYwFViHUS9iICsxPfd r8FsZoEYifaNN5lBbF4BO4n939ewgNgsAqoSHT++gtmiAhEStx52sEDUCEqcnPmEBaJXT2LH 9V+sELa8xPa3c5gnMPLMQlI2C0nZLCRlCxiZVzGK5WbmFOemZxYYGukVJ+alZBZn6yXn525i BIcRZ9QOxusTzQ8xMnFwSjUwTt16nYd1xUfLb4/PPJB7lZ32orH45En2GoULiUs4tdSm6Zff vD73fPrGrt6HZW9vuu6xqoj7ckuF55SGVIYl8/n65jcnm10Cf5raGVXmGs3/uE+bt+lNw8yN JXODucz/hdWfU115cfu5Jb4VXauarcKlylJ6Mjhdl8/9Of38w/fKHfe9LFjeKbEUZyQaajEX FScCAAoYPtPTAQAA 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)(189002)(199003)(86362001)(36756003)(7846002)(356003)(77096005)(229853001)(106466001)(87936001)(31686004)(586003)(53416004)(189998001)(31696002)(92566002)(97736004)(54356999)(305945005)(50986999)(4001350100001)(83506001)(50466002)(68736007)(5660300001)(626004)(110136003)(65826007)(8936002)(23746002)(11100500001)(6916009)(81156014)(4326007)(8676002)(64126003)(230700001)(69596002)(81166006)(2906002)(19580405001)(19580395003)(65806001)(2270400002)(47776003)(33646002)(65956001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0201MB1520; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD020; 1:gRKlPj+6EDPuym1iSh7/QthkiJm/B4UvBwFk9xrD+TSfuSdObLHEL461s0EqebaIRCOVY1BABkkPmzJPonWJQQxLtOA6w8wddHaCw1pi8qUwH0A5zXpulwEo5jIlYz8IA01jn1y6o0QlFnNKcAL0VOQ24oe9FZNQFZ0gNVdxFWYw611UHWEcT86qBTBv/NWnhVuHYpXj/UmwrLukW4PFWWPyonfAOU/aEciYot8cJtm2qsPAWcoqeB4qnZWtnV2xvsArPJqqlASJFCMQK3W8gHaKmIARSc55VHPeVCsIGjRqIkDoJIQkdc/09W4FEWTBe36gQN3o94P6kwHf+C3/jVgDDLiq0mRDHKXYkdZNBEbMC9F02k5l5HFCkXx6etIgAYgZrlrHDZhybiK8WakZhxAV1+8DApljfHsZnWEwU1RdEtVVoy1ixUpgltLT51ggE0Jsa+pOwVUNpxkOLfiO8x5Bue0T3VNCwYXKHEmEcp+L8VHEoAXRJaraNpGGIs9nU/MkzaJksNpJ8ONJImgymA== X-MS-Office365-Filtering-Correlation-Id: 2cc6e059-65cf-4b83-92f5-08d3e87df803 X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1520; 2:HIpZ74jx8qAOOmNeVjkuZkPkPLpRZsd+Vd1CXGRH4DR00aXGSGofuYzzC85FfnuHEb8l7a4bU3vI+LyC2tj9Nh2oArORXtJAq6v3+8byrJybm0L6ZjMjASygOrzRq3C1E9ce9uU42iXNch2bheUlV+Jknj/mwwtgWcgynKOlkJydsnrGefLXqwbqwUN1rC/cWAAX2F+JYJ7oaTeoIL0lBg==; 3:Q6wAp8HNSaFqtEywoF40Vj3BB2FRJBcQG6GO87PzT+TgRGpxl3Xvpape+enOc/E3XbUCWgV79e3B0bEXuhIG26HV/NWdhVA1oXMzPZBk/BJiPbOiI4Hp1Ip2HhmCYD8MLt+a/8VUijXH6mIIa+09eC+ljgC2p5Tiz9bAXVexN2VL4HHKfPrMUbd5Q8pD5050fkYS166txoh9cByI85EYKLNktVUjW5xSIRqv6I7q1cznBRWrMj6DSm0H6oslyB2cTgVzfSvhvcnEXusU4ohJPUzXLX1paIcgoXj6EFBwNpw=; 25:bRObbp8tMzu535PqX/RZhWjzzieFxGomaJhHXTn/N2QMX85RY4V6IbOjkuetjOCSYAFVxuhqE7bw8HNIYiKF/oGipVj2U8psE3N1SryTdlNy1iNVI1ucAl9JUPzN+/cbHFlQvFenFj+am03j9jpEX7IXnKqDieyE1EdSONLq3f1+QbAToCNzuTfLOd2s6w0HEnT1Lc2GIGU8dA9LQ+6vhefQPzPcZ+YF2BaMq0lPX6gj9sY3qNq0lLHcjad2ABjWQIS7tCXnpnWXIVHABglFBm3uiHArodmtaMLhvWqM/JSEkC7R9l13kZF0j1/oQxe8GNFCoHiudAP0mv2ydpQzOb4hVBvkKbeEhJKKILdjrhr7qb+aSZWIOiy+fQVu7/ME/Z5dRU+/kCTUg7wNKfowWSQ8El3El Glto22FalhKR40bZK27/l2HSa9E2W5dxMgf X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:SN1PR0201MB1520; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1520; 31:X1689AvUbg633hZESZHO7mfY8NF5uYBOn64QqgMQqAbs3NjF7QiDQsd83tK1BCd37B2wg9XweVkBhbuYt3Y6rNbvDCmWFm94P4qxi4lGlwG7iZy9W4idpjsY0UZ9N+RxQ41QIh6QpNSkiQZiGbtPiv1kySyQYoJ8uiqHnpUkLlYDt4l5lQCOqHK/ksa27FZzn6Hi7xTP2prZZi6tKVS3F/ncJYonQYIya5vvhHQmBwUHYpP7aTs7zaKW5/357dSY; 20:1elh9aR2PBn3SL8i9zRATlOl5kpTWHAiqEyAFONu65xybPTNMcxTRyyzxGrBTtAytv4OnMEpBCuEzFrUWQZfN6bP4+rcZAv/jOI1aw51eOFX0QHc59tYJdlWS8zak2T6pdrYO/iKp3iX1xb+MGPh+KdLShT1SxsR554nVqy9IqNy5+f6VF9R5g48kbHb3I7u3233N5f2oLQEcqVJrcGH5uwPMBEGwLOPehx+IPN1E/FG8PYwyfJmtnLsVrTXDMlvNoC/VM1ZQGT9ebGxvRZtXd+rPKSQZWHsHAR/FjrBdvaThb97u26x1C6EM1c+QfgIDTJkOEn8nEWn1utM5BlU38c1+BSEAF2PnGY23RqBgi0WgzqCuCSoED+3eyAb7yAaG3FRP4fw8sKppyEf834guatbUUZCREQaj1yj6SEt2A7uKD6uVs+9xmpDMxXXge/Bz0eFcmFyR9//Gr9SWt5bHl+oTNT5NUnQ+AjfMlaPUCY5VqUUU7unN3rX3o3xrpqM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(20558992708506)(9452136761055)(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:SN1PR0201MB1520; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0201MB1520; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1520; 4:d7b02GtZajO7wAmPoGurKebyIFEx7qT//DAL2eNxdWVGrmLaszTtvvV9kw0mGMQgy3DNfMqmB9WJEUDX7o8er6AHO5jAq6WFvmlYRYHQu9GD5+eaByECFqJzccZBgRiXHSEblF0N9OIvC9rVfbAMuu98J7MZ2aqhTNDBfNg76oKOlIHwwb7tWoymYE2XBFqAS9mFuO//vxyblekidiNuGM/OLnSGjpDgloKL1mzO6cwPExbbGiEN/nNVd+eyAUmBbeOef6itIDOpK6qjdpBnLp9/8ObX2lmJWmn1A32k/bzgX8Bggfay96CC3HIc4l+OfJbNWbyiNdkCd1Oe9RDlpZmIk5HjDQyfsZLn6vvk4CLG0R+UO1L5t0TTXufszJHayQd5yphAZ+TdmzLS8JRMqA5BbJK9HtEWP8KvdcPFgs8jOUVLsB0qCcy5+dfqXY0pc9M4+/L9bXijnm5GkQYfTnEM84aONJ0wD41iJwegnWFaRePX7j0jZqmZaG4BplPbu1zttvl0qiZeu8AaSt5yFjGkEExnj9ts4fokqQQ0fKZSJalaSQFIQtNKNTW5TMMa X-Forefront-PRVS: 00808B16F3 X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1; SN1PR0201MB1520; 23:XFwi8MIoU5NtUmefvOaiwv+prSSiEKcTouo?= =?Windows-1252?Q?5j5cjmGUr/oD7UIZkbxTWAR4B5TbNboRcxJILIPrPWydqbt71vS0Kt0P?= =?Windows-1252?Q?ula8Ia7BH+kTr1PxmVbOmz99AEx1p4JJ7LNh8JCwkwE9k+P07JD66lbN?= =?Windows-1252?Q?c3Ke7F5HaSURrSaCyC1yyhwSu95dcZHIzm80jAG8ABpHdR5ePv0TxasB?= =?Windows-1252?Q?jC5KD7+s6lmyphvTp2RRcA1qV+n5YGJMdMqH9FeeMRMg5pZmR1I3hN4Y?= =?Windows-1252?Q?iQPfE8RGkHpCkcH4aQHBMii5AFu+J9b12/KYJqwHf58TWC8Ansbx8TA6?= =?Windows-1252?Q?3K8cwz/zNgUKNDhPY/FVLK2wPwTGitHsBuh+cVkkM7ODuwZKkUgUnCkk?= =?Windows-1252?Q?MpeyT9tEiJCcrTNj4/7rkqemBLxcdsripTAp/fzfpadXTzn6FurIK10u?= =?Windows-1252?Q?jFZ6V+Afbf1maZ7trMdUu+SeP1QHtUAXNLyTxSG5S5qrVMkDMtdTqmEY?= =?Windows-1252?Q?Cjl9YxLQMy4Gq+wtZwx/9LvNQyyJXk3lZRTrFOKN3J0hj/M+WcgLGjEz?= =?Windows-1252?Q?1FqmHLEdmBRaz501IF9ZRRdfj/NY1YilZyWOuFebuE0ZTakb4buGIYEM?= =?Windows-1252?Q?PzwZkmvhY/Ap+DQGhBOl7HJfBzyplAQNc83niP+2N4x/iS7nc6XeVkZx?= =?Windows-1252?Q?LzWJtDiG2TVwERX1DKUyttdH2lP1zI3NVhwzUiQMDrioKC89StoqklCI?= =?Windows-1252?Q?j9ZJE1WxbcDbS9gep3NIgdBbquNkyWFM7DcslqOEIFmSslSe0Iq29duT?= =?Windows-1252?Q?3a50uy9Ark6lRGqebCjerPdiaWEslOivfOnGuyr59WMHtKW8JkVMO1FC?= =?Windows-1252?Q?vKdS1sPh9vrTFvtzzj6DBsZb0EyN0p3mo7IsvwZZKCjXJTQZvveGy0MQ?= =?Windows-1252?Q?bf1d61sob72sB7MlqpuR+1jSLV0pCl42axZakGjy4WbAm8SJ19n4+Q/h?= =?Windows-1252?Q?uo+fAaMUuvl7QZPtKD9XF2uSmJvu0E17Em5fcBDFo97kIiatfrJwgamm?= =?Windows-1252?Q?8iJd/FUmev7Tkaq2cHz+6njykAjcOaCNyVTuTZVzxaEyJ3ro1afePYTT?= =?Windows-1252?Q?ltA28aFaJJb+xKGmvdFpYJ/ZM4FVwNUt3C1nQc22kor6uFoCLXrMgqlf?= =?Windows-1252?Q?2CDG/rK4jO8TyOFSK/gmNKX82+VQjWD12nQ0VAgLapdy3EriD/5XPwgK?= =?Windows-1252?Q?+ON2igwBFZrl3NsXI7qZzwQE4Q04SceI9W3M/z5xbvTksww0ChPvbNTI?= =?Windows-1252?Q?Xsz4tTGt3xYppbKJTHqCJLLQv3A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1520; 6:WO1+LJINZzwedakGwzwyrQe3tdv18nJ1QERLmUTm/y8feWwVXtDGtvoQd+2eHchg3FW5PmatpcfdXm8dF3a+kjXMqUiXVppayuanJK2Mn1q6fZpCJfVODXjJwvB9Hc+arYhENBvEJf1keBZZVPn1sOcw3rtrAapXJ0LQ2d91gKkxIV3h+p4NO0CTMHseqvbZxm+RCZVVuPctZvq2xHUH+PKXqCIMIhsjSQvwuQdiI1G3hEwoYsXYeXYS2srcy05cw0X8HedQpu2wmeGpE2i7/9nEjGvfZWP7Ko91LygSsWjiv+TV8Bmbwb9CWakAbdpaj4ETEYLcGjGImqnwY6oKRyd+m6/+on3HrtSCRoVIUM0=; 5:9fdJ7cZ0tTh9UGK5j2c/WfbYRoPKgZe4VA1RB+WsDcAhtgGLU/ti4PybNlXHLm0+PbgLG/hrn3r3TixyD7zE4xLcf9BIiKV5FHH96bAOYNZbleFugq4K60FN0v1QdMxy4u1dJkhctvNn/paepLptEDbn3CRv5XfJD/hyQ/TlUrU=; 24:0xb96imKmu8YLqIdt4j8qA7/wfOkeSAhZo1V4WeQ4NkBV7Cv2WGsSXB4BP3vC6qz81/zylKMnoimG5XtTol0uEKEvpbd1fdk+OTY/JitkPY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1520; 7:sRQuAUQeUsmrwq6QprmRMJiIlpoHiPAmLBLB2P856564Uv7/4sIBEgIXZqKwUNS/HKTyE6CnTAPq+T4yZ5g730CBbOHJdntKQnpSiPfb6QAhtcaNTK4hBhQpJIPHVnBchJgHoOafJxx5p6TYM6jhFhOV94Nl5T0g2QRhtRJ5Jvdo4m/2sCB2d0sB6JTLHFiqMVsBqfYdPWvfs8uvJJpVyOixhbdutKS6WNxNeeT1Rwvk9cyg8ox2Vp6fa9bCDWaF75+INV3hzzw6PzWRu/s5tHPgwn6vda/5VhvSEzI56OyJ5Tu86c8MmHEhshw7ENhTkwimQVNezPsBtLC1wGwVyA==; 20:x3uTfjDLab+EknRJarApdckMMGBuArsngJ17GuL85m6SjT9t4p3+XPjakmbom/V0hQXg4Z6JgEibtpXbp3qdScB/A9MeYNyfLSmI/8FmyM3pU9Bt1V/SjghlcYea8kZiZMvpuEZ6iCNmYg6QPxp0hRmcSaI03fikNOThOoDslVWpXqdYKsHmEmsG75a0BEhKoW416MOamsNmeqPYcXMryrnAXwOv0hwyw1Wuzznr7p34xcrDPmWril4YOK/LmjP/ X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2016 15:33:31.8599 (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: SN1PR0201MB1520 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 Unlocking a mutex twice is wrong. Hence modify blkcg_policy_register() such that blkcg_pol_mutex is unlocked once if cpd == NULL. This patch avoids that smatch reports the following error: block/blk-cgroup.c:1378: blkcg_policy_register() error: double unlock 'mutex:&blkcg_pol_mutex' Fixes: 06b285bd1125 ("blkcg: fix blkcg_policy_data allocation bug") Signed-off-by: Bart Van Assche Cc: Tejun Heo Cc: --- block/blk-cgroup.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index dd38e5c..b08ccbb 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1340,10 +1340,8 @@ int blkcg_policy_register(struct blkcg_policy *pol) struct blkcg_policy_data *cpd; cpd = pol->cpd_alloc_fn(GFP_KERNEL); - if (!cpd) { - mutex_unlock(&blkcg_pol_mutex); + if (!cpd) goto err_free_cpds; - } blkcg->cpd[pol->plid] = cpd; cpd->blkcg = blkcg;