Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve ZoF differences in zfs_ioctl.h #9625

Merged
merged 1 commit into from
Nov 30, 2019
Merged

Resolve ZoF differences in zfs_ioctl.h #9625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/sys/zfs_ioctl.h
View file
Open in desktop
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
1 change: 0 additions & 1 deletion module/os/linux/zfs/zfs_ioctl_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down