diff options
| -rw-r--r-- | sys/fs/cd9660/cd9660_node.c | 2 | ||||
| -rw-r--r-- | sys/fs/hpfs/hpfs_vnops.c | 2 | ||||
| -rw-r--r-- | sys/fs/msdosfs/msdosfs_denode.c | 2 | ||||
| -rw-r--r-- | sys/fs/nullfs/null_vnops.c | 2 | ||||
| -rw-r--r-- | sys/fs/smbfs/smbfs_node.c | 2 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_inode.c | 2 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_inode.c | 2 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_node.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 8 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 3 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_inode.c | 2 |
11 files changed, 11 insertions, 18 deletions
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c index dd5aaa40b392..0a58bbd750fe 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -190,7 +190,7 @@ cd9660_inactive(ap) * so that it can be reused immediately. */ if (ip->inode.iso_mode == 0) - vrecycle(vp, NULL, td); + vrecycle(vp, td); return error; } diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c index 2e0d33c9a6dc..484fef367e13 100644 --- a/sys/fs/hpfs/hpfs_vnops.c +++ b/sys/fs/hpfs/hpfs_vnops.c @@ -579,7 +579,7 @@ hpfs_inactive(ap) if (hp->h_flag & H_INVAL) { VOP_UNLOCK(vp,0,ap->a_td); - vrecycle(vp, NULL, ap->a_td); + vrecycle(vp, ap->a_td); return (0); } diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 02286fd35fd9..9ae3220d493f 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -704,6 +704,6 @@ out: vrefcnt(vp), dep->de_Name[0]); #endif if (dep->de_Name[0] == SLOT_DELETED) - vrecycle(vp, NULL, td); + vrecycle(vp, td); return (error); } diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 76d4cd6f89b1..3b5b42a367fe 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -715,7 +715,7 @@ null_inactive(struct vop_inactive_args *ap) * If this is the last reference, then free up the vnode * so as not to tie up the lower vnodes. */ - vrecycle(vp, NULL, td); + vrecycle(vp, td); return (0); } diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c index 465522f77240..442a73703442 100644 --- a/sys/fs/smbfs/smbfs_node.c +++ b/sys/fs/smbfs/smbfs_node.c @@ -378,7 +378,7 @@ smbfs_inactive(ap) } VOP_UNLOCK(vp, 0, td); if (np->n_flag & NGONE) - vrecycle(vp, NULL, td); + vrecycle(vp, td); return (0); } /* diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c index a2049002a4ce..22b0e283599e 100644 --- a/sys/gnu/ext2fs/ext2_inode.c +++ b/sys/gnu/ext2fs/ext2_inode.c @@ -505,7 +505,7 @@ out: * so that it can be reused immediately. */ if (ip->i_mode == 0) - vrecycle(vp, NULL, td); + vrecycle(vp, td); return (error); } diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c index a2049002a4ce..22b0e283599e 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode.c +++ b/sys/gnu/fs/ext2fs/ext2_inode.c @@ -505,7 +505,7 @@ out: * so that it can be reused immediately. */ if (ip->i_mode == 0) - vrecycle(vp, NULL, td); + vrecycle(vp, td); return (error); } diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index dd5aaa40b392..0a58bbd750fe 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -190,7 +190,7 @@ cd9660_inactive(ap) * so that it can be reused immediately. */ if (ip->inode.iso_mode == 0) - vrecycle(vp, NULL, td); + vrecycle(vp, td); return error; } diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index a40f2a774782..2ac9cf270a64 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2213,17 +2213,11 @@ vx_unlock(struct vnode *vp) * Release the passed interlock if the vnode will be recycled. */ int -vrecycle(vp, inter_lkp, td) - struct vnode *vp; - struct mtx *inter_lkp; - struct thread *td; +vrecycle(struct vnode *vp, struct thread *td) { VI_LOCK(vp); if (vp->v_usecount == 0) { - if (inter_lkp) { - mtx_unlock(inter_lkp); - } vgonel(vp, td); return (1); } diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index ea55ece339e3..257754e861e1 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -616,8 +616,7 @@ int vtruncbuf(struct vnode *vp, struct ucred *cred, struct thread *td, off_t length, int blksize); void vn_printf(struct vnode *vp, const char *fmt, ...); #define vprint(label, vp) vn_printf((vp), "%s\n", (label)) -int vrecycle(struct vnode *vp, struct mtx *inter_lkp, - struct thread *td); +int vrecycle(struct vnode *vp, struct thread *td); int vn_close(struct vnode *vp, int flags, struct ucred *file_cred, struct thread *td); void vn_finished_write(struct mount *mp); diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c index 2c346cfe9097..5d46f162941f 100644 --- a/sys/ufs/ufs/ufs_inode.c +++ b/sys/ufs/ufs/ufs_inode.c @@ -128,7 +128,7 @@ out: * so that it can be reused immediately. */ if (ip->i_mode == 0) - vrecycle(vp, NULL, td); + vrecycle(vp, td); return (error); } |