From nobody Thu Jun 29 20:17:59 2023 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 4QsVBH5j8Nz4k0bX; Thu, 29 Jun 2023 20:17:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QsVBH5DV8z3nLJ; Thu, 29 Jun 2023 20:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688069879; 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=1gZqxD7CGpE6gaxR1s19eBj+4uE8N4VGNaFs33Q+Dx8=; b=UMNz6Ixvum72dIapmDkjfA8DLcDf5Sd92tB2R33G+w/hiLrS0AfotPoEwkqHrje2RFXcxa E0CLi13QPLsCEy+6T3OiFergCdwPL30TjvAG3qhJEpya74M+yo6wpw/bLPTEwD1kE2lHd+ e6jvrWQ8cqTzE1qdUEfQ8W3g3Nq8NB6vJme3UTCkKCcP4x2wacpndxnXV6EvTqtYUEy0Cp kZBq99aY/yhAQjoNGIowssvv7tihE8hjpTSk5IXMJu1n3sUfI45apMrcRMJZroOaAa4KkU IiaKUK0jEj+aXi2n1a7TeivvhBesWBuQ8uUDMaRy5g++bjmeUpoCEfv87b30Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688069879; 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=1gZqxD7CGpE6gaxR1s19eBj+4uE8N4VGNaFs33Q+Dx8=; b=H2xRfBHvJC4UFYlq8qF0rIHe5zwja+QiLh5oJXpRwr5L9iyiyUudZufma0iYI+LLfmk/aQ //Tc4riq9m4AlNdQ1KYkEa4q+izR+YeEPDPmizW/U883/cOLGPt5d0C3Ac4Z214Dxz4O7D Mo8qExQQjGSrpO/D6P+Va85Ys1Xxko1MOuTIr+9Mmid5QqkT/FP4DYYppJDZpsxS8s+bQ1 /9gZ8Ft89x0Pdk8Fe8xj233RXMSVnilfwvNg8q5lYoe6rGYv/kv4AMPOWCQk14TiEOu4YV GQ/OteRAzOGhM9yuNiZtL/UfjdbRJvc44rGOJdyM7wAXD3Jyyhi1G2UzJY/2QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688069879; a=rsa-sha256; cv=none; b=VsTAqVH8kUvFRzb91vGQrNGTNi4/60VV9JQWHpVtkcD9lZYL7wSQYh7HY3qkezAAZd0NIa 99xzX+RDSOvOO4fzPc0WP4kiroDyRXnshRE2XQcwffKtM7+LfhaVBNYhd0LBJkJLjv7e2k 0xkyQRcyFxzJ+oLvjvU3KkLSspBJB2+JwrN+v46K+dCSKWF7YKNEgsVLOUxaeHEWZEDzt7 h+IJsQpgh6nCZiLyGoOCeHSe0H191xTVlNag9qpWZViLy9KDErFGWa7yErAkrx7M9AfIu+ q3mAv0IqMy/uuNJAMm8fdzjgPI+c3c7YJHLASiKF/+/NjIZ+qDd89D7cNknBOw== 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 4QsVBH49PSzVXZ; Thu, 29 Jun 2023 20:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35TKHxd4067140; Thu, 29 Jun 2023 20:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35TKHxVo067139; Thu, 29 Jun 2023 20:17:59 GMT (envelope-from git) Date: Thu, 29 Jun 2023 20:17:59 GMT Message-Id: <202306292017.35TKHxVo067139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: d2a45e9e817a - main - openzfs: use IN_BASE instead of IN_FREEBSD_BASE in spa.h 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2a45e9e817ad68f3e163d13404744b8ea9c675b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=d2a45e9e817ad68f3e163d13404744b8ea9c675b commit d2a45e9e817ad68f3e163d13404744b8ea9c675b Author: Yuri Pankov AuthorDate: 2023-06-29 18:22:50 +0000 Commit: Yuri Pankov CommitDate: 2023-06-29 20:14:18 +0000 openzfs: use IN_BASE instead of IN_FREEBSD_BASE in spa.h Consistently use IN_BASE to allow libzfs to get the same default autotrim value as kernel does. Note that this does not change the default value itself, rather fixing the source of value and the value itself in e.g. zpool get output if it was not set explicitly. (And as a reminder, default value of autotrim on FreeBSD is 'on', despite what zpoolprops(7) says currently.) PR: 264234 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40075 --- sys/contrib/openzfs/include/sys/spa.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/include/sys/spa.h b/sys/contrib/openzfs/include/sys/spa.h index 1fa2044008dc..ac0847793c84 100644 --- a/sys/contrib/openzfs/include/sys/spa.h +++ b/sys/contrib/openzfs/include/sys/spa.h @@ -723,12 +723,12 @@ typedef enum spa_mode { * Send TRIM commands in-line during normal pool operation while deleting. * OFF: no * ON: yes - * NB: IN_FREEBSD_BASE is defined within the FreeBSD sources. + * NB: IN_BASE is defined within the FreeBSD sources. */ typedef enum { SPA_AUTOTRIM_OFF = 0, /* default */ SPA_AUTOTRIM_ON, -#ifdef IN_FREEBSD_BASE +#ifdef IN_BASE SPA_AUTOTRIM_DEFAULT = SPA_AUTOTRIM_ON, #else SPA_AUTOTRIM_DEFAULT = SPA_AUTOTRIM_OFF,