git: af2939f227db - main - Revert "openzfs: use IN_BASE instead of IN_FREEBSD_BASE in spa.h"

From: Yuri Pankov <yuripv_at_FreeBSD.org>
Date: Thu, 29 Jun 2023 21:06:01 UTC
The branch main has been updated by yuripv:

URL: https://cgit.FreeBSD.org/src/commit/?id=af2939f227db4a80c0ee463adbcdd6608731dacb

commit af2939f227db4a80c0ee463adbcdd6608731dacb
Author:     Yuri Pankov <yuripv@FreeBSD.org>
AuthorDate: 2023-06-29 20:57:02 +0000
Commit:     Yuri Pankov <yuripv@FreeBSD.org>
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,