From nobody Thu Apr 07 00:31:08 2022 X-Original-To: dev-commits-src-branches@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 8A9811A95355; Thu, 7 Apr 2022 00:31:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KYj3c2Cwmz4stb; Thu, 7 Apr 2022 00:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649291468; 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=IgNfVb1mpwf8qubfRaGvvdkanPOMbANITCxw8dx94oY=; b=CLCAX5gUHW+bKsBbeE042Wm6pmKYfYrmHHgI9HqP/9TT/bAV0yKrB+rlBV5V2+yte+DRNf WfG5DdSBSkPffTN5SH9RP0/KzfxSIm4hSBWj/GqJbhtpPFsOt/9O1/Rd+XIFV1RZfhIDsk O59DcYMSDLv3Fv+4wBmP82hRQCIQLK2ytHOLfI3X7clSYEjfpg8LiUJsVezTeD0EdNWJ1K g+41gwmQlUv9oDzX8Bge6jjK5nN/VSbTjgV3ZLNxBB00MrjD6X3pwdBnZJXUso495CCvTZ DBvWmNPsDhrpl+eswC6DEEF0mtD05bugZe0pk6rep+s0WnwoIITQ7F22l3VaDA== 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 234B1251F3; Thu, 7 Apr 2022 00:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2370V8N7073904; Thu, 7 Apr 2022 00:31:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2370V8o2073903; Thu, 7 Apr 2022 00:31:08 GMT (envelope-from git) Date: Thu, 7 Apr 2022 00:31:08 GMT Message-Id: <202204070031.2370V8o2073903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 229eff21b725 - stable/13 - uma: Use the correct type for a return value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 229eff21b725fbfac04ff2c2d3fea9ecd1391bed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649291468; 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=IgNfVb1mpwf8qubfRaGvvdkanPOMbANITCxw8dx94oY=; b=H8QPCX6XRxszeildj6+tQo6G9DHrQClKtyjGcfvqYP+X1bIZXPVs8IhH9zBEe7t5WbdN7G vVG1rHkeeQEmUspxoLezP0kCdTA0aYj9E7tE+2cbQeV2IrfiE75I9090GIEm6V3s15zWH7 HRJ61CyPlb+0/q4WuvxFGAjQvXPqsW8sqZUpQsO4BF2k1Fnrc1Ah+wlJXgueXgF5V1w65A QHbxar9rFXafWADJrv1Yn68mjabp/Pt5JGtdb3mCvrsCYFPxrUfT0U56IHV7GLQVi98eAH VlhSiOoHpjHIVyklajmR0PoweeAJautpZckEJ0+WjUtwO2gEJy1WaSofmhKR/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649291468; a=rsa-sha256; cv=none; b=IFpYwjtJ/u8nQpFHcCh1Kpv/58pRIKUvnBIH3DLv/F8qmOkmuvBzOxA5QmvMVb7g6gDflC pSdaY4U1S0L910mT2yIJIkYFychXyI73jclBDIZsDquzFPvKCVeUMUsXQ/rywB7us/Hl38 15ElyZaoGC3VBJSL+IaLXi78UKy4TkBOyq7XxwnZvnYnlPIhi+bgyHA6Ek7D+5y3cvPyRX ql16huNb/0bUGPY7/zWYwp1c8CX922nPx0bB18fbHlGXTiFOWFvO6N7+T0dcerv3n4qAP7 NCBRaIkjGcyUxzXANHwx3A2Xc/4Y0Y4AsDgyxLUUp1bWdXKP4p+O9NkxlWWr4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=229eff21b725fbfac04ff2c2d3fea9ecd1391bed commit 229eff21b725fbfac04ff2c2d3fea9ecd1391bed Author: Mark Johnston AuthorDate: 2022-03-30 19:42:05 +0000 Commit: Mark Johnston CommitDate: 2022-04-07 00:30:45 +0000 uma: Use the correct type for a return value zone_alloc_bucket() returns a pointer, not a bool. Sponsored by: The FreeBSD Foundation (cherry picked from commit 54361f9020bf4d57fd700033476561f9c88942de) --- sys/vm/uma_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index d4c9906cc106..211198d02d04 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -4177,7 +4177,7 @@ zone_alloc_bucket(uma_zone_t zone, void *udata, int domain, int flags) else maxbucket = zone->uz_bucket_size; if (maxbucket == 0) - return (false); + return (NULL); /* Don't wait for buckets, preserve caller's NOVM setting. */ bucket = bucket_alloc(zone, udata, M_NOWAIT | (flags & M_NOVM));