From nobody Sat Jan 31 17:04:17 2026 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 4f3K3j4Grxz6QWNP for ; Sat, 31 Jan 2026 17:04:17 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f3K3j2FJ4z3SQv for ; Sat, 31 Jan 2026 17:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769879057; 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=u2FD8syYxe+ty1LuMisWfgdlUoHvJgb8WSXr/6/8K6k=; b=Juigf2CpXSQDbVrAR8JzwsWQi3QvKAsULuLq4dVDzV0DQTMpugyoOj1NjbvzIz0LEs5Af4 Sy+9644zakCuZeWFNohG4zG69jHh1rB6zEI2z69jV4fOhp2KL1nVHBI7vzsE+TiYq1rT12 Ba+CFnbt0qj/YqUDaUS8nxCTnNt/zTBQuvgDLx2OgE/opY9e7QLE3fiMGYzpMNdAE+mXG2 L+A0k9rcM4XT2+u04Qy4Uedz2rpUiYLPl6FK63PAf0r7msawB6gefE3AoiKms12SwgkCq3 XRgQcKY7Fz+3njseJHT9cIfaMGpwRQHl+7M0R+wy1XY74l8BJwE8cciSU5FEng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769879057; a=rsa-sha256; cv=none; b=SX/xLGffg4SiKDDhpkY+gR4n4mAWlh4iKm5/FYDO+NN+pTN7w1ZXbJePQMcnR/FlWC76Ed U3ldOTxvAOokh08tfBP0nWxOwbZ1zcRuJYHMqZ7Eezv5KIhhTcJrsOwAPeCZUqEvsX9Wnd sl9PbhGhIKz7H2uWvh86n81ZLA/wPRKiZRYIVaq2HVUpnJ9jMh1Gcd+/sgAETC/iq3UJvH gukTkOENQXwRVehnSIWTPWFk0eetw8yYAFGrBhyfia8F3nWuK+J9ZTRmBwszczCeD6FSwp 4IQ5+qOaq+Q+d4YxgR+pIs4PzNwAqUHMsiMRfaUqDWeiCJAUSMZF01KQ450mjg== 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=1769879057; 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=u2FD8syYxe+ty1LuMisWfgdlUoHvJgb8WSXr/6/8K6k=; b=lagQE5+peslHIGG+EqaMWf4wNC6dFLhat4Eptk680NMMwKVMsl0b6nhdytmIbcgGD44nlN fuT+XgMZxpT9t3fbBMVDht73QnsfeFBP77c2Vg+J3ZjofJRo/Cwt7Y34eUr5uqOFkd/4ZR z/TsipeRaIfRg6KHLptDOJLbWuYUriZRljIPOdHS2B14ZpktQpi37FTHXhVvxySEtPWm5J yFaaMjC0QajNcdzxcAXtQfVBIiyNceKHGKOrdkQ4Un9Vs5rixwXfH2pdWK0AerOKzACAnn POvfMo7JnigbcTwUV9EkBqo35fdJEk137VBJ0OzbvLJSqfPjyxsrgQ2G8HS4yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3K3j1mG8z12fm for ; Sat, 31 Jan 2026 17:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19968 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 17:04:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 20af9193776d - stable/15 - jail: Use proper prototype for SYSINIT functions 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/15 X-Git-Reftype: branch X-Git-Commit: 20af9193776df39331d5287a4a8b22de6d665c8f Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 17:04:17 +0000 Message-Id: <697e3611.19968.2b75c3a0@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=20af9193776df39331d5287a4a8b22de6d665c8f commit 20af9193776df39331d5287a4a8b22de6d665c8f Author: Zhenlei Huang AuthorDate: 2025-10-13 10:12:31 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-31 17:01:04 +0000 jail: Use proper prototype for SYSINIT functions The only possible return value of function jm_sysinit() and jm_sysuninit() is 0. Make them return void to match the prototype of SYSINIT. MFC after: 1 week (cherry picked from commit a988393b469be58ff87f4d044af61fd2251b490c) --- sys/kern/kern_jailmeta.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_jailmeta.c b/sys/kern/kern_jailmeta.c index 4e37eccad03a..91bb7155820d 100644 --- a/sys/kern/kern_jailmeta.c +++ b/sys/kern/kern_jailmeta.c @@ -599,22 +599,18 @@ SYSCTL_PROC(_security_jail, OID_AUTO, env, /* Setup and tear down. */ -static int +static void jm_sysinit(void *arg __unused) { meta.osd_slot = osd_jail_register(jm_osd_destructor, meta.methods); env.osd_slot = osd_jail_register(jm_osd_destructor, env.methods); - - return (0); } -static int +static void jm_sysuninit(void *arg __unused) { osd_jail_deregister(meta.osd_slot); osd_jail_deregister(env.osd_slot); - - return (0); } SYSINIT(jailmeta, SI_SUB_DRIVERS, SI_ORDER_ANY, jm_sysinit, NULL);