Skip to content

Commit

Permalink
Resolve ZoF differences in zfs_ioctl.h
Browse files Browse the repository at this point in the history
FreeBSD needs to be able to pass the jail id to the jail/unjail ioctls
and it uses a struct cdev rather than a struct file in the device
structure.

Signed-off-by: Matt Macy <[email protected]>
  • Loading branch information
mattmacy committed Nov 27, 2019
1 parent 0c46813 commit cc53d72
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/sys/zfs_ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ typedef struct zfs_cmd {
uint64_t zc_fromobj;
uint64_t zc_createtxg;
zfs_stat_t zc_stat;
uint64_t zc_zoneid;
} zfs_cmd_t;

typedef struct zfs_useracct {
Expand Down Expand Up @@ -539,7 +540,6 @@ enum zfsdev_state_type {
*/
typedef struct zfsdev_state {
struct zfsdev_state *zs_next; /* next zfsdev_state_t link */
struct file *zs_file; /* associated file struct */
minor_t zs_minor; /* made up minor number */
void *zs_onexit; /* onexit data */
void *zs_zevent; /* zevent data */
Expand Down

0 comments on commit cc53d72

Please sign in to comment.