From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 13 Sep 2021 12:19:54 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mPj46-0000Az-TH for lore@lore.pengutronix.de; Mon, 13 Sep 2021 12:19:54 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mPj45-0000L5-Mz for lore@pengutronix.de; Mon, 13 Sep 2021 12:19:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=fhRGwRpYtqal+RVg/bloTTDjSFcPP4+su3ZQSZxQShg=; b=cPj9PujXCwLvsp xIqCu4YA8AFGMjGRUhV+DV4j7n7sw8kMOahroA9OhaFhLChtPvDoqgfPwPR2DF4NnEZ1YUGr9IdDH VGg5iOUbUBsVHgWPpPRwM5qvMQ/b9QmpL7/pnmLndEUs4YBOv9R2AerdVK8JWJ1G9/Q8l+InMmWfh oopqA1OrC0k5hWnmfscd4LA43lD4v2KYBUqXXLAaLuRdnNLyuKXsZt5UXaXYkxABjQYcxjPZzhl4l Vu57NN91JTHHlCcbokM8kCGO7hRABkIBzuW0mY6r2Dn2wUlL6ec2s7bMiEz00XHrRUVwPodECl94T C3L2hhYJR/bnwYV3MaGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mPj2P-001Eqs-6q; Mon, 13 Sep 2021 10:18:09 +0000 Received: from relay9-d.mail.gandi.net ([217.70.183.199]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mPj2K-001EqY-7S for barebox@lists.infradead.org; Mon, 13 Sep 2021 10:18:05 +0000 Received: (Authenticated sender: ahmad@a3f.at) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 95970FF810; Mon, 13 Sep 2021 10:17:57 +0000 (UTC) From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 13 Sep 2021 12:17:53 +0200 Message-Id: <20210913101753.465831-1-ahmad@a3f.at> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210913_031804_445812_00A5229C X-CRM114-Status: GOOD ( 10.67 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.4 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH master v2] base: driver: fix double removal of child devices X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) Child devices like an ext4 file system on a partition may be removed twice: Once because they're in the active devices list and then once more, because unregister_device is called for the children of its parent. As struct bus_type::remove clears association of a driver with its device, we can set struct device_d::driver to NULL. unregister_device will then skip the second dev->bus->remove. Fixes: 29f1c211d86c ("fs: don't free device in remove callback") Signed-off-by: Ahmad Fatoum --- v1 -> v2: - remove left-over if condition line (Jules) --- drivers/base/driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 0e04ef36868d..23d11d4dad60 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -511,8 +511,10 @@ static void devices_shutdown(void) struct device_d *dev; list_for_each_entry(dev, &active, active) { - if (dev->bus->remove) + if (dev->bus->remove) { dev->bus->remove(dev); + dev->driver = NULL; + } } } devshutdown_exitcall(devices_shutdown); -- 2.33.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox