From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_50, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6585FC433E0 for ; Wed, 27 Jan 2021 23:01:34 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9A5A360C3D for ; Wed, 27 Jan 2021 23:01:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A5A360C3D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kleine-koenig.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3BEFF100EB343; Wed, 27 Jan 2021 15:01:33 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=94.130.110.236; helo=antares.kleine-koenig.org; envelope-from=uwe@kleine-koenig.org; receiver= Received: from antares.kleine-koenig.org (antares.kleine-koenig.org [94.130.110.236]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C1EFD100EB33F for ; Wed, 27 Jan 2021 15:01:29 -0800 (PST) Received: by antares.kleine-koenig.org (Postfix, from userid 1000) id 21E01AE0D2C; Thu, 28 Jan 2021 00:01:27 +0100 (CET) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Dan Williams , Vishal Verma , Dave Jiang Subject: [PATCH 2/3] dax-device: Fix error path in dax_driver_register Date: Thu, 28 Jan 2021 00:01:23 +0100 Message-Id: <20210127230124.109522-2-uwe@kleine-koenig.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210127230124.109522-1-uwe@kleine-koenig.org> References: <20210127230124.109522-1-uwe@kleine-koenig.org> MIME-Version: 1.0 Message-ID-Hash: WMEDCSPGTV5FL6FT6WAJ2OIADNK3BJRW X-Message-ID-Hash: WMEDCSPGTV5FL6FT6WAJ2OIADNK3BJRW X-MailFrom: uwe@kleine-koenig.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation CC: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhlIHN0YXRpYyB2YXJpYWJsZSBtYXRjaF9hbHdheXNfY291bnQgaXMgc3VwcG9zZWQgdG8gdHJh Y2sgaWYgdGhlcmUgaXMNCmEgZHJpdmVyIHJlZ2lzdGVyZWQgdGhhdCBoYXMgLm1hdGNoX2Fsd2F5 cyBzZXQuIElmIGRyaXZlcl9yZWdpc3RlcigpDQpmYWlscywgdGhlIHByZXZpb3VzIGluY3JlbWVu dCBtdXN0IGJlIHVuZG9uZS4NCg0KU2lnbmVkLW9mZi1ieTogVXdlIEtsZWluZS1Lw7ZuaWcgPHV3 ZUBrbGVpbmUta29lbmlnLm9yZz4NCi0tLQ0KIGRyaXZlcnMvZGF4L2J1cy5jIHwgMTAgKysrKysr KysrLQ0KIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkNCg0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZGF4L2J1cy5jIGIvZHJpdmVycy9kYXgvYnVzLmMNCmluZGV4 IDYxOGQ0NjI5NzViYS4uNDk4YzYwMzMzZDYwIDEwMDY0NA0KLS0tIGEvZHJpdmVycy9kYXgvYnVz LmMNCisrKyBiL2RyaXZlcnMvZGF4L2J1cy5jDQpAQCAtMTQxNyw3ICsxNDE3LDE1IEBAIGludCBf X2RheF9kcml2ZXJfcmVnaXN0ZXIoc3RydWN0IGRheF9kZXZpY2VfZHJpdmVyICpkYXhfZHJ2LA0K IAltdXRleF91bmxvY2soJmRheF9idXNfbG9jayk7DQogCWlmIChyYykNCiAJCXJldHVybiByYzsN Ci0JcmV0dXJuIGRyaXZlcl9yZWdpc3RlcihkcnYpOw0KKw0KKwlyYyA9IGRyaXZlcl9yZWdpc3Rl cihkcnYpOw0KKwlpZiAocmMgJiYgZGF4X2Rydi0+bWF0Y2hfYWx3YXlzKSB7DQorCQltdXRleF9s b2NrKCZkYXhfYnVzX2xvY2spOw0KKwkJbWF0Y2hfYWx3YXlzX2NvdW50IC09IGRheF9kcnYtPm1h dGNoX2Fsd2F5czsNCisJCW11dGV4X3VubG9jaygmZGF4X2J1c19sb2NrKTsNCisJfQ0KKw0KKwly ZXR1cm4gcmM7DQogfQ0KIEVYUE9SVF9TWU1CT0xfR1BMKF9fZGF4X2RyaXZlcl9yZWdpc3Rlcik7 DQogDQotLSANCjIuMjkuMg0KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KTGludXgtbnZkaW1tIG1haWxpbmcgbGlzdCAtLSBsaW51eC1udmRpbW1AbGlzdHMu MDEub3JnClRvIHVuc3Vic2NyaWJlIHNlbmQgYW4gZW1haWwgdG8gbGludXgtbnZkaW1tLWxlYXZl QGxpc3RzLjAxLm9yZwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABC3EC433E6 for ; Wed, 27 Jan 2021 23:07:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BFDC60C3D for ; Wed, 27 Jan 2021 23:07:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234254AbhA0XHn (ORCPT ); Wed, 27 Jan 2021 18:07:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233408AbhA0XCM (ORCPT ); Wed, 27 Jan 2021 18:02:12 -0500 Received: from antares.kleine-koenig.org (antares.kleine-koenig.org [IPv6:2a01:4f8:c0c:3a97::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E92C2C061574 for ; Wed, 27 Jan 2021 15:01:28 -0800 (PST) Received: by antares.kleine-koenig.org (Postfix, from userid 1000) id 21E01AE0D2C; Thu, 28 Jan 2021 00:01:27 +0100 (CET) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Dan Williams , Vishal Verma , Dave Jiang Cc: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman Subject: [PATCH 2/3] dax-device: Fix error path in dax_driver_register Date: Thu, 28 Jan 2021 00:01:23 +0100 Message-Id: <20210127230124.109522-2-uwe@kleine-koenig.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210127230124.109522-1-uwe@kleine-koenig.org> References: <20210127230124.109522-1-uwe@kleine-koenig.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The static variable match_always_count is supposed to track if there is a driver registered that has .match_always set. If driver_register() fails, the previous increment must be undone. Signed-off-by: Uwe Kleine-König --- drivers/dax/bus.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 618d462975ba..498c60333d60 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -1417,7 +1417,15 @@ int __dax_driver_register(struct dax_device_driver *dax_drv, mutex_unlock(&dax_bus_lock); if (rc) return rc; - return driver_register(drv); + + rc = driver_register(drv); + if (rc && dax_drv->match_always) { + mutex_lock(&dax_bus_lock); + match_always_count -= dax_drv->match_always; + mutex_unlock(&dax_bus_lock); + } + + return rc; } EXPORT_SYMBOL_GPL(__dax_driver_register); -- 2.29.2