Move ZVOL_DIR back to zfs.h

Issue #10361 This was previously moved because nothing else in-tree uses it, but evidently DilOS uses it out of tree. Signed-off-by: Ryan Moeller <freqlabs@freebsd.org>
openzfs · Aug 7, 2020 · 61bca71 · 61bca71
1 parent 0cab797
commit 61bca71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
@@ -1173,6 +1173,9 @@ typedef struct ddt_histogram {
 
 #define	ZFS_SUPER_MAGIC	0x2fc12fc1
 
+/* general zvol path */
+#define	ZVOL_DIR		"/dev/zvol/"
+
 #define	ZVOL_MAJOR		230
 #define	ZVOL_MINOR_BITS		4
 #define	ZVOL_MINOR_MASK		((1U << ZVOL_MINOR_BITS) - 1)

diff --git a/module/os/freebsd/zfs/zvol_os.c b/module/os/freebsd/zfs/zvol_os.c
@@ -98,7 +98,6 @@
 
 #include "zfs_namecheck.h"
 
-#define	ZVOL_DIR		"/dev/zvol/"
 #define	ZVOL_DUMPSIZE		"dumpsize"
 
 #ifdef ZVOL_LOCK_DEBUG