aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Behlendorf <behlendorf1@llnl.gov>2024-10-12 20:51:35 +0000
committerGitHub <noreply@github.com>2024-10-12 20:51:35 +0000
commitc642e985e596eb38d9ea9be2bc97ff0fd9c7d5a0 (patch)
tree37e93187d3f94b4c2d745a774aa707a1490daaa0
parent48dfe3974710aa9807980852aa5f46e1c311c579 (diff)
Revert "Temporarily disable Direct IO by default"
This partially reverts commit 41210597. Now that b4e4cbeb2 has been merged Direct IO can be enabled by default for Linux, but for FreeBSD there still remains a potentially insufficient range locking in zfs_getpages() which needs to be resolved. Reviewed-by: Tony Hutter <hutter2@llnl.gov> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #16629
-rw-r--r--module/zfs/zfs_vnops.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index d5e0d2a2b35a..0799f17758bf 100644
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -77,8 +77,15 @@ static 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
/*