From nobody Mon Oct 13 10:13:53 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 4clY8y1RR0z6CJ7q; Mon, 13 Oct 2025 10:13:54 +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 4clY8x2BJPz43r8; Mon, 13 Oct 2025 10:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760350433; 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=H9EXLfWdy3MMXJaqoJBPAX/VOCS3CuhLu4hwjxzSH9k=; b=gcrQbk5t/YnLArnJrtkF3QeNd8orfOc+ReeroGkYUnjQ8Ap5VcMpSovx2Ed6BV4Bq1tfUe giga0Wuw37QvBhMdDnIuLhKgCNfXZeFs7KIzjtAvx2hi0U8I8Y08o/h59tBK9vc3dGgkg0 Stlzsa7DXPCj5teFOnbmcYrY6JmdZcvfWE3DccFYq8nfQgnFgy6scZJp0pEvDtoUsJacF1 SldSP0OHZ7hR3lnK0DCF5ROTUyx5x5LzJjHJVBj1cvICVVjuSe6Q0994YIVwG31hdBvQvd WN160LdXcXwPMJhdgdRwBuMZyqk5bF+0jOkzFPB5Aq3Jo6Dvto/zcs2zrhC5zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760350433; 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=H9EXLfWdy3MMXJaqoJBPAX/VOCS3CuhLu4hwjxzSH9k=; b=uW9BK9LBzh1k+U1wc7JqqKbp66tUXAA+JuaTyGUtHjWdfFtezKR0BbjypE4tPp+rtNJjB8 kAB+gvYpsQSOXycaRWc8KNKOSjrAt5ZL/aozJ1QxLJELOCgMfSN29qyqYV0WSAE/04g72N L7vEbUbqgzY9T4siV14snLLgzL/qo1IvEx9IyEVL0crpLKuQefk3WbLbzHqEiA4nMZfJGM EWWTmtQzC4CiinmmBEEimuK5Wk9l0GMOBBBiP18k4bZCg54BreMt61BEWwTQLMa72ZZmx2 VM8sNjTKiD57Jl9Fz7bgf7ihOu57AE6faD+VREB0yemArfn/veS0b8Kh5WQfeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760350433; a=rsa-sha256; cv=none; b=uKLA30CRuknN5lP8FxD1SER8Msp6764UYutouxwAert+Exr717EChOjFnf95MaFSZaFiYe GAD0+yDYhu3/QcIqUAwIH4Kg+iA05pGNrmyzwvxKIRAfuc/dpzXqMQR16L5DNa4SB7CMm+ fmPAPUcT+w5aLDCfDxYXOw2dKxPc9Vdocx86HiH/+CyFgHTCNWZoCrXVrtye06TQ/hasTs dCHt4ogLR+hW4c1uYiBOQVeKQaMy6hyRUWTeHaISxrjEZas9iwk5/fCQSSygYAYa2G7CKg bQuj/sCei9GuS67cy138kJGKty1y3KwZMpmrIsgxdZ3fzfbVWqC7/Bl2iWNo5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4clY8x1Y7fz12Pt; Mon, 13 Oct 2025 10:13:53 +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 59DADrKl064072; Mon, 13 Oct 2025 10:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59DADrka064069; Mon, 13 Oct 2025 10:13:53 GMT (envelope-from git) Date: Mon, 13 Oct 2025 10:13:53 GMT Message-Id: <202510131013.59DADrka064069@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: a988393b469b - main - jail: Use proper prototype for SYSINIT functions 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: a988393b469be58ff87f4d044af61fd2251b490c Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a988393b469be58ff87f4d044af61fd2251b490c commit a988393b469be58ff87f4d044af61fd2251b490c Author: Zhenlei Huang AuthorDate: 2025-10-13 10:12:31 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-13 10:12:31 +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 --- 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);