From nobody Wed Apr 02 15:51:43 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 4ZSTrJ0Vktz5sSS9; Wed, 02 Apr 2025 15:51:44 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZSTrH73NQz3lWT; Wed, 02 Apr 2025 15:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743609104; 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=rWp4vZFvDv3UxUOLs+Vjwen4i/fjYkOs25jJAIDX6SE=; b=lKNKu1LS3sYP07hNG72N4ikRLD/wtQat1PhcobLusfz7/cxzxbsA2JeTMZnEi48wQ29DSN 2eeP8x7SZfmj9F2/a9ONI3hQt54yApzZ40BNTOSyjHtZZZpTjFOhOJykNd82QvE0lqsrtJ dorCCDjTl6LHZpnrs4kawKjN66blsdLm+N5r6UzCGI2bHh/PQCXoVf9aAJsCAIfk9ZcSJu /X7eIFXZRHpgHys5FJ2KVttm29LY+dfQ47HlaWoGjcQSMbKDvvSlxExeenvjVnQ566+50f Dq0TZLMOBAE7S+sOhF68ZBvxbLQ5liUdakpzImf9/JfDvgq6XvtNV7IR4+CHJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743609104; a=rsa-sha256; cv=none; b=iAAsXXWxbWm1Pgw1wzpA2gjStTn7gyyKWdTDkW1OI8AGBSrLG5iJJarujsN55WaSaP0hyH ZnURYg1qUAMDwq32pg6bkafjtzaUUDUsVeX1cHx02SHyaV+hVRsZ7Iz2qsVDIAqNJ9EmiR PRYiCtzipfNwMKVvnqmFUJoCpiW00GrpgQHRCvgofL1gavozOCRn48897LJXtWCjjr6EI6 DnC/9siHYNnqu6Ah1oTHJfM4NqNuzA8wmehx5d6/rIU2CLYZ1dD0xKsWf73o+v1XSaz5IQ 8seL/A/5FkslXD0X+Hwei8cKGba5YjxU0TpFxE5H3+zM1rQbVzVmYQjEzNOMOQ== 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=1743609104; 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=rWp4vZFvDv3UxUOLs+Vjwen4i/fjYkOs25jJAIDX6SE=; b=u1T7Is1x7trcVR+T3hbQnRoYkzEgM33MUWdJeWeK4mdZTra/1opoxRJxa+XmnwWaG5dyh3 v+CHfVL8VQ+5aT7rDx6hX6h2MZs21PjV/61u3uwDHwFlEehqIovaM5JHJkITvBK8Ndzvu6 nhL4l7aEYEGGaXr/8EKEUAT1Ra3+bzoLJYeo8wyKoMuuieTgogxLpR8+15fx0kVFUfRShF 9LQ9MZCzlVGCB280ypzsotqAlAgqggQOi/teAZVIlf8GEmprzZ7+uDfABd3THwtPZiqy2j yYGwPg2GzsD+DK8aIxOWJSiDl3SvfEo+ON3vM0TX2JyAKb/lMWX74BLG9Lkpdw== 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 4ZSTrH6502z75F; Wed, 02 Apr 2025 15:51: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 532FphXI033972; Wed, 2 Apr 2025 15:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 532Fph8x033969; Wed, 2 Apr 2025 15:51:43 GMT (envelope-from git) Date: Wed, 2 Apr 2025 15:51:43 GMT Message-Id: <202504021551.532Fph8x033969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e85aaed60eb0 - main - Correct CTLTYPE of SYSCTL_SBINTIME_MSEC etc 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e85aaed60eb061f31b2f1e5dc92b0ff0419b5fbf Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e85aaed60eb061f31b2f1e5dc92b0ff0419b5fbf commit e85aaed60eb061f31b2f1e5dc92b0ff0419b5fbf Author: Colin Percival AuthorDate: 2025-03-31 04:05:33 +0000 Commit: Colin Percival CommitDate: 2025-04-02 15:51:04 +0000 Correct CTLTYPE of SYSCTL_SBINTIME_MSEC etc These should be CTLTYPE_S64, not CTLTYPE_INT, since they handle 64-bit values. Reviewed by: imp Fixes: 003ffd57fee1 ("Add sysctl_usec_to_sbintime [...]") MFC after: 2 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D49584 --- sys/sys/sysctl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 916c91da3d53..0eb9ff274c1b 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -864,7 +864,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); /* OID expressing a sbintime_t as microseconds */ #define SYSCTL_SBINTIME_USEC(parent, nbr, name, access, ptr, descr) \ SYSCTL_OID(parent, nbr, name, \ - CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ + CTLTYPE_S64 | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ (ptr), 0, sysctl_usec_to_sbintime, "Q", descr); \ CTASSERT(((access) & CTLTYPE) == 0 || \ ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64) @@ -874,7 +874,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); CTASSERT(((access) & CTLTYPE) == 0 || \ ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64); \ sysctl_add_oid(ctx, parent, nbr, name, \ - CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ + CTLTYPE_S64 | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ __ptr, 0, sysctl_usec_to_sbintime, "Q", __DESCR(descr), \ NULL); \ }) @@ -882,7 +882,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); /* OID expressing a sbintime_t as milliseconds */ #define SYSCTL_SBINTIME_MSEC(parent, nbr, name, access, ptr, descr) \ SYSCTL_OID(parent, nbr, name, \ - CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ + CTLTYPE_S64 | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ (ptr), 0, sysctl_msec_to_sbintime, "Q", descr); \ CTASSERT(((access) & CTLTYPE) == 0 || \ ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64) @@ -892,7 +892,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); CTASSERT(((access) & CTLTYPE) == 0 || \ ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64); \ sysctl_add_oid(ctx, parent, nbr, name, \ - CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ + CTLTYPE_S64 | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ __ptr, 0, sysctl_msec_to_sbintime, "Q", __DESCR(descr), \ NULL); \ })