From nobody Wed Oct 16 18:09:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XTJrX532zz5Yq97; Wed, 16 Oct 2024 18:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTJrX4VKnz4qj0; Wed, 16 Oct 2024 18:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729102156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cd0G/pg5nnj31ZSi552Cr7ypjm2VGn8tBGS+qybUZc=; b=o/aWZ6U5EoIt5ZRU9B3QtC/lrlpjgPpXUSgAIWFLWKTl1tlveJynuhaIrSPjbftGypVb4I Ve4b5W+7PEXnNcxYEw6x44e0zvpFqDwo4uooj2H/DLcZTcMI4A9nI9XTxQyfnhYKjZ/q+r QOfiOEiG+7nTiYXaafr/ENH4SDk3fQhEG2xSNLl2thR4gxP3exxXz9eXsZ7+OJSEV5GIqE afEFSlwFxnDRng/q6kRghzaePV1n8SagsyXYcDZCR5LxCgUbiq/fPBar3bH9gDkN3KAaxC qz0KLjasCi9n5DzVEHofAWeEeAmILJNlG8Wgr4W4tIH3OpDb3Bh5cHp/v7zPow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729102156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cd0G/pg5nnj31ZSi552Cr7ypjm2VGn8tBGS+qybUZc=; b=IjMIkXG3h4RnaM42YqhH8NrDo095lwOHHtsF8CXbM8VeywnwNO8LmNaYXbet5k7nn8JSKh 0QhiZtKXbPE4vrc0bUaSzr4UkdJpnvU1UV9LyNwZ4aNw5h/gJMcCOV2UsabqzRppPdU+0+ /+G3imKQiIASDie9KQKyk53farpy+FWvINquRnG2hfSuuAx8UdaPBHKa6WZUyFTT2kQlAG C9o9R7imNiqZVHPLum6XKcsyw9yppxyIsZ/S430VUvcg7zyWWGkZGRGChVEipb4/fH3DdK x7Wh00+/pneIXA20acCekTAtxykbyOSiw1wlH4X1TqLo5i8miyPxF0ElacDChg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729102156; a=rsa-sha256; cv=none; b=hDTx84uhvBia1sDa64SyyBbyxxSbtknl7A79YOM5hHRF5nqHnVuYnBzHbHJIpEsMgRBTf3 VPS0bDcugFdAh7PoStvo2VKu1k6iQNO6fOaBx6OcMv+5tC1YT8qlHELsb1471jtIK9jJKL bFcpNlzeWqmEg7ekfHtSc4O2B9xcYpsZZcxY7TQrgIoNhwSEE/a3ug5AZ6PcecHvmu/f0Q MvIABqBPRROm+j2aPOLzBIGDP6ufaQqKzUfFhZpnJjzebDOl4WfOGcPdWmi3WPe1FBp1iw Hfbd4vS6eLsOxzvSFWV7CWVqVaeAVUV7PG8b76YK78H5Ch42z00cc+3sIl5rMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XTJrX45bhzGF8; Wed, 16 Oct 2024 18:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49GI9GPt046298; Wed, 16 Oct 2024 18:09:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49GI9GiN046295; Wed, 16 Oct 2024 18:09:16 GMT (envelope-from git) Date: Wed, 16 Oct 2024 18:09:16 GMT Message-Id: <202410161809.49GI9GiN046295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1ad335196656 - main - device_delete_child: Update comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ad3351966563b71b9e45803abd5c3e12af3b65a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1ad3351966563b71b9e45803abd5c3e12af3b65a commit 1ad3351966563b71b9e45803abd5c3e12af3b65a Author: John Baldwin AuthorDate: 2024-10-16 18:08:24 +0000 Commit: John Baldwin CommitDate: 2024-10-16 18:08:24 +0000 device_delete_child: Update comments This better matches the variable names and the function comment as well as clarifying the reason for the order of operations. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47154 --- sys/kern/subr_bus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index ef71588f7157..f41884d576a8 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -1477,11 +1477,14 @@ device_delete_child(device_t dev, device_t child) PDEBUG(("%s from %s", DEVICENAME(child), DEVICENAME(dev))); - /* detach parent before deleting children, if any */ + /* + * Detach child. Ideally this cleans up any grandchild + * devices. + */ if ((error = device_detach(child)) != 0) return (error); - /* remove children second */ + /* Delete any grandchildren left after detach. */ while ((grandchild = TAILQ_FIRST(&child->children)) != NULL) { error = device_delete_child(child, grandchild); if (error)