diff options
| author | Ryan Moeller <[email protected]> | 2020-05-16 13:10:38 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-05-16 10:10:38 -0700 |
| commit | d2782af461c62350abb5abe439b57961c72f9cee (patch) | |
| tree | 578d65276fb5f11a80b0ac2cd5c4b94e51df8839 | |
| parent | 4d6043f2b74ded58d36d3254acd12da16023c844 (diff) | |
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 <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #10337
| -rw-r--r-- | include/sys/fs/zfs.h | 3 | ||||
| -rw-r--r-- | module/os/freebsd/zfs/zvol_os.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index 39be630d8..ecdfd42d0 100644 --- 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 index bef97a9b3..caef0b55b 100644 --- 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 |