From nobody Tue Sep 03 10:26:43 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 4Wyhcg4NQxz5MkL9; Tue, 03 Sep 2024 10:26:43 +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 4Wyhcg3t3Dz4rlr; Tue, 3 Sep 2024 10:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725359203; 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=2F5EywPFcMd4t3CyuZfHUbw2TAvQwyflDGlDk0AAn7I=; b=UOcDPdbZVyZd1DbJunTJZoI6d1WMCmxbQhqZ14HVDqjVFVo+cmbDxsH8eGEoz7bgcGVEOQ F+jVMmd7zf8L+KiTt7FiB4202rYjjVdDXkx2OqsTvlKKsrTDppUBimEYhnhvSt0aGO4C6i h3W4Lbgthqrlm2ZvxzN/JODGSqGvr2gCrXfZ8v+/m5ZE8zCKURvA+dMrqPOfzErPzivCX9 7EVyvaeGFxb//kX3TymipWju3MYK+q+p5dVldB5XisAkgO8uwkvXxcg6WHXr70aVV8RTmp GvD6HCRxc5IcZ01b7H6Xh507wR7Hy6jmsrYl9K/blMRCB+Amsm1sCHJAwICClg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359203; a=rsa-sha256; cv=none; b=ZvhrtBy67T/Kt07+c87tqzxm8ZHqANkHY3SEKEnr5s+9Ho0byQLLDllAxgeBWTzIdfc2SP 6PVyPuTkX8J2iWJZdx9+oKDhfNL55F8afbN90B61vVxyKFhM/gqOSAf33G6T6mUEcDSUwb bFPCu2v7H2321UP+OqclD81CzDdxUQRgPKC86hcH6JELpG3oomjw3sF68BpwlqP7a/NmyS oeyVjuarNYoZsGE8g0ARPmV2KIGmTCzwvvYmXVdwIfUamYbt/1vaIcuDpn4CxLohLggfDk 47FcTlEO99wLPKtqEfN3STd0gC7001FIQeCHCttr3fZT2CvKEMfmSyocTNtmag== 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=1725359203; 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=2F5EywPFcMd4t3CyuZfHUbw2TAvQwyflDGlDk0AAn7I=; b=pVPca0iNWcv37JFvJhGn/bjNV8vOF6O8/ix12MskCKDkDor5i+81DVrA72gD4InxMzQvq8 +n0iB9iqcEKsFY2fCCTWDgz0NFXH9KHSH9XPVDD7xTVIaMSUH+qcHDKc+rgZmeIhvG5PWp g1P1gt0I0DZMRnK3U+noEhZi/L0vAU/1AYW9DEWFX7+rnPg3hoPgG2EK76agZc+5ywS7DV PgNn7WDtisZyE8ib/TtgPXwzkvWi+6zSHz13wx6wv827viw9JzHmmldbP4dfaUVAf8BDMX DzbCBrCJJrYdw4ji0YwaiLBDcTre8TTJg48O3hkRFT16x6aHyQKZYRHgQnezGg== 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 4Wyhcg3TnTzcJs; Tue, 3 Sep 2024 10:26:43 +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 483AQhrt008713; Tue, 3 Sep 2024 10:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQhUJ008710; Tue, 3 Sep 2024 10:26:43 GMT (envelope-from git) Date: Tue, 3 Sep 2024 10:26:43 GMT Message-Id: <202409031026.483AQhUJ008710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 6a2a385507c7 - main - kern_fail: Stop checking for failures from fp_malloc(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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a2a385507c79abaa9db9eabfdd827362f3dc7ed Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6a2a385507c79abaa9db9eabfdd827362f3dc7ed commit 6a2a385507c79abaa9db9eabfdd827362f3dc7ed Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:16 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-03 10:25:16 +0000 kern_fail: Stop checking for failures from fp_malloc(M_WAITOK) `fp_malloc` is defined as a macro that redirects to `malloc`. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 --- sys/kern/kern_fail.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c index 883b664aef0d..258268bb874f 100644 --- a/sys/kern/kern_fail.c +++ b/sys/kern/kern_fail.c @@ -479,11 +479,10 @@ fail_point_init(struct fail_point *fp, const char *fmt, ...) /* Allocate the name and fill it in. */ name = fp_malloc(n + 1, M_WAITOK); - if (name != NULL) { - va_start(ap, fmt); - vsnprintf(name, n + 1, fmt, ap); - va_end(ap); - } + va_start(ap, fmt); + vsnprintf(name, n + 1, fmt, ap); + va_end(ap); + fp->fp_name = name; fp->fp_location = ""; fp->fp_flags |= FAIL_POINT_DYNAMIC_NAME;