Merge tag 'zfs-2.3.0' into truenas/zfs-2.3-release

OpenZFS 2.3.0 Signed-off-by: Ameer Hamza <[email protected]>
truenas · Jan 14, 2025 · 876b3f0 · 876b3f0
2 parents 2508b1a + bc06d81
commit 876b3f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/META b/META
@@ -2,7 +2,7 @@ Meta:          1
 Name:          zfs
 Branch:        1.0
 Version:       2.3.0
-Release:       rc5
+Release:       1
 Release-Tags:  relext
 License:       CDDL
 Author:        OpenZFS

diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
@@ -77,8 +77,15 @@ int zfs_bclone_wait_dirty = 0;
  * Enable Direct I/O. If this setting is 0, then all I/O requests will be
  * directed through the ARC acting as though the dataset property direct was
  * set to disabled.
+ *
+ * Disabled by default on FreeBSD until a potential range locking issue in
+ * zfs_getpages() can be resolved.
  */
+#ifdef __FreeBSD__
 static int zfs_dio_enabled = 0;
+#else
+static int zfs_dio_enabled = 1;
+#endif
 
 
 /*