From nobody Mon Mar 10 17:35:44 2025 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 4ZBPDx1KrNz5r7Pt; Mon, 10 Mar 2025 17:35:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBPDx0KP7z3TmK; Mon, 10 Mar 2025 17:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741628145; 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=qmL+wvQn3HrZs3pzUQ0H8PIjPyMj0uO8Jz54eGbn9Es=; b=PS7H2QCJOnxOlaHVz4mrk/cStqhgk88RSOH/zkYcZN5MOLiHg1iztlAEvVKl2DvWMADNo9 NdE1ulSs3KQ+1khAM2NEdBMHxdofB8wv3p4b3DZ7Mjde9YpgNzWyovsEXQ+sdFE2zNYuuu GRZA5EGiP+Y3f9VZ7F5WkCySYfKglsdOweZmbX28GYH9sa5XcCtEpXBk4d76sq3kWv2fQ0 tFvAKVSSB8g0lpox/scxbpXZwyDmEV4nLZDft36DBqVUtLZX7Yg8zn9eWIFV59Pgr92kTH 3suqlWha3bNcb3AMdtODb2NhR+LdKVIiUvtT7u9V0tpSkVhWMo8ML39zLRBTMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741628145; a=rsa-sha256; cv=none; b=hZmokJBGd4+tH5wWC7O4kcB0fhtt64biO4W1P2kuyeluys025D9SL5BMseVFUFI+jFeflb zWqPceVpI0w+PwSaxe7Q+rS7USns7UI4KlWxZcXlUIqs3GBIcCwjsMTiu56V/pgc35fcFJ 9vOdM8RpTUvmODVOmaL9+ES+Nj+TQIu1kSqZJSzoaYW+6u1LRquGRNeXPPMbBnid3kJzx0 Klgbl0e2H4Yemt5yLXo14XbHiOwn3hnnkDw3NaOcGE4MF2NTOKR+XQoeiYxLkz+Gc0k6Ce IELM/rXSe9+qLEIu9ocXJQ6d+lEUsB9CGsFjRog69zjePc791ecPHoLZXfUj2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741628145; 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=qmL+wvQn3HrZs3pzUQ0H8PIjPyMj0uO8Jz54eGbn9Es=; b=bpmHT4BtITYXhv6RfN0eqToTV4Ixef2SPakU7CfsF/uQbBZ7i8uQcWtbN3nl7/RD7DRPb9 Ni5t5EjQAW5CErW9QdzXMBi+0aBmnmEJXxYdOrEw77yxjiqSbBVFhJAXeQIEgRIZbXCbPo zrjrm+JcYnuERufEKSfpK5faGVfc/jygFUNKJwWFUNvAYKj7VO77Dm3s+RcpJUHOu1qF5m CPBuhdMF7/1L0y+GlgPHgi6BCWIajypJQ3ROYAWVrjwsyGFrZ8MDnPhVNrJtidGoZ8cHYb Ndtl/t8OsPJ9HMiRe2aAE1xQCNefyq9S6kqLAkFiUYmm/UlEMUDvGktJ/9HIfg== 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 4ZBPDw6mrlzqNv; Mon, 10 Mar 2025 17:35:44 +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 52AHZiPf027213; Mon, 10 Mar 2025 17:35:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52AHZiu6027210; Mon, 10 Mar 2025 17:35:44 GMT (envelope-from git) Date: Mon, 10 Mar 2025 17:35:44 GMT Message-Id: <202503101735.52AHZiu6027210@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: 78cd83e4017b - main - devclass_alloc_unit: Go back to using M_WAITOK 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: 78cd83e4017bccf62a291e57f0cceccf80e50423 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=78cd83e4017bccf62a291e57f0cceccf80e50423 commit 78cd83e4017bccf62a291e57f0cceccf80e50423 Author: John Baldwin AuthorDate: 2025-03-10 17:34:44 +0000 Commit: John Baldwin CommitDate: 2025-03-10 17:34:44 +0000 devclass_alloc_unit: Go back to using M_WAITOK This restores a change made earlier in f3d3c63442fff. This reverts commit 234683726708cf5212d672d676d30056d4133859. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D49273 --- sys/kern/subr_bus.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 38a8cab639e4..63de61262554 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -1211,7 +1211,6 @@ devclass_get_sysctl_tree(devclass_t dc) static int devclass_alloc_unit(devclass_t dc, device_t dev, int *unitp) { - device_t *devices; const char *s; int unit = *unitp; @@ -1268,11 +1267,8 @@ devclass_alloc_unit(devclass_t dc, device_t dev, int *unitp) int newsize; newsize = unit + 1; - devices = reallocf(dc->devices, - newsize * sizeof(*dc->devices), M_BUS, M_NOWAIT); - if (devices == NULL) - return (ENOMEM); - dc->devices = devices; + dc->devices = reallocf(dc->devices, + newsize * sizeof(*dc->devices), M_BUS, M_WAITOK); memset(dc->devices + dc->maxunit, 0, sizeof(device_t) * (newsize - dc->maxunit)); dc->maxunit = newsize;