Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Move ZVOL_DIR back to zfs.h 

This was previously moved because nothing else in-tree uses it, but
evidently DilOS uses it out of tree.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Signed-off-by: Ryan Moeller <freqlabs@freebsd.org>
Closes #10361 
Closes #10685
This commit is contained in:
Ryan Moeller 2020-08-11 16:12:12 -04:00 committed by GitHub
parent 0f95ddcc0c
commit ed726fb063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1173,6 +1173,9 @@ typedef struct ddt_histogram {
#define ZFS_SUPER_MAGIC 0x2fc12fc1 #define ZFS_SUPER_MAGIC 0x2fc12fc1
/* general zvol path */
#define ZVOL_DIR "/dev/zvol/"
#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,7 +98,6 @@
#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