From nobody Tue Dec 16 04:43:39 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 4dVkpM4pVzz6JyGm for ; Tue, 16 Dec 2025 04:43:39 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVkpM3Jzyz3gDn for ; Tue, 16 Dec 2025 04:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765860219; 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=gES+CKkX73PdryUB6MDZ9zZvIHMUIV7Qb+p6v34njWc=; b=Etvi6394E3UsyI93OcQ/w0aI+71yyBfqQBAtriDkz5cnSLfEECCCKZXrfsOcCmcIIBCvOA Mecsoh0Js8Le/kr1xzI8wmq3cgvp86rlBbDc/oqlJGOo76e7NE77lgKCQ0bQv7NMMIkEYa Fx5sqpQk/v+AVwJdaPMUkaWWbuaupaRO2WhxbUuVmpsC7a23h9hYOZg+/LYBzs3tZNTF43 /HlC4Lz5rohibU78o9RdQB+58aHgNEK7WoKDoH3Q4ljyBR69rqK0dsF4hopJrO4VZYm/e/ mVjaDesBIbeQp8wNGe0gpMr8Ez47h349NrD/OaFTnOHD67UE/Oit5bUuPKAFxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765860219; 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=gES+CKkX73PdryUB6MDZ9zZvIHMUIV7Qb+p6v34njWc=; b=pgYXDvf26v/2nR/4J3EolWIDgJltCPldJh7MPJY+CN51fUSi37L53GkjH5JM4W60uygGoS 8cpwXaD+oGZ7S+jhyGDTql3nPsuoaCTbIN7h77PZ0WDar8VKceLv3xWaE5m5a8MQTd3FKW L/RbjvUaj8by+yEgYzrtRGI5yFuS4B+KALOj9tdlOn9e/oRfZjlGFnDm2JxqmkEAJnZqjv ms/Ar6NQFZAPbTMMFzEOu4kCqVF7zWKmZiXhCabFkV0qRmYJseB0nf6iisWJOFi+nn8iTJ vTXwZAzNM0cwyXueBsPGPsopK4AzAsOHtNA7XtIAYU7xVYzqIpRe4yVxPV1rnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765860219; a=rsa-sha256; cv=none; b=kO1b+7nxHx5xScE8NaalMXXBBLNesadPUATzXnFqibGIKIY07Ta1EzEsLMMZLjWaWp9QRB sclvdVgiLZ6Huc+XPfEXZePXR0zYH1jtkxpKI4GB3gQj/3XfM787Nl5exQA3T2UX8KuWda mSBSf20y46JXGUp3l0gznp9L3UY6y2xSNcMYq77NaWhFf1nZ+7MQ0RLcpRdN8FOwBPJTP7 EGRwnLFdeeSdfxBHnTWN5/l60hDhcqE8IMOF0ad1DiXbNvAIhzvBPlyKPiX9rzcwgM/2xK oWY32DhxoB//8ezRHJZrKK5Bdj229GprmBWGVri5fXAWo/ikDenzLTs080iyEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVkpM2lw0zrw2 for ; Tue, 16 Dec 2025 04:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a6d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 04:43:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9b943425fd90 - main - proc_dtor(): style improvements 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b943425fd90858f9e21cf47009275943a3548a3 Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 04:43:39 +0000 Message-Id: <6940e37b.a6d9.761e7bff@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9b943425fd90858f9e21cf47009275943a3548a3 commit 9b943425fd90858f9e21cf47009275943a3548a3 Author: Konstantin Belousov AuthorDate: 2025-12-14 03:53:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-16 04:43:06 +0000 proc_dtor(): style improvements Drop not needed cast. Group sigchld state check as single KASSERT condition. Remove useless comment. Reviewed by: des, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54234 --- sys/kern/kern_proc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 8f86ce349e30..05b1ed990025 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -237,11 +237,10 @@ proc_dtor(void *mem, int size, void *arg) struct proc *p; struct thread *td; - /* INVARIANTS checks go here */ - p = (struct proc *)mem; + p = mem; td = FIRST_THREAD_IN_PROC(p); if (td != NULL) { - KASSERT((p->p_numthreads == 1), + KASSERT(p->p_numthreads == 1, ("too many threads in exiting process")); /* Free all OSD associated to this thread. */ @@ -256,8 +255,7 @@ proc_dtor(void *mem, int size, void *arg) #ifdef KDTRACE_HOOKS kdtrace_proc_dtor(p); #endif - if (p->p_ksi != NULL) - KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue")); + KASSERT(p->p_ksi == NULL || !KSI_ONQ(p->p_ksi), ("SIGCHLD queue")); } /*