diff options
| author | Matthew Macy <[email protected]> | 2019-11-30 15:35:54 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-11-30 15:35:54 -0800 |
| commit | a5b762ab1d9064bcae85f72c64c4a54bef7bbd80 (patch) | |
| tree | 4e556a7c2fbdbee506aa72a189827c17ba77896e | |
| parent | a7c358845b1fdfc60b5f1f70d9d6a4ab87f95fa4 (diff) | |
Resolve ZoF differences in zfs_ioctl.h
FreeBSD needs to be able to pass the jail id to the jail/unjail ioctls
and the struct file in the device structure is unused.
Reviewed-by: Kjeld Schouten <[email protected]>
Reviewed-by: Jorgen Lundman <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #9625
| -rw-r--r-- | include/sys/zfs_ioctl.h | 2 | ||||
| -rw-r--r-- | module/os/linux/zfs/zfs_ioctl_os.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/sys/zfs_ioctl.h b/include/sys/zfs_ioctl.h index 48788477a..da5a3ee60 100644 --- a/include/sys/zfs_ioctl.h +++ b/include/sys/zfs_ioctl.h @@ -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 { @@ -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 */ diff --git a/module/os/linux/zfs/zfs_ioctl_os.c b/module/os/linux/zfs/zfs_ioctl_os.c index 543748c14..fa47c30ea 100644 --- a/module/os/linux/zfs/zfs_ioctl_os.c +++ b/module/os/linux/zfs/zfs_ioctl_os.c @@ -99,7 +99,6 @@ zfsdev_state_init(struct file *filp) newzs = B_TRUE; } - zs->zs_file = filp; filp->private_data = zs; zfs_onexit_init((zfs_onexit_t **)&zs->zs_onexit); |