From 3bedd5c2babce58116d3c8aea5b669c7b7e69545 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Mon, 2 Dec 2019 23:45:46 +0000 Subject: [PATCH] Update ZFS_IOC offsets for FreeBSD Signed-off-by: Matt Macy --- include/sys/fs/zfs.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index eeb45790349b..2c216f2c3bd4 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -1192,7 +1192,11 @@ typedef enum zfs_ioc { /* * illumos - 81/128 numbers reserved. */ +#ifdef __FreeBSD__ + ZFS_IOC_FIRST = 0, +#else ZFS_IOC_FIRST = ('Z' << 8), +#endif ZFS_IOC = ZFS_IOC_FIRST, ZFS_IOC_POOL_CREATE = ZFS_IOC_FIRST, /* 0x5a00 */ ZFS_IOC_POOL_DESTROY, /* 0x5a01 */ @@ -1282,16 +1286,17 @@ typedef enum zfs_ioc { /* * Linux - 3/64 numbers reserved. */ - ZFS_IOC_LINUX = ('Z' << 8) + 0x80, + ZFS_IOC_LINUX = ZFS_IOC_FIRST + 0x80, ZFS_IOC_EVENTS_NEXT, /* 0x5a81 */ ZFS_IOC_EVENTS_CLEAR, /* 0x5a82 */ ZFS_IOC_EVENTS_SEEK, /* 0x5a83 */ - /* * FreeBSD - 1/64 numbers reserved. */ - ZFS_IOC_FREEBSD = ('Z' << 8) + 0xC0, - + ZFS_IOC_FREEBSD = ZFS_IOC_FIRST + 0xc0, + ZFS_IOC_NEXTBOOT, /* 0xc1 */ + ZFS_IOC_JAIL, /* 0xc2 */ + ZFS_IOC_UNJAIL, /* 0xc3 */ ZFS_IOC_LAST } zfs_ioc_t;