Skip to content

Commit

Permalink
FreeBSD: Prune some unneeded definitions
Browse files Browse the repository at this point in the history
IS_XATTRDIR is never used.
v_count is only used in two places, one immediately followed by the
use of the real name, v_usecount.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes openzfs#11973
  • Loading branch information
Ryan Moeller authored and Ryan Moeller committed May 7, 2021
1 parent 90247d2 commit a56b670
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
5 changes: 0 additions & 5 deletions include/os/freebsd/spl/sys/vnode.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,8 @@ typedef struct vop_vector vnodeops_t;
#define vop_fid_args vop_vptofh_args
#define a_fid a_fhp

#define IS_XATTRDIR(dvp) (0)

#define v_count v_usecount

#define rootvfs (rootvnode == NULL ? NULL : rootvnode->v_mount)


#ifndef IN_BASE
static __inline int
vn_is_readonly(vnode_t *vp)
Expand Down
2 changes: 1 addition & 1 deletion module/os/freebsd/spl/spl_vfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath,
void
vn_rele_async(vnode_t *vp, taskq_t *taskq)
{
VERIFY(vp->v_count > 0);
VERIFY(vp->v_usecount > 0);
if (refcount_release_if_not_last(&vp->v_usecount)) {
#if __FreeBSD_version < 1300045
vdrop(vp);
Expand Down
2 changes: 1 addition & 1 deletion module/os/freebsd/zfs/zfs_vfsops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1592,7 +1592,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
for (zp = list_head(&zfsvfs->z_all_znodes); zp != NULL;
zp = list_next(&zfsvfs->z_all_znodes, zp))
if (zp->z_sa_hdl) {
ASSERT(ZTOV(zp)->v_count >= 0);
ASSERT(ZTOV(zp)->v_usecount >= 0);
zfs_znode_dmu_fini(zp);
}
mutex_exit(&zfsvfs->z_znodes_lock);
Expand Down

0 comments on commit a56b670

Please sign in to comment.