Merge pull request #267 from truenas/NAS-133553

NAS-133553 / None / Sync truenas/zfs-2.3-release with zfs-2.3.0 release for Fangtooth BETA
truenas · Jan 15, 2025 · deb3321 · deb3321
2 parents 2508b1a + 29704a4
commit deb3321
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
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
 
 
 /*

diff --git a/tests/zfs-tests/cmd/clonefile.c b/tests/zfs-tests/cmd/clonefile.c
@@ -228,14 +228,14 @@ main(int argc, char **argv)
 		}
 	}
 
-	int sfd = open(argv[optind], O_RDONLY | O_DIRECT);
+	int sfd = open(argv[optind], O_RDONLY);
 	if (sfd < 0) {
 		fprintf(stderr, "open: %s: %s\n",
 		    argv[optind], strerror(errno));
 		return (1);
 	}
 
-	int dfd = open(argv[optind+1], O_WRONLY|O_CREAT|O_DIRECT,
+	int dfd = open(argv[optind+1], O_WRONLY|O_CREAT,
 	    S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
 	if (dfd < 0) {
 		fprintf(stderr, "open: %s: %s\n",