Resolve ZoF differences in zfs_ioctl.h

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]>
openzfs · Nov 27, 2019 · f0d8521 · f0d8521
1 parent 0c46813
commit f0d8521
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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);