From nobody Thu Jun 29 21:06:01 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 4QsWFj2p9lz4kGpd; Thu, 29 Jun 2023 21:06:01 +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 4QsWFj2P9Kz3xLs; Thu, 29 Jun 2023 21:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688072761; 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=jo1+txX00zDB8/pM7lpKZwqToDdLNye8zyhZd3jDMfo=; b=cL+3u1dv8JpYrUNGxBdbjxbxj1XtBX+HOzTK+70cDoP/G+G8SxRBFo1+d3741d6rDZVjtZ ssj2ozVJVNdh0vWSc22/ZpXJor30Y8zuS6ROcFD4XrKpLFhz1Dz8XTbXAVo6uzOf+SuP8f cBLmBVMe1g0S4iAGrxbtrUNpoaDm5SMvb0WBrkIEq8csRVITb+wvyzgjeHMs/fp0alm7sE OuDiYc/WH1NHYLmBzWir2zIwf2EFu26dyz9frley5XqTSdFG3yOLXl2YDYikyP3IwDcbrV 7F+oAmxwy0stm2RV+myHoQmFV+hJhxpgjQRoWOQBq/c6a0krRI3oBFveOYI+ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688072761; 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=jo1+txX00zDB8/pM7lpKZwqToDdLNye8zyhZd3jDMfo=; b=B8mc/88/p10L3kr+vBGT7STrGsH+tWGB88268T9a5TSJQKBn6/uT8vzBh4s4lHQxCAM44+ x6ScXoo3sNRzfYh7bdCOIj86DQGgChqWz0asTWJnPQEW7sgJInjmt+ZOltTV2q9NFY11w8 1ryt8k/Wbvpjr5XDWHH/KKitJpkLH+lBjNRqUa8AxurIwV8dJHlHlSfbHkVgGPKqOZr+KA HXmNO39Z3z8bnM7RAVnodmFpeqOdFuCyG9rDeqv53R7gf2ObipLZkxRjrv4MgF8sWg715Y viRoctcMIS1EfwU/ScuhfApM2BIQDJLDOK4ljGW1Z5bAFTYzSrZfS93wFrmdiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688072761; a=rsa-sha256; cv=none; b=CO9+JSu1Yf6s6Q4ffXjwYV9+3Q4sqOLsf7J4ppWnDEtxS74bwURM37gWZmVJi9mNkoPL0N Xe93/vZ7LkR0R08XzlB3DUHaWTC01Ar8633ZFwrtY5BPFcBqI6DFXq5C8LuH9PB2poSZV5 9mS3JXvOxt6vIJDk9l07obzcODs+BfZxYbzCejW+Ko64pu9uo2v6JzGscxr+FUMS8n0t6o Cz06ixiRyC7uSXnFIjZIhuSVRdx7YwMkw2mOb8DonTCTijehNERonRD7OZDTMkmEtAO8VV +F6iJ8LFGb/+PHxmorE14wPOFMUNyywQ7sKYUmgIdN6gGUosyDAyrRuk+oV4bg== 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 4QsWFj1TGpzX4b; Thu, 29 Jun 2023 21:06:01 +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 35TL61oK048888; Thu, 29 Jun 2023 21:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35TL61Wh048887; Thu, 29 Jun 2023 21:06:01 GMT (envelope-from git) Date: Thu, 29 Jun 2023 21:06:01 GMT Message-Id: <202306292106.35TL61Wh048887@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: af2939f227db - main - Revert "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: af2939f227db4a80c0ee463adbcdd6608731dacb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=af2939f227db4a80c0ee463adbcdd6608731dacb commit af2939f227db4a80c0ee463adbcdd6608731dacb Author: Yuri Pankov AuthorDate: 2023-06-29 20:57:02 +0000 Commit: Yuri Pankov CommitDate: 2023-06-29 21:04:35 +0000 Revert "openzfs: use IN_BASE instead of IN_FREEBSD_BASE in spa.h" Further testing (sadly, after committing) shows that I missed the fact that IN_BASE is used as userland/kernel delimiter (and not just for FreeBSD-specific code unlike the IN_FREEBSD_BASE). Revert until I have a full (and proper) fix. This reverts commit d2a45e9e817ad68f3e163d13404744b8ea9c675b. --- 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 ac0847793c84..1fa2044008dc 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_BASE is defined within the FreeBSD sources. + * NB: IN_FREEBSD_BASE is defined within the FreeBSD sources. */ typedef enum { SPA_AUTOTRIM_OFF = 0, /* default */ SPA_AUTOTRIM_ON, -#ifdef IN_BASE +#ifdef IN_FREEBSD_BASE SPA_AUTOTRIM_DEFAULT = SPA_AUTOTRIM_ON, #else SPA_AUTOTRIM_DEFAULT = SPA_AUTOTRIM_OFF,