From f64376ad3d2236ecf145f51c76987d6c13ba02bc Mon Sep 17 00:00:00 2001 From: Jorgen Lundman Date: Wed, 8 Nov 2023 10:36:58 +0900 Subject: [PATCH] Remove macOS members from zfsvfs Signed-off-by: Jorgen Lundman --- include/os/windows/zfs/sys/zfs_vfsops_os.h | 10 ---------- module/os/windows/zfs/zfs_vfsops.c | 6 ------ 2 files changed, 16 deletions(-) diff --git a/include/os/windows/zfs/sys/zfs_vfsops_os.h b/include/os/windows/zfs/sys/zfs_vfsops_os.h index c1e598be5a71..3ca4d059298a 100644 --- a/include/os/windows/zfs/sys/zfs_vfsops_os.h +++ b/include/os/windows/zfs/sys/zfs_vfsops_os.h @@ -121,16 +121,6 @@ struct zfsvfs { avl_tree_t z_hardlinks; /* linkid hash avl tree for vget */ avl_tree_t z_hardlinks_linkid; /* sorted on linkid */ krwlock_t z_hardlinks_lock; /* lock to access z_hardlinks */ - - uint64_t z_notification_conditions; /* HFSIOC_VOLUME_STATUS */ - uint64_t z_freespace_notify_warninglimit; - uint64_t z_freespace_notify_dangerlimit; - uint64_t z_freespace_notify_desiredlevel; - - void *z_devdisk; /* Hold fake disk if prop devdisk is on */ - - uint64_t z_findernotify_space; - #endif uint64_t z_replay_eof; /* New end of file - replay only */ sa_attr_type_t *z_attr_table; /* SA attr mapping->id */ diff --git a/module/os/windows/zfs/zfs_vfsops.c b/module/os/windows/zfs/zfs_vfsops.c index 377384469f20..3a79b2922c41 100644 --- a/module/os/windows/zfs/zfs_vfsops.c +++ b/module/os/windows/zfs/zfs_vfsops.c @@ -591,12 +591,6 @@ zfsvfs_init(zfsvfs_t *zfsvfs, objset_t *os) zfsvfs->z_show_ctldir = ZFS_SNAPDIR_VISIBLE; zfsvfs->z_os = os; - /* Volume status "all ok" */ - zfsvfs->z_notification_conditions = 0; - zfsvfs->z_freespace_notify_warninglimit = 0; - zfsvfs->z_freespace_notify_dangerlimit = 0; - zfsvfs->z_freespace_notify_desiredlevel = 0; - error = zfs_get_zplprop(os, ZFS_PROP_VERSION, &zfsvfs->z_version); if (error != 0) return (error);