git: d2a45e9e817a - main - openzfs: use IN_BASE instead of IN_FREEBSD_BASE in spa.h
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 29 Jun 2023 20:17:59 UTC
The branch main has been updated by yuripv:
URL: https://cgit.FreeBSD.org/src/commit/?id=d2a45e9e817ad68f3e163d13404744b8ea9c675b
commit d2a45e9e817ad68f3e163d13404744b8ea9c675b
Author: Yuri Pankov <yuripv@FreeBSD.org>
AuthorDate: 2023-06-29 18:22:50 +0000
Commit: Yuri Pankov <yuripv@FreeBSD.org>
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,