Skip to content

Commit 654ade8

Browse files
amotinbehlendorf
authored andcommitted
FreeBSD: Remove some illumos compat from vnode.h
Should make no difference, just some dead code cleanup. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Martin Matuska <[email protected]> Signed-off-by:Alexander Motin <[email protected]> Sponsored by: iXsystems, Inc. Closes #16808
1 parent ae00c80 commit 654ade8

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

include/os/freebsd/spl/sys/vnode.h

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,30 +68,18 @@ enum symfollow { NO_FOLLOW = NOFOLLOW };
6868
#include <vm/vm_object.h>
6969

7070
typedef struct vop_vector vnodeops_t;
71-
#define VOP_FID VOP_VPTOFH
7271
#define vop_fid vop_vptofh
7372
#define vop_fid_args vop_vptofh_args
7473
#define a_fid a_fhp
7574

76-
#define rootvfs (rootvnode == NULL ? NULL : rootvnode->v_mount)
77-
78-
#ifndef IN_BASE
79-
static __inline int
80-
vn_is_readonly(vnode_t *vp)
81-
{
82-
return (vp->v_mount->mnt_flag & MNT_RDONLY);
83-
}
84-
#endif
8575
#define vn_vfswlock(vp) (0)
8676
#define vn_vfsunlock(vp) do { } while (0)
87-
#define vn_ismntpt(vp) \
88-
((vp)->v_type == VDIR && (vp)->v_mountedhere != NULL)
89-
#define vn_mountedvfs(vp) ((vp)->v_mountedhere)
77+
78+
#ifndef IN_BASE
9079
#define vn_has_cached_data(vp) \
9180
((vp)->v_object != NULL && \
9281
(vp)->v_object->resident_page_count > 0)
9382

94-
#ifndef IN_BASE
9583
static __inline void
9684
vn_flush_cached_data(vnode_t *vp, boolean_t sync)
9785
{
@@ -104,9 +92,6 @@ vn_flush_cached_data(vnode_t *vp, boolean_t sync)
10492
}
10593
#endif
10694

107-
#define vn_exists(vp) do { } while (0)
108-
#define vn_invalid(vp) do { } while (0)
109-
#define vn_free(vp) do { } while (0)
11095
#define vn_matchops(vp, vops) ((vp)->v_op == &(vops))
11196

11297
#define VN_HOLD(v) vref(v)
@@ -121,9 +106,6 @@ vn_flush_cached_data(vnode_t *vp, boolean_t sync)
121106
#define vnevent_rename_dest(vp, dvp, name, ct) do { } while (0)
122107
#define vnevent_rename_dest_dir(vp, ct) do { } while (0)
123108

124-
#define specvp(vp, rdev, type, cr) (VN_HOLD(vp), (vp))
125-
#define MANDLOCK(vp, mode) (0)
126-
127109
/*
128110
* We will use va_spare is place of Solaris' va_mask.
129111
* This field is initialized in zfs_setattr().

module/os/freebsd/zfs/zfs_znode_os.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,6 @@ zfs_znode_sa_init(zfsvfs_t *zfsvfs, znode_t *zp,
370370
*/
371371
if (zp->z_id == zfsvfs->z_root && zfsvfs->z_parent == zfsvfs)
372372
ZTOV(zp)->v_flag |= VROOT;
373-
374-
vn_exists(ZTOV(zp));
375373
}
376374

377375
void

0 commit comments

Comments
 (0)