Fix ZVOL_DIR

We only use ZVOL_DIR on FreeBSD, and on FreeBSD it isn't correct. Move the definition to the file where it is needed, and define it as /dev/zvol/. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes openzfs#10337
as-com · May 16, 2020 · d2782af · d2782af
1 parent 4d6043f
commit d2782af
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
@@ -1153,9 +1153,6 @@ typedef struct ddt_histogram {
 
 #define	ZFS_SUPER_MAGIC	0x2fc12fc1
 
-/* general zvol path */
-#define	ZVOL_DIR	"/dev"
-
 #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,6 +98,7 @@
 
 #include "zfs_namecheck.h"
 
+#define	ZVOL_DIR		"/dev/zvol/"
 #define	ZVOL_DUMPSIZE		"dumpsize"
 
 #ifdef ZVOL_LOCK_DEBUG