From nobody Mon Sep 30 05:07:58 2024 X-Original-To: dev-commits-src-all@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 4XH8GQ6szPz5XlfL; Mon, 30 Sep 2024 05:07:58 +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 4XH8GQ4wwzz4W14; Mon, 30 Sep 2024 05:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672878; 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=3Uph0++etvEeKL12C6bdK6MOYPxkli6joQOkFdWt5QY=; b=QlTAN2lpXLO31wANPlX0Fkda4P03Ajrd99MyPTRhKfPAfcqbNJmNp+Khkoeogr1tblP/XG RPGPRwnaZ+h+7isSGVGC4GaLEUPMP6U6Km8b49rOtuiP3mnjW/Qvz1whLcneafpJXhrl/k +r/qpYuN4gAOB+hej5HiDGQb0lmnuqdWYPcd01GV2lPIxvH+vi1YSihiMrUUpDqNZgcjUq B8H/wjfyGr0geF8Mgt5g53S7n1Cg9k2Ss/vp+nhgZ8JQZO9tXaULEd/M5kYU/OU771nLzF kr7zuCUyVefYCXqCgdHps2wMlwJJb1q55pHTZnxX+VLKnvR6m07jVJ/itXbXng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672878; 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=3Uph0++etvEeKL12C6bdK6MOYPxkli6joQOkFdWt5QY=; b=pIfUTo5RxBaVqMfVm5h7L7PHsllxIBTIInBtaCp+plghSm/w1kQKHvm8YcBIxhbnTKXF97 /QK/1lEsWpSmOCVOKnBxK3Kzv2Qe/V6VTqeUOl+RNe0iuFjwrC+Ubk7NfF3CZKLTjLq83o zNP4t1t7gLiNyuCXki6RbqjNLj6HqqztXayjGrD05IaG1eCyX8Faxnphg4RxcIAGytST+t lsCaSHVIx4b29rnymYaRRHmIjXj4QN0fa5si2sYEUcDEUXTFseaSnP+egeJW7yzfAySG3X 1GN/9lmSAmvGm/to9CnJJPhZMlz1mVc7AF3Z26n+KGFb7kNQB6RRQm4q8MGohQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672878; a=rsa-sha256; cv=none; b=fJ/MMMlmBY8hxq9h0jaqPzZaz+l7/PnrBiIXqt/+3ZbKh3MR00zpl8lke3jZBP9LtlaYIq JQeZiM62auks3QCtuVFjji2i+qJghSSebupuDBAaFIUXXH53EfdDo83zUwHKSCtWF81zK4 WTnG3hNvR0oBzOvs6fDMj+WAYoGdjRVBNv5pLmf8RfEhPQyXSKrHpe+zr8o2kcR1MkGw1R vIOvFliLF84g+u4vFE/fWVyWkBZjASwGdOByi6Hu7+Qyqfxk9T0FMMSP6jnCOBcLVLTaI1 ClkRCmZVe5aNQtrRvWLS8XGwS4QpsgMXm3XrAB1ze0la5xexZGVz0DFwV0q4aw== 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 4XH8GQ4XMtzfqw; Mon, 30 Sep 2024 05:07:58 +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 48U57wKs023938; Mon, 30 Sep 2024 05:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U57wtA023935; Mon, 30 Sep 2024 05:07:58 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:07:58 GMT Message-Id: <202409300507.48U57wtA023935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ca22505a15a7 - stable/13 - kern_fail: Stop checking for failures from fp_malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ca22505a15a7c1638b6666c4d2858c36d1849939 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ca22505a15a7c1638b6666c4d2858c36d1849939 commit ca22505a15a7c1638b6666c4d2858c36d1849939 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:16 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:28 +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 (cherry picked from commit 6a2a385507c79abaa9db9eabfdd827362f3dc7ed) (cherry picked from commit fbaf4806511522cdcac7eda3bd5fbcc4b2e2f15c) --- 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 f60500b22ef4..2c362b68f24b 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;