c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolve ZoF differences in zfs_ioctl.h

Browse Source 
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 <kjeld@schouten-lebbing.nl>
Reviewed-by: Jorgen Lundman <lundman@lundman.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #9625
This commit is contained in:
Matthew Macy 2019-11-30 15:35:54 -08:00 committed by Brian Behlendorf
parent a7c358845b
commit a5b762ab1d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sys/zfs_ioctl.h
View File

@ -493,6 +493,7 @@ typedef struct zfs_cmd {
uint64_t zc_fromobj; uint64_t zc_fromobj;
uint64_t zc_createtxg; uint64_t zc_createtxg;
zfs_stat_t zc_stat; zfs_stat_t zc_stat;
uint64_t zc_zoneid;
} zfs_cmd_t; } zfs_cmd_t;
typedef struct zfs_useracct { typedef struct zfs_useracct {
@ -539,7 +540,6 @@ enum zfsdev_state_type {
*/ */
typedef struct zfsdev_state { typedef struct zfsdev_state {
struct zfsdev_state *zs_next; /* next zfsdev_state_t link */ 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 */ minor_t zs_minor; /* made up minor number */
void *zs_onexit; /* onexit data */ void *zs_onexit; /* onexit data */
void *zs_zevent; /* zevent data */ void *zs_zevent; /* zevent data */

1
module/os/linux/zfs/zfs_ioctl_os.c
View File

@ -99,7 +99,6 @@ zfsdev_state_init(struct file *filp)
newzs = B_TRUE; newzs = B_TRUE;
} }
zs->zs_file = filp;
filp->private_data = zs; filp->private_data = zs;
zfs_onexit_init((zfs_onexit_t **)&zs->zs_onexit); zfs_onexit_init((zfs_onexit_t **)&zs->zs_onexit);