The branch main has been updated by mjg:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7e4c451c12aeb26cc1179221b8230c491b17cf00
commit 7e4c451c12aeb26cc1179221b8230c491b17cf00
Author: Mateusz Guzik <m...@freebsd.org>
AuthorDate: 2025-09-27 02:13:29 +0000
Commit: Mateusz Guzik <m...@freebsd.org>
CommitDate: 2025-09-27 04:00:59 +0000
vfs: retire the VREF macro
It is defined as a plain use of vref.
Churn generated with coccinelle:
@@
expression vp;
@@
- VREF(vp)
+ vref(vp)
---
ObsoleteFiles.inc | 3 +++
share/man/man9/Makefile | 3 +--
sys/fs/cd9660/cd9660_lookup.c | 2 +-
sys/fs/devfs/devfs_vnops.c | 4 ++--
sys/fs/ext2fs/ext2_lookup.c | 4 ++--
sys/fs/ext2fs/ext2_vnops.c | 4 ++--
sys/fs/fdescfs/fdesc_vnops.c | 2 +-
sys/fs/msdosfs/msdosfs_lookup.c | 4 ++--
sys/fs/nfsclient/nfs_clrpcops.c | 2 +-
sys/fs/nfsclient/nfs_clvnops.c | 8 ++++----
sys/fs/nfsserver/nfs_nfsdport.c | 6 +++---
sys/fs/nfsserver/nfs_nfsdserv.c | 4 ++--
sys/fs/nfsserver/nfs_nfsdsocket.c | 12 ++++++------
sys/fs/nullfs/null_vnops.c | 4 ++--
sys/fs/pseudofs/pseudofs_vnops.c | 2 +-
sys/fs/smbfs/smbfs_vnops.c | 2 +-
sys/fs/tarfs/tarfs_vnops.c | 2 +-
sys/fs/tmpfs/tmpfs_vnops.c | 2 +-
sys/fs/udf/udf_vnops.c | 2 +-
sys/kern/uipc_mqueue.c | 4 ++--
sys/kern/vfs_default.c | 6 +++---
sys/kern/vfs_lookup.c | 12 ++++++------
sys/kern/vfs_syscalls.c | 2 +-
sys/sys/vnode.h | 2 --
sys/ufs/ufs/ufs_lookup.c | 4 ++--
25 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index d3b1a0239e3f..785ab4913f8d 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20250917: VREF macro removed
+OLD_FILES+=usr/share/man/man9/VREF.9.gz
+
# 20250917: Remove a miscapitalized manual
OLD_FILES+=usr/share/man/man9/vnet.9.gz
OLD_FILES+=usr/share/man/man9/vimage.9.gz
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index fe764e7c4ed7..d2282b3e5a80 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -2475,8 +2475,7 @@ MLINKS+=VOP_RDWR.9 VOP_READ.9 \
VOP_RDWR.9 VOP_WRITE.9
MLINKS+=VOP_REMOVE.9 VOP_RMDIR.9
MLINKS+=VNET.9 VIMAGE.9
-MLINKS+=vref.9 VREF.9 \
- vref.9 vrefl.9
+MLINKS+=vref.9 vrefl.9
MLINKS+=vrele.9 vput.9 \
vrele.9 vunref.9
MLINKS+=vslock.9 vsunlock.9
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 75fcdc9152cd..4d0bf73ab235 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -386,7 +386,7 @@ found:
return (error);
*vpp = tdp;
} else if (dp->i_number == i_ino) {
- VREF(vdp); /* we want ourself, ie "." */
+ vref(vdp); /* we want ourself, ie "." */
/*
* When we lookup "." we still can be asked to lock it
* differently.
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 590e04ac9aa5..caadf257b8ad 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -1080,7 +1080,7 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlock)
if ((flags & ISLASTCN) && nameiop != LOOKUP)
return (EINVAL);
*vpp = dvp;
- VREF(dvp);
+ vref(dvp);
return (0);
}
@@ -1170,7 +1170,7 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlock)
if (error)
return (error);
if (*vpp == dvp) {
- VREF(dvp);
+ vref(dvp);
*vpp = dvp;
return (0);
}
diff --git a/sys/fs/ext2fs/ext2_lookup.c b/sys/fs/ext2fs/ext2_lookup.c
index c80e0f99ab56..bb830d07b126 100644
--- a/sys/fs/ext2fs/ext2_lookup.c
+++ b/sys/fs/ext2fs/ext2_lookup.c
@@ -579,7 +579,7 @@ found:
if (dd_ino != NULL)
return (0);
if (dp->i_number == ino) {
- VREF(vdp);
+ vref(vdp);
*vpp = vdp;
return (0);
}
@@ -675,7 +675,7 @@ found:
}
*vpp = tdp;
} else if (dp->i_number == ino) {
- VREF(vdp); /* we want ourself, ie "." */
+ vref(vdp); /* we want ourself, ie "." */
/*
* When we lookup "." we still can be asked to lock it
* differently.
diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c
index 00389c927087..35e7ca77c732 100644
--- a/sys/fs/ext2fs/ext2_vnops.c
+++ b/sys/fs/ext2fs/ext2_vnops.c
@@ -905,7 +905,7 @@ abortit:
error = ext2_checkpath(ip, dp, tcnp->cn_cred);
if (error)
goto out;
- VREF(tdvp);
+ vref(tdvp);
error = vfs_relookup(tdvp, &tvp, tcnp, true);
if (error)
goto out;
@@ -1031,7 +1031,7 @@ abortit:
*/
fcnp->cn_flags &= ~MODMASK;
fcnp->cn_flags |= LOCKPARENT | LOCKLEAF;
- VREF(fdvp);
+ vref(fdvp);
error = vfs_relookup(fdvp, &fvp, fcnp, true);
if (error == 0)
vrele(fdvp);
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 3014136fcbdb..c1188c3819e7 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -301,7 +301,7 @@ fdesc_lookup(struct vop_lookup_args *ap)
if (cnp->cn_namelen == 1 && *pname == '.') {
*vpp = dvp;
- VREF(dvp);
+ vref(dvp);
return (0);
}
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 8ab6d35a2685..58ce8eff9dbd 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -515,7 +515,7 @@ foundroot:
* Save directory inode pointer in ndp->ni_dvp for dirremove().
*/
if (dp->de_StartCluster == scn && isadir) { /* "." */
- VREF(vdp);
+ vref(vdp);
*vpp = vdp;
return (0);
}
@@ -602,7 +602,7 @@ foundroot:
msdosfs_integrity_error(pmp);
return (EBADF);
}
- VREF(vdp); /* we want ourself, ie "." */
+ vref(vdp); /* we want ourself, ie "." */
*vpp = vdp;
} else {
if ((error = deget(pmp, cluster, blkoff, LK_EXCLUSIVE,
diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c
index 6c2e35713287..ad9404a18fc8 100644
--- a/sys/fs/nfsclient/nfs_clrpcops.c
+++ b/sys/fs/nfsclient/nfs_clrpcops.c
@@ -4387,7 +4387,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop,
nfsuint64 *cookiep,
attr_ok = true;
if (NFSRV_CMPFH(nfhp->nfh_fh, nfhp->nfh_len,
dnp->n_fhp->nfh_fh, dnp->n_fhp->nfh_len)) {
- VREF(vp);
+ vref(vp);
newvp = vp;
unlocknewvp = 0;
free(nfhp, M_NFSFH);
diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c
index 683d6099401e..e9ae91e046e7 100644
--- a/sys/fs/nfsclient/nfs_clvnops.c
+++ b/sys/fs/nfsclient/nfs_clvnops.c
@@ -1325,7 +1325,7 @@ nfs_lookup(struct vop_lookup_args *ap)
newvp = NULL;
} else if (opennamed && cnp->cn_namelen == 1 &&
*cnp->cn_nameptr == '.') {
- VREF(dvp);
+ vref(dvp);
*vpp = dvp;
return (0);
}
@@ -1587,7 +1587,7 @@ handle_error:
0, 1);
} else if (NFS_CMPFH(np, nfhp->nfh_fh, nfhp->nfh_len)) {
free(nfhp, M_NFSFH);
- VREF(dvp);
+ vref(dvp);
newvp = dvp;
if (attrflag)
(void) nfscl_loadattrcache(&newvp, &nfsva, NULL,
@@ -2863,7 +2863,7 @@ nfs_sillyrename(struct vnode *dvp, struct vnode *vp,
struct componentname *cnp)
M_NEWNFSREQ, M_WAITOK);
sp->s_cred = crhold(cnp->cn_cred);
sp->s_dvp = dvp;
- VREF(dvp);
+ vref(dvp);
/*
* Fudge together a funny name.
@@ -2961,7 +2961,7 @@ nfs_lookitup(struct vnode *dvp, char *name, int len,
struct ucred *cred,
newvp = NFSTOV(np);
} else if (NFS_CMPFH(dnp, nfhp->nfh_fh, nfhp->nfh_len)) {
free(nfhp, M_NFSFH);
- VREF(dvp);
+ vref(dvp);
newvp = dvp;
} else {
cn.cn_nameptr = name;
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
index 5ba86314ead1..eb6ba285f8fe 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -675,7 +675,7 @@ nfsvno_namei(struct nfsrv_descript *nd, struct nameidata
*ndp,
}
if (islocked)
NFSVOPUNLOCK(dp);
- VREF(dp);
+ vref(dp);
*retdirp = dp;
if (NFSVNO_EXRDONLY(exp))
cnp->cn_flags |= RDONLY;
@@ -697,7 +697,7 @@ nfsvno_namei(struct nfsrv_descript *nd, struct nameidata
*ndp,
goto out;
}
dp = rootvnode;
- VREF(dp);
+ vref(dp);
}
} else if ((nfsrv_enable_crossmntpt == 0 && NFSVNO_EXPORTED(exp)) ||
(nd->nd_flag & ND_NFSV4) == 0) {
@@ -814,7 +814,7 @@ nfsvno_namei(struct nfsrv_descript *nd, struct nameidata
*ndp,
if (cnp->cn_pnbuf[0] == '/') {
vrele(ndp->ni_dvp);
ndp->ni_dvp = ndp->ni_rootdir;
- VREF(ndp->ni_dvp);
+ vref(ndp->ni_dvp);
}
ndp->ni_startdir = ndp->ni_dvp;
ndp->ni_dvp = NULL;
diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c
index a881968b03be..921ea4887af1 100644
--- a/sys/fs/nfsserver/nfs_nfsdserv.c
+++ b/sys/fs/nfsserver/nfs_nfsdserv.c
@@ -342,7 +342,7 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram,
(vp->v_vflag & VV_ROOT) != 0 &&
vp != rootvnode) {
tvp = mp->mnt_vnodecovered;
- VREF(tvp);
+ vref(tvp);
at_root = 1;
} else
at_root = 0;
@@ -1766,7 +1766,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgram,
/* If this is the same file handle, just VREF() the vnode. */
if (!NFSBCMP(tfh.nfsrvfh_data, &fh, NFSX_MYFH)) {
- VREF(dp);
+ vref(dp);
tdp = dp;
tnes = *exp;
tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd, p, 1,
diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c
b/sys/fs/nfsserver/nfs_nfsdsocket.c
index 636c4735a131..201f3b74b946 100644
--- a/sys/fs/nfsserver/nfs_nfsdsocket.c
+++ b/sys/fs/nfsserver/nfs_nfsdsocket.c
@@ -1110,7 +1110,7 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
u_char *tag,
if (vp != savevp) {
if (savevp)
vrele(savevp);
- VREF(vp);
+ vref(vp);
savevp = vp;
savevpnes = vpnes;
save_fsid = cur_fsid;
@@ -1155,7 +1155,7 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
u_char *tag,
nfsvno_testexp(nd,
&savevpnes);
if (nd->nd_repstat == 0) {
- VREF(savevp);
+ vref(savevp);
vrele(vp);
vp = savevp;
vpnes = savevpnes;
@@ -1235,7 +1235,7 @@ tryagain:
break;
}
}
- VREF(vp);
+ vref(vp);
if (nfsv4_opflag[op].modifyfs)
vn_start_write(vp, &temp_mp, V_WAIT);
error = (*(nfsrv4_ops1[op]))(nd, isdgram, vp,
@@ -1279,8 +1279,8 @@ tryagain:
if (nfsv4_opflag[op].modifyfs)
vn_start_write(savevp, &temp_mp, V_WAIT);
if (NFSVOPLOCK(savevp, LK_EXCLUSIVE) == 0) {
- VREF(vp);
- VREF(savevp);
+ vref(vp);
+ vref(savevp);
error = (*(nfsrv4_ops2[op]))(nd, isdgram,
savevp, vp, &savevpnes, &vpnes);
} else
@@ -1301,7 +1301,7 @@ tryagain:
lktype = LK_SHARED;
}
if (NFSVOPLOCK(vp, lktype) == 0)
- VREF(vp);
+ vref(vp);
else
nd->nd_repstat = NFSERR_PERM;
} else {
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 8f25a7c4ca70..e9d598014a2f 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -494,7 +494,7 @@ null_lookup(struct vop_lookup_args *ap)
if ((error == 0 || error == EJUSTRETURN) && lvp != NULL) {
if (ldvp == lvp) {
*ap->a_vpp = dvp;
- VREF(dvp);
+ vref(dvp);
vrele(lvp);
} else {
error = null_nodeget(mp, lvp, &vp);
@@ -665,7 +665,7 @@ null_remove(struct vop_remove_args *ap)
vp = ap->a_vp;
if (vrefcnt(vp) > 1) {
lvp = NULLVPTOLOWERVP(vp);
- VREF(lvp);
+ vref(lvp);
vreleit = 1;
} else
vreleit = 0;
diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
index 8cd092118d0e..a30b5e4f551d 100644
--- a/sys/fs/pseudofs/pseudofs_vnops.c
+++ b/sys/fs/pseudofs/pseudofs_vnops.c
@@ -485,7 +485,7 @@ pfs_lookup(struct vop_cachedlookup_args *va)
if (namelen == 1 && pname[0] == '.') {
pn = pd;
*vpp = vn;
- VREF(vn);
+ vref(vn);
PFS_RETURN (0);
}
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c
index a97bc22b3aca..e960d8d78b66 100644
--- a/sys/fs/smbfs/smbfs_vnops.c
+++ b/sys/fs/smbfs/smbfs_vnops.c
@@ -1174,7 +1174,7 @@ smbfs_lookup(struct vop_lookup_args *ap)
if (error)
goto out;
if (isdot) {
- VREF(dvp);
+ vref(dvp);
*vpp = dvp;
goto out;
}
diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c
index b0921909b3b4..70fd7a441d81 100644
--- a/sys/fs/tarfs/tarfs_vnops.c
+++ b/sys/fs/tarfs/tarfs_vnops.c
@@ -256,7 +256,7 @@ tarfs_lookup(struct vop_cachedlookup_args *ap)
if (error != 0)
return (error);
} else if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') {
- VREF(dvp);
+ vref(dvp);
*vpp = dvp;
#ifdef TARFS_DEBUG
} else if (dirnode == dirnode->tmp->root &&
diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c
index 312d2e717e63..5082ee1ebdd0 100644
--- a/sys/fs/tmpfs/tmpfs_vnops.c
+++ b/sys/fs/tmpfs/tmpfs_vnops.c
@@ -120,7 +120,7 @@ tmpfs_lookup1(struct vnode *dvp, struct vnode **vpp, struct
componentname *cnp)
if (error != 0)
goto out;
} else if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') {
- VREF(dvp);
+ vref(dvp);
*vpp = dvp;
error = 0;
} else {
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 37889241e8c3..ec61618b6e18 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -1226,7 +1226,7 @@ lookloop:
if (flags & ISDOTDOT) {
error = vn_vget_ino(dvp, id, lkflags, &tdp);
} else if (node->hash_id == id) {
- VREF(dvp); /* we want ourself, ie "." */
+ vref(dvp); /* we want ourself, ie "." */
/*
* When we lookup "." we still can be asked to lock it
* differently.
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c
index 568d8b56d0be..a8aec397b352 100644
--- a/sys/kern/uipc_mqueue.c
+++ b/sys/kern/uipc_mqueue.c
@@ -886,7 +886,7 @@ mqfs_lookupx(struct vop_cachedlookup_args *ap)
return (EINVAL);
pn = pd;
*vpp = dvp;
- VREF(dvp);
+ vref(dvp);
return (0);
}
@@ -921,7 +921,7 @@ mqfs_lookupx(struct vop_cachedlookup_args *ap)
return (error);
}
if (*vpp == dvp) {
- VREF(dvp);
+ vref(dvp);
*vpp = dvp;
mqnode_release(pn);
return (0);
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 85f67731e1cc..05d1120030f3 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -708,7 +708,7 @@ vop_stdvptocnp(struct vop_vptocnp_args *ap)
if (error)
return (error);
- VREF(vp);
+ vref(vp);
locked = VOP_ISLOCKED(vp);
VOP_UNLOCK(vp);
NDINIT_ATVP(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF, UIO_SYSSPACE,
@@ -727,10 +727,10 @@ vop_stdvptocnp(struct vop_vptocnp_args *ap)
((*dvp)->v_vflag & VV_ROOT) &&
((*dvp)->v_mount->mnt_flag & MNT_UNION)) {
*dvp = (*dvp)->v_mount->mnt_vnodecovered;
- VREF(mvp);
+ vref(mvp);
VOP_UNLOCK(mvp);
vn_close(mvp, FREAD, cred, td);
- VREF(*dvp);
+ vref(*dvp);
vn_lock(*dvp, LK_SHARED | LK_RETRY);
covered = 1;
}
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 2f8b88783f3d..39c7da803de1 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -883,7 +883,7 @@ vfs_lookup_degenerate(struct nameidata *ndp, struct vnode
*dp, int wantparent)
}
if (wantparent) {
ndp->ni_dvp = dp;
- VREF(dp);
+ vref(dp);
}
ndp->ni_vp = dp;
cnp->cn_namelen = 0;
@@ -1284,7 +1284,7 @@ dirloop:
(cnp->cn_flags & NOCROSSMOUNT) != 0)) {
ndp->ni_dvp = dp;
ndp->ni_vp = dp;
- VREF(dp);
+ vref(dp);
goto nextname;
}
if ((dp->v_vflag & VV_ROOT) == 0)
@@ -1295,7 +1295,7 @@ dirloop:
}
tdp = dp;
dp = dp->v_mount->mnt_vnodecovered;
- VREF(dp);
+ vref(dp);
vput(tdp);
vn_lock(dp,
enforce_lkflags(dp->v_mount, cnp->cn_lkflags |
@@ -1343,7 +1343,7 @@ unionlookup:
(dp->v_mount->mnt_flag & MNT_UNION)) {
tdp = dp;
dp = dp->v_mount->mnt_vnodecovered;
- VREF(dp);
+ vref(dp);
vput(tdp);
vn_lock(dp,
enforce_lkflags(dp->v_mount, cnp->cn_lkflags |
@@ -1615,7 +1615,7 @@ vfs_relookup(struct vnode *dvp, struct vnode **vpp,
struct componentname *cnp,
}
/* ASSERT(dvp == ndp->ni_startdir) */
if (refstart)
- VREF(dvp);
+ vref(dvp);
if ((cnp->cn_flags & LOCKPARENT) == 0)
VOP_UNLOCK(dp);
/*
@@ -1653,7 +1653,7 @@ vfs_relookup(struct vnode *dvp, struct vnode **vpp,
struct componentname *cnp,
/* ASSERT(dvp == ndp->ni_startdir) */
if (refstart)
- VREF(dvp);
+ vref(dvp);
if ((cnp->cn_flags & LOCKLEAF) == 0)
VOP_UNLOCK(dp);
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index ec1aad59c6ee..9e1275359715 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -4363,7 +4363,7 @@ unionread:
struct vnode *tvp = vp;
vp = vp->v_mount->mnt_vnodecovered;
- VREF(vp);
+ vref(vp);
fp->f_vnode = vp;
foffset = 0;
vput(tvp);
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 85d263dedfb0..6d50583dc1b3 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -451,8 +451,6 @@ extern int vttoif_tab[];
#define VS_SKIP_UNMOUNT 0x0001 /* vfs_write_suspend: fail if the
filesystem is being unmounted */
-#define VREF(vp) vref(vp)
-
#ifdef DIAGNOSTIC
#define VATTR_NULL(vap) vattr_null(vap)
#else
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 9221aa63184d..419ec3de8572 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -597,7 +597,7 @@ found:
return (error);
}
if (dp->i_number == ino) {
- VREF(vdp);
+ vref(vdp);
*vpp = vdp;
vput(tdp);
return (0);
@@ -707,7 +707,7 @@ found:
*vpp = tdp;
} else if (dp->i_number == ino) {
- VREF(vdp); /* we want ourself, ie "." */
+ vref(vdp); /* we want ourself, ie "." */
/*
* When we lookup "." we still can be asked to lock it
* differently.
