diff options
| -rw-r--r-- | sys/dev/ccd/ccd.c | 2 | ||||
| -rw-r--r-- | sys/fs/cd9660/cd9660_node.c | 4 | ||||
| -rw-r--r-- | sys/geom/geom_ccd.c | 2 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_node.c | 4 | ||||
| -rw-r--r-- | sys/security/lomac/lomacfs_vnops.c | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index d8e01be..888ae9d 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -1605,7 +1605,7 @@ ccdlookup(char *path, struct thread *td, struct vnode **vpp) } vp = nd.ni_vp; - if (vp->v_usecount > 1) { + if (vrefcnt(vp) > 1) { error = EBUSY; goto bad; } diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c index e837f76..44e60fa 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -182,7 +182,7 @@ cd9660_inactive(ap) register struct iso_node *ip = VTOI(vp); int error = 0; - if (prtactive && vp->v_usecount != 0) + if (prtactive && vrefcnt(vp) != 0) vprint("cd9660_inactive: pushing active", vp); ip->i_flag = 0; @@ -209,7 +209,7 @@ cd9660_reclaim(ap) register struct vnode *vp = ap->a_vp; register struct iso_node *ip = VTOI(vp); - if (prtactive && vp->v_usecount != 0) + if (prtactive && vrefcnt(vp) != 0) vprint("cd9660_reclaim: pushing active", vp); /* * Remove the inode from its hash chain. diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index d8e01be..888ae9d 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -1605,7 +1605,7 @@ ccdlookup(char *path, struct thread *td, struct vnode **vpp) } vp = nd.ni_vp; - if (vp->v_usecount > 1) { + if (vrefcnt(vp) > 1) { error = EBUSY; goto bad; } diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index e837f76..44e60fa 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -182,7 +182,7 @@ cd9660_inactive(ap) register struct iso_node *ip = VTOI(vp); int error = 0; - if (prtactive && vp->v_usecount != 0) + if (prtactive && vrefcnt(vp) != 0) vprint("cd9660_inactive: pushing active", vp); ip->i_flag = 0; @@ -209,7 +209,7 @@ cd9660_reclaim(ap) register struct vnode *vp = ap->a_vp; register struct iso_node *ip = VTOI(vp); - if (prtactive && vp->v_usecount != 0) + if (prtactive && vrefcnt(vp) != 0) vprint("cd9660_reclaim: pushing active", vp); /* * Remove the inode from its hash chain. diff --git a/sys/security/lomac/lomacfs_vnops.c b/sys/security/lomac/lomacfs_vnops.c index cc9e4f9..c40faa0 100644 --- a/sys/security/lomac/lomacfs_vnops.c +++ b/sys/security/lomac/lomacfs_vnops.c @@ -114,7 +114,7 @@ lomacfs_inactive( const char *name = "[unknown]"; #endif printf("lomacfs: inactive(%p \"%s\"), lvp usecount down to %u\n", - vp, name, lvp->v_usecount); + vp, name, vrefcnt(lvp)); } while (0); #endif /* @@ -124,7 +124,7 @@ lomacfs_inactive( * Additionally, devices should be totally freed * on last close, not lazily. */ - if (lvp->v_usecount == 0 && + if (vrefcnt(lvp) == 0 && (lvp->v_type != VREG && lvp->v_type != VDIR)) { vdrop(lvp); VTOLVP(vp) = NULL; @@ -155,7 +155,7 @@ lomacfs_reclaim( const char *name = "[unknown]"; #endif printf("lomacfs: reclaim(%p \"%s\"), lvp usecount down to %u\n", - vp, name, lvp->v_usecount); + vp, name, vrefcnt(lvp)); } #endif if (lvp != NULL) @@ -298,7 +298,7 @@ lomacfs_lookup( const char *name = "[unknown]"; #endif printf("lomacfs: lookup(%p \"%s\"), lvp usecount up to %u\n", - vp, name, VTOLVP(vp)->v_usecount); + vp, name, vrefcnt(VTOLVP(vp))); } #endif return (error); |
