diff --git a/sys/fs/hpfs/hpfs.h b/sys/fs/hpfs/hpfs.h index aaea495d8dff..042a09e7c465 100644 --- a/sys/fs/hpfs/hpfs.h +++ b/sys/fs/hpfs/hpfs.h @@ -311,7 +311,7 @@ struct hpfsmount { struct sublock hpm_su; struct spblock hpm_sp; struct mount * hpm_mp; - struct vnode * hpm_devvp; + struct vnode * hpm_devvp; /* XXX: loose this, it's in hpfsmount */ struct g_consumer *hpm_cp; struct bufobj *hpm_bo; struct cdev *hpm_dev; diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c index d4bd57f055a5..38dba78cb04a 100644 --- a/sys/fs/hpfs/hpfs_vfsops.c +++ b/sys/fs/hpfs/hpfs_vfsops.c @@ -517,8 +517,6 @@ hpfs_vget( if (error || *vpp != NULL) return (error); - VREF(hp->h_devvp); - error = bread(hpmp->hpm_devvp, ino, FNODESIZE, NOCRED, &bp); if (error) { printf("hpfs_vget: can't read ino %d\n",ino); diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c index 6b8eef8d1dc8..c5db8b82498c 100644 --- a/sys/fs/hpfs/hpfs_vnops.c +++ b/sys/fs/hpfs/hpfs_vnops.c @@ -602,12 +602,6 @@ hpfs_reclaim(ap) vfs_hash_remove(vp); - /* Purge old data structures associated with the inode. */ - if (hp->h_devvp) { - vrele(hp->h_devvp); - hp->h_devvp = NULL; - } - mtx_destroy(&hp->h_interlock); vp->v_data = NULL; diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 686bba9c88e6..b1117b6c9903 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1268,10 +1268,11 @@ ffs_vget(mp, ino, flags, vpp) *vpp = NULL; return (error); } + /* * Finish inode initialization. */ - VREF(ip->i_devvp); + /* * Set up a generation number for this inode if it does not * already have one. This should only happen on old filesystems. diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c index 8d524b9af9d8..b674c944b7b3 100644 --- a/sys/ufs/ufs/ufs_inode.c +++ b/sys/ufs/ufs/ufs_inode.c @@ -162,7 +162,6 @@ ufs_reclaim(ap) /* * Purge old data structures associated with the inode. */ - vrele(ip->i_devvp); #ifdef QUOTA for (i = 0; i < MAXQUOTAS; i++) { if (ip->i_dquot[i] != NODQUOT) {