diff options
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c | 2 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_node.c | 3 | ||||
-rw-r--r-- | sys/fs/ext2fs/ext2_inode.c | 2 | ||||
-rw-r--r-- | sys/fs/hpfs/hpfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/msdosfs/msdosfs_denode.c | 3 | ||||
-rw-r--r-- | sys/fs/nullfs/null_vnops.c | 3 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_node.c | 2 | ||||
-rw-r--r-- | sys/fs/tmpfs/tmpfs_vnops.c | 3 | ||||
-rw-r--r-- | sys/fs/unionfs/union_vnops.c | 2 | ||||
-rw-r--r-- | sys/gnu/fs/reiserfs/reiserfs_inode.c | 4 | ||||
-rw-r--r-- | sys/kern/uipc_mqueue.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_subr.c | 2 | ||||
-rw-r--r-- | sys/sys/vnode.h | 2 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_inode.c | 3 |
15 files changed, 16 insertions, 23 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index 2f3f2a72b8bd..de24310994a2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -4556,7 +4556,7 @@ zfs_inactive(vnode_t *vp, cred_t *cr, caller_context_t *ct) ASSERT(vp->v_count <= 1); vp->v_count = 0; VI_UNLOCK(vp); - vrecycle(vp, curthread); + vrecycle(vp); rw_exit(&zfsvfs->z_teardown_inactive_lock); return; } diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c index acec094a71bb..cd382a271d97 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c @@ -1428,7 +1428,7 @@ zfs_zinactive(znode_t *zp) mutex_exit(&zp->z_lock); ZFS_OBJ_HOLD_EXIT(zfsvfs, z_id); ASSERT(vp->v_count == 0); - vrecycle(vp, curthread); + vrecycle(vp); vfslocked = VFS_LOCK_GIANT(zfsvfs->z_vfs); zfs_rmnode(zp); VFS_UNLOCK_GIANT(vfslocked); diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c index e1c68c69bade..19d723e1e6e2 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -65,7 +65,6 @@ cd9660_inactive(ap) } */ *ap; { struct vnode *vp = ap->a_vp; - struct thread *td = ap->a_td; struct iso_node *ip = VTOI(vp); int error = 0; @@ -74,7 +73,7 @@ cd9660_inactive(ap) * so that it can be reused immediately. */ if (ip->inode.iso_mode == 0) - vrecycle(vp, td); + vrecycle(vp); return error; } diff --git a/sys/fs/ext2fs/ext2_inode.c b/sys/fs/ext2fs/ext2_inode.c index 93e59ddf9c9b..24acc644800c 100644 --- a/sys/fs/ext2fs/ext2_inode.c +++ b/sys/fs/ext2fs/ext2_inode.c @@ -498,7 +498,7 @@ out: * so that it can be reused immediately. */ if (ip->i_mode == 0) - vrecycle(vp, td); + vrecycle(vp); return (error); } diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c index f3254887a327..ccf4f3cabe9e 100644 --- a/sys/fs/hpfs/hpfs_vnops.c +++ b/sys/fs/hpfs/hpfs_vnops.c @@ -576,7 +576,7 @@ hpfs_inactive(ap) } if (hp->h_flag & H_INVAL) { - vrecycle(vp, ap->a_td); + vrecycle(vp); return (0); } diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 339f06a60a6e..c10fcf9c120b 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -583,7 +583,6 @@ msdosfs_inactive(ap) { struct vnode *vp = ap->a_vp; struct denode *dep = VTODE(vp); - struct thread *td = ap->a_td; int error = 0; #ifdef MSDOSFS_DEBUG @@ -622,6 +621,6 @@ out: vrefcnt(vp), dep->de_Name[0]); #endif if (dep->de_Name[0] == SLOT_DELETED || dep->de_Name[0] == SLOT_EMPTY) - vrecycle(vp, td); + vrecycle(vp); return (error); } diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index b607666d093f..6f40233f8d7a 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -678,7 +678,6 @@ static int null_inactive(struct vop_inactive_args *ap) { struct vnode *vp = ap->a_vp; - struct thread *td = ap->a_td; vp->v_object = NULL; @@ -686,7 +685,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, td); + vrecycle(vp); return (0); } diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c index 9de8eb51d6cb..bf1776ad1650 100644 --- a/sys/fs/smbfs/smbfs_node.c +++ b/sys/fs/smbfs/smbfs_node.c @@ -373,7 +373,7 @@ smbfs_inactive(ap) smbfs_attr_cacheremove(vp); } if (np->n_flag & NGONE) - vrecycle(vp, td); + vrecycle(vp); return (0); } /* diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index be42f9ab4fcd..09780c8d315a 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -1577,7 +1577,6 @@ static int tmpfs_inactive(struct vop_inactive_args *v) { struct vnode *vp = v->a_vp; - struct thread *l = v->a_td; struct tmpfs_node *node; @@ -1586,7 +1585,7 @@ tmpfs_inactive(struct vop_inactive_args *v) node = VP_TO_TMPFS_NODE(vp); if (node->tn_links == 0) - vrecycle(vp, l); + vrecycle(vp); return 0; } diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 19ae7d2e7f3d..47cb3d18e97d 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1702,7 +1702,7 @@ static int unionfs_inactive(struct vop_inactive_args *ap) { ap->a_vp->v_object = NULL; - vrecycle(ap->a_vp, ap->a_td); + vrecycle(ap->a_vp); return (0); } diff --git a/sys/gnu/fs/reiserfs/reiserfs_inode.c b/sys/gnu/fs/reiserfs/reiserfs_inode.c index f043c5fc27ed..d9511025f7eb 100644 --- a/sys/gnu/fs/reiserfs/reiserfs_inode.c +++ b/sys/gnu/fs/reiserfs/reiserfs_inode.c @@ -104,12 +104,10 @@ reiserfs_inactive(struct vop_inactive_args *ap) { int error; struct vnode *vp; - struct thread *td; struct reiserfs_node *ip; error = 0; vp = ap->a_vp; - td = ap->a_td; ip = VTOI(vp); reiserfs_log(LOG_DEBUG, "deactivating inode used %d times\n", @@ -129,7 +127,7 @@ out: */ if (ip->i_mode == 0) { reiserfs_log(LOG_DEBUG, "recyling\n"); - vrecycle(vp, td); + vrecycle(vp); } return (error); diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 212dabafbf79..eaee81e536dc 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -703,7 +703,7 @@ do_recycle(void *context, int pending __unused) { struct vnode *vp = (struct vnode *)context; - vrecycle(vp, curthread); + vrecycle(vp); vdrop(vp); } @@ -1065,7 +1065,7 @@ mqfs_inactive(struct vop_inactive_args *ap) struct mqfs_node *pn = VTON(ap->a_vp); if (pn->mn_deleted) - vrecycle(ap->a_vp, ap->a_td); + vrecycle(ap->a_vp); return (0); } diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index d4523460e859..a06ba3146dec 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2659,7 +2659,7 @@ loop: * Recycle an unused vnode to the front of the free list. */ int -vrecycle(struct vnode *vp, struct thread *td) +vrecycle(struct vnode *vp) { int recycled; diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 5d1e9f5b5030..49f6f5b4e0e8 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -639,7 +639,7 @@ int vtruncbuf(struct vnode *vp, struct ucred *cred, off_t length, void vunref(struct vnode *); void vn_printf(struct vnode *vp, const char *fmt, ...) __printflike(2,3); #define vprint(label, vp) vn_printf((vp), "%s\n", (label)) -int vrecycle(struct vnode *vp, struct thread *td); +int vrecycle(struct vnode *vp); 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 bf4e2cbd6f88..91047a1e645b 100644 --- a/sys/ufs/ufs/ufs_inode.c +++ b/sys/ufs/ufs/ufs_inode.c @@ -73,7 +73,6 @@ ufs_inactive(ap) { struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); - struct thread *td = ap->a_td; mode_t mode; int error = 0; off_t isize; @@ -172,7 +171,7 @@ out: * so that it can be reused immediately. */ if (ip->i_mode == 0) - vrecycle(vp, td); + vrecycle(vp); if (mp != NULL) vn_finished_secondary_write(mp); return (error); |