diff --git a/include/os/freebsd/spl/sys/vnode.h b/include/os/freebsd/spl/sys/vnode.h index 7f7084c24..b9d3e81d0 100644 --- a/include/os/freebsd/spl/sys/vnode.h +++ b/include/os/freebsd/spl/sys/vnode.h @@ -68,30 +68,18 @@ enum symfollow { NO_FOLLOW = NOFOLLOW }; #include typedef struct vop_vector vnodeops_t; -#define VOP_FID VOP_VPTOFH #define vop_fid vop_vptofh #define vop_fid_args vop_vptofh_args #define a_fid a_fhp -#define rootvfs (rootvnode == NULL ? NULL : rootvnode->v_mount) - -#ifndef IN_BASE -static __inline int -vn_is_readonly(vnode_t *vp) -{ - return (vp->v_mount->mnt_flag & MNT_RDONLY); -} -#endif #define vn_vfswlock(vp) (0) #define vn_vfsunlock(vp) do { } while (0) -#define vn_ismntpt(vp) \ - ((vp)->v_type == VDIR && (vp)->v_mountedhere != NULL) -#define vn_mountedvfs(vp) ((vp)->v_mountedhere) + +#ifndef IN_BASE #define vn_has_cached_data(vp) \ ((vp)->v_object != NULL && \ (vp)->v_object->resident_page_count > 0) -#ifndef IN_BASE static __inline void vn_flush_cached_data(vnode_t *vp, boolean_t sync) { @@ -104,9 +92,6 @@ vn_flush_cached_data(vnode_t *vp, boolean_t sync) } #endif -#define vn_exists(vp) do { } while (0) -#define vn_invalid(vp) do { } while (0) -#define vn_free(vp) do { } while (0) #define vn_matchops(vp, vops) ((vp)->v_op == &(vops)) #define VN_HOLD(v) vref(v) @@ -121,9 +106,6 @@ vn_flush_cached_data(vnode_t *vp, boolean_t sync) #define vnevent_rename_dest(vp, dvp, name, ct) do { } while (0) #define vnevent_rename_dest_dir(vp, ct) do { } while (0) -#define specvp(vp, rdev, type, cr) (VN_HOLD(vp), (vp)) -#define MANDLOCK(vp, mode) (0) - /* * We will use va_spare is place of Solaris' va_mask. * This field is initialized in zfs_setattr(). diff --git a/module/os/freebsd/zfs/zfs_znode_os.c b/module/os/freebsd/zfs/zfs_znode_os.c index a31ecc367..31ca07a86 100644 --- a/module/os/freebsd/zfs/zfs_znode_os.c +++ b/module/os/freebsd/zfs/zfs_znode_os.c @@ -370,8 +370,6 @@ zfs_znode_sa_init(zfsvfs_t *zfsvfs, znode_t *zp, */ if (zp->z_id == zfsvfs->z_root && zfsvfs->z_parent == zfsvfs) ZTOV(zp)->v_flag |= VROOT; - - vn_exists(ZTOV(zp)); } void