d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ZVOL_DIR

Browse Source 
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 #10337
This commit is contained in:
Ryan Moeller 2020-05-16 13:10:38 -04:00 committed by GitHub
parent 4d6043f2b7
commit d2782af461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sys/fs/zfs.h
View File

@ -1153,9 +1153,6 @@ typedef struct ddt_histogram {
#define ZFS_SUPER_MAGIC 0x2fc12fc1 #define ZFS_SUPER_MAGIC 0x2fc12fc1
/* general zvol path */
#define ZVOL_DIR "/dev"
#define ZVOL_MAJOR 230 #define ZVOL_MAJOR 230
#define ZVOL_MINOR_BITS 4 #define ZVOL_MINOR_BITS 4
#define ZVOL_MINOR_MASK ((1U << ZVOL_MINOR_BITS) - 1) #define ZVOL_MINOR_MASK ((1U << ZVOL_MINOR_BITS) - 1)

1
module/os/freebsd/zfs/zvol_os.c
View File

@ -98,6 +98,7 @@
#include "zfs_namecheck.h" #include "zfs_namecheck.h"
#define ZVOL_DIR "/dev/zvol/"
#define ZVOL_DUMPSIZE "dumpsize" #define ZVOL_DUMPSIZE "dumpsize"
#ifdef ZVOL_LOCK_DEBUG #ifdef ZVOL_LOCK_DEBUG