diff options
| author | Ryan Moeller <[email protected]> | 2020-08-11 16:12:12 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-11 13:12:12 -0700 |
| commit | ed726fb063d245f2f1e7f3d7d54c949b895a860c (patch) | |
| tree | 77dafd1cf383c618df5b9914a428bb2c5e9bd887 | |
| parent | 0f95ddcc0c67bfb3d2a69097e9807aabab57aeb2 (diff) | |
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 <[email protected]>
Reviewed-by: Igor Kozhukhov <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #10361
Closes #10685
| -rw-r--r-- | include/sys/fs/zfs.h | 3 | ||||
| -rw-r--r-- | module/os/freebsd/zfs/zvol_os.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index 8126832ba..07c277622 100644 --- 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 index 22fc64558..bb3fe3435 100644 --- 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 |