From nobody Fri Sep 20 10:05:16 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 4X97L5032Wz5Vbpr; Fri, 20 Sep 2024 10:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X97L46g92z4SSR; Fri, 20 Sep 2024 10:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726826716; 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=5m4vpSJR3OY5I6zOlGSSxcNF7RRN9AzpGlu6vdSxxWU=; b=BZce+jWpNE2vgVa70ftYrj+D7/RvZ5Gqt3MAUW1svgO+S9JLIPR1ofXCMJ8kYPIFvadY8Y 11h78pIgG+6BQ0mSS0lNPp7asWYYIl5o5WysH8RlcDJsPfPxnEXzW/i0pkhWxTDG0PytWG Dz8/bs9Esh3fLEVuEEYQAftSGSeuJcjS4aRtoBOhBRzzbftKgTSXPwRsWSd1mMWZBItBWQ qVqBx7L9AXbiFY50gPAqP7tuRlIWC7EjJxJDKmvHwPZ37JGs0BOE4ap04HtnI/BPk0YpjY Z3b9rbvxrxhn29MsOqc33slpEwf1FZLpkkLQgjilETkjjv0H1k5xCFpV3782iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726826716; a=rsa-sha256; cv=none; b=D4afVsFGBhFY2ZlhPNoP5y6t3WQmdhM4ok7aAfC2AVJAqHazwNZZVZBf9JnoGFaAC67DYS gb6P72P8NiCMvFnR1vH2IRlU0v0zpAAdD/jyPzfvM5ht1wfR1nvlPeTA2r7TzhJrs9mTgG pwWuN9grc20MB3xXVp180S7Y7W2qbAIrOnVSXgVYHSgAQup2OMiiGVOw0GvWBFNIRIUMbI 12FMPGA97dVoQ+4l4vfAqguhAfzseXFTpaaDHTNQO84vhhfMSeiCjvkCWzMhaKkZYIHhhm tUKJDNLqPVl11err0cR7CSi4TXYczQx+pL6HW5an9Nj35R5eBBJezAUZoFd6xQ== 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=1726826716; 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=5m4vpSJR3OY5I6zOlGSSxcNF7RRN9AzpGlu6vdSxxWU=; b=QSS6N4PWjmNxVb7ZJvJUBXKlxUXWw0FEpf/DmGwmLBx5Hm8KPquuD7gzhlg7NxaCK1D/mM 7cEgXDARP+/KviugkXekAs3bsEaIaOfVwYZCCa0lqaczfBPI996EmfxZ3Of84N45sW9vO6 D4JxNknFvFG2tbnrUI5+DJceEl11fjCo9t8pQq3vpAlFML99bIoa+DTx05F5YVG+WITemH yoAdhLm38zhn+3+ugsNxNZsx1/ro1BI1FbaUIPwt8NT4+850N1zxUSlRZMEMO8wPBWrcFE LHMpJA1y39ZOKcAt1MYDP2ecAJecF6CfKwq5QtNJgeXT/NdWG9cOk/lV9tygQA== 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 4X97L46869zlQP; Fri, 20 Sep 2024 10:05:16 +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 48KA5GaY050854; Fri, 20 Sep 2024 10:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KA5Gs6050851; Fri, 20 Sep 2024 10:05:16 GMT (envelope-from git) Date: Fri, 20 Sep 2024 10:05:16 GMT Message-Id: <202409201005.48KA5Gs6050851@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: 611d52a19698 - stable/14 - zfs: cherry-pick change from openzfs 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/14 X-Git-Reftype: branch X-Git-Commit: 611d52a1969892e5d35d5f26ad850a56f351a78e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=611d52a1969892e5d35d5f26ad850a56f351a78e commit 611d52a1969892e5d35d5f26ad850a56f351a78e Author: Zhenlei Huang AuthorDate: 2024-05-30 16:58:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-20 10:03:36 +0000 zfs: cherry-pick change from openzfs Vendor PR: #16210 FreeBSD: Add const qualifier to members of struct opensolaris_utsname Obtained from: OpenZFS OpenZFS commit: e2357561b9499296bff758afe4868dbc39735675 Note: this is required by the following up MFC [1]. No functional change. 1. 356be1348dac kernel: Make some compile time constant variables const --- sys/contrib/openzfs/include/os/freebsd/spl/sys/misc.h | 10 +++++----- sys/contrib/openzfs/module/os/freebsd/spl/spl_misc.c | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/misc.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/misc.h index 2e4efc60544a..894ccd8bf9b1 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/misc.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/misc.h @@ -45,11 +45,11 @@ #define F_SEEK_HOLE FIOSEEKHOLE struct opensolaris_utsname { - char *sysname; - char *nodename; - char *release; - char version[32]; - char *machine; + const char *sysname; + const char *nodename; + const char *release; + char version[32]; + const char *machine; }; #define task_io_account_read(n) diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_misc.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_misc.c index e3653167323b..10d3a7772b11 100644 --- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_misc.c +++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_misc.c @@ -40,6 +40,9 @@ __FBSDID("$FreeBSD$"); #include static struct opensolaris_utsname hw_utsname = { + .sysname = ostype, + .nodename = prison0.pr_hostname, + .release = osrelease, .machine = MACHINE }; @@ -52,10 +55,6 @@ utsname(void) static void opensolaris_utsname_init(void *arg) { - - hw_utsname.sysname = ostype; - hw_utsname.nodename = prison0.pr_hostname; - hw_utsname.release = osrelease; snprintf(hw_utsname.version, sizeof (hw_utsname.version), "%d", osreldate); }